From patchwork Mon Nov  2 08:24:39 2020
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
X-Patchwork-Submitter: Dodji Seketeli <dodji@redhat.com>
X-Patchwork-Id: 40943
Return-Path: <libabigail-bounces@sourceware.org>
X-Original-To: patchwork@sourceware.org
Delivered-To: patchwork@sourceware.org
Received: from server2.sourceware.org (localhost [IPv6:::1])
	by sourceware.org (Postfix) with ESMTP id 1E48D3858008;
	Mon,  2 Nov 2020 08:27:24 +0000 (GMT)
DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 1E48D3858008
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org;
	s=default; t=1604305647;
	bh=5lFvt3dFvGOSCGm8SDAaHrqxHVV6kVezofhU9gxEdO4=;
	h=To:Subject:Date:List-Id:List-Unsubscribe:List-Archive:List-Help:
	 List-Subscribe:From:Reply-To:From;
	b=MgM1ebMUWG+U/jtUz0zkAxH0rD/qKsV6Zl62kGxmJC/y+CPS/Vngnto3Ss7HsAawu
	 ai3IKCSMeTOHGawaw17lWkllS8PIpcZbVXLio3jyl799zYAul5kiCDY2GoANDQLVXx
	 r7QTz8+TTNMfLfGTyHmCN6kTPftt0TU1vKn3boLo=
X-Original-To: libabigail@sourceware.org
Delivered-To: libabigail@sourceware.org
Received: from us-smtp-delivery-124.mimecast.com
 (us-smtp-delivery-124.mimecast.com [63.128.21.124])
 by sourceware.org (Postfix) with ESMTP id 93D643858008
 for <libabigail@sourceware.org>; Mon,  2 Nov 2020 08:25:43 +0000 (GMT)
DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org 93D643858008
Received: from mail-wr1-f72.google.com (mail-wr1-f72.google.com
 [209.85.221.72]) (Using TLS) by relay.mimecast.com with ESMTP id
 us-mta-318-IgHmqQOpMye0ChbphO3y9w-1; Mon, 02 Nov 2020 03:25:28 -0500
X-MC-Unique: IgHmqQOpMye0ChbphO3y9w-1
Received: by mail-wr1-f72.google.com with SMTP id h11so3171665wrq.20
 for <libabigail@sourceware.org>; Mon, 02 Nov 2020 00:25:27 -0800 (PST)
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
 d=1e100.net; s=20161025;
 h=x-gm-message-state:from:to:subject:organization:date:message-id
 :user-agent:mime-version;
 bh=5lFvt3dFvGOSCGm8SDAaHrqxHVV6kVezofhU9gxEdO4=;
 b=AAwv6C7MTutidEPSiiHsuCAbJ6WhZ0KiQchAAmNv1QmEmWawUnxIQnE9kuR5DvbwZG
 7MzJVzOL2JDBASVVOwso5Tp0KS7hynXzfJtoCEBLtJzWO5q35Z5KbalrGuNH4IqDDbXp
 MBHLJ0TTKwObPb0SurdG4T6ZcnhxxMHETcbICPbP9cYLneCdMGpJqNoFdxTHx7L4V2B3
 sps2WDfRqZnC3+rgv4ZMAbOzVvyO+U6WOKb51GoyGPG/xNZIjPIO1Pf/pb2+8i+1zcGQ
 F8F0znKCdC1crGFDglyk4OsF84VUp22J3+cwFa0T34/KadnipD9ayxfnnv0ckQqEr1O+
 xsGA==
X-Gm-Message-State: AOAM531pRncsTOAsCYwpsQ1QYd+FxdSQr4uM4apYQj0C0NqQfc0SxFAe
 VjZ8USKka6DVFbAVcdPbC9GQ5+D7BTgVvhMe5KGchgpBxPHtxJNXxu2roxPG0hN7OR3/lZBgMbx
 0mwnTOcFeRQfSkgEzVVbr
X-Received: by 2002:a7b:c4c3:: with SMTP id g3mr15774859wmk.127.1604305523144;
 Mon, 02 Nov 2020 00:25:23 -0800 (PST)
X-Google-Smtp-Source: 
 ABdhPJz8ZL09ordzJfu/Rw5EyZ8YKB649llk4VK9Y5C/UY1QbxoLHARSJWIkSKM/6jrhgEOTsg12Qw==
X-Received: by 2002:a7b:c4c3:: with SMTP id g3mr15774817wmk.127.1604305522466;
 Mon, 02 Nov 2020 00:25:22 -0800 (PST)
Received: from localhost ([2a01:e0a:1a0:d060:5246:5dff:feab:d19c])
 by smtp.gmail.com with ESMTPSA id t199sm14733124wmt.46.2020.11.02.00.24.41
 for <libabigail@sourceware.org>
 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);
 Mon, 02 Nov 2020 00:25:19 -0800 (PST)
Received: by localhost (Postfix, from userid 1000)
 id 8C33D581891; Mon,  2 Nov 2020 09:24:40 +0100 (CET)
To: libabigail@sourceware.org
Subject: [PATCH] Bug 26770 - Spurious declaration-only-ness induces spurious
 type changes
Organization: Red Hat / France
X-Operating-System: Fedora 34
X-URL: http://www.redhat.com
Date: Mon, 02 Nov 2020 09:24:39 +0100
Message-ID: <87r1pc88u0.fsf@redhat.com>
User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.1 (gnu/linux)
MIME-Version: 1.0
X-Mimecast-Spam-Score: 0
X-Mimecast-Originator: redhat.com
X-Spam-Status: No, score=-13.9 required=5.0 tests=BAYES_00, GIT_PATCH_0,
 RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H5, SPF_HELO_NONE, SPF_PASS,
 TIME_LIMIT_EXCEEDED autolearn=unavailable version=3.4.2
X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on
 server2.sourceware.org
X-BeenThere: libabigail@sourceware.org
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: Mailing list of the Libabigail project <libabigail.sourceware.org>
List-Unsubscribe: <https://sourceware.org/mailman/options/libabigail>,
 <mailto:libabigail-request@sourceware.org?subject=unsubscribe>
List-Archive: <https://sourceware.org/pipermail/libabigail/>
List-Help: <mailto:libabigail-request@sourceware.org?subject=help>
List-Subscribe: <https://sourceware.org/mailman/listinfo/libabigail>,
 <mailto:libabigail-request@sourceware.org?subject=subscribe>
X-Patchwork-Original-From: Dodji Seketeli via Libabigail
 <libabigail@sourceware.org>
From: Dodji Seketeli <dodji@redhat.com>
Reply-To: Dodji Seketeli <dodji@redhat.com>
Errors-To: libabigail-bounces@sourceware.org
Sender: "Libabigail" <libabigail-bounces@sourceware.org>

Sometimes when amending a C++ class to add new members or properties
to it as directed by the DWARF debug information, we can end-up with
discrepancies related to declaration-only-ness.  That is, an instances
of a given type Foo can be wrongly assigned declaration-only-ness that
should have been only carried by another instance Foo.  Then, later,
comparing two pointers to Foo might wrongly lead to spurious reported
changes due to the spurious differences of declaration-only-ness in
two instances of Foo.

By fixing the setting of the declaration-only-ness, especially when
amending a C++ class this patch fixes that spurious change detected.

	* src/abg-dwarf-reader.cc (add_or_update_class_type): When
	creating a class, set declaration-only-ness unconditionally.  When
	updating the class however, only set the declaration-only-ness
	when the current one is not consistent with the size of the class.
	* tests/data/test-annotate/test14-pr18893.so.abi: Adjust.
	* tests/data/test-annotate/test19-pr19023-libtcmalloc_and_profiler.so.abi: Likewise.
	* tests/data/test-annotate/test20-pr19025-libvtkParallelCore-6.1.so.abi: Likewise.
	* tests/data/test-read-dwarf/test14-pr18893.so.abi: Likewise.
	* tests/data/test-read-dwarf/test19-pr19023-libtcmalloc_and_profiler.so.abi: Likewise.
	* tests/data/test-read-dwarf/test20-pr19025-libvtkParallelCore-6.1.so.abi: Likewise.
	* tests/data/test-read-dwarf/test22-pr19097-libstdc++.so.6.0.17.so.abi: Likewise.

Signed-off-by: Dodji Seketeli <dodji@redhat.com>
---
 src/abg-dwarf-reader.cc                       |   21 +-
 .../data/test-annotate/test14-pr18893.so.abi  | 4026 +++++------
 ...19-pr19023-libtcmalloc_and_profiler.so.abi | 5016 +++++++-------
 ...st20-pr19025-libvtkParallelCore-6.1.so.abi |  616 +-
 .../test-read-dwarf/test14-pr18893.so.abi     | 3958 +++++------
 ...19-pr19023-libtcmalloc_and_profiler.so.abi | 6134 ++++++++---------
 ...st20-pr19025-libvtkParallelCore-6.1.so.abi |  558 +-
 .../test22-pr19097-libstdc++.so.6.0.17.so.abi | 4003 ++++++-----
 8 files changed, 11840 insertions(+), 12492 deletions(-)

diff --git a/src/abg-dwarf-reader.cc b/src/abg-dwarf-reader.cc
index f19c4ae3..475db165 100644
--- a/src/abg-dwarf-reader.cc
+++ b/src/abg-dwarf-reader.cc
@@ -13615,8 +13615,7 @@ add_or_update_class_type(read_context&	 ctxt,
 				  decl_base::VISIBILITY_DEFAULT,
 				  is_anonymous));
 
-      if (is_declaration_only)
-	result->set_is_declaration_only(true);
+      result->set_is_declaration_only(is_declaration_only);
 
       res = add_decl_to_scope(result, scope);
       result = dynamic_pointer_cast<class_decl>(res);
@@ -13626,6 +13625,24 @@ add_or_update_class_type(read_context&	 ctxt,
   if (size)
     result->set_size_in_bits(size);
 
+  if (klass)
+    // We are amending a class that was built before.  So let's check
+    // if we need to amend its "declaration-only-ness" status.
+    if (!!result->get_size_in_bits() == result->get_is_declaration_only())
+      // The size of the class doesn't match its
+      // 'declaration-only-ness".  We might have a non-zero sized
+      // class which is declaration-only, or a zero sized class that
+      // is not declaration-only.  Let's set the declaration-only-ness
+      // according to what we are instructed to.
+      //
+      // Note however that there are binaries out there emitted by
+      // compilers (Clang, in C++) emit declarations-only classes that
+      // have non-zero size.  So we must honor these too. That is why
+      // we are not forcing the declaration-only-ness to false when a
+      // class has non-zero size.  An example of such binary is
+      // tests/data/test-diff-filter/test41-PR21486-abg-writer.llvm.o.
+      result->set_is_declaration_only(is_declaration_only);
+
   result->set_is_artificial(is_artificial);
 
   ctxt.associate_die_to_type(die, result, where_offset);
diff --git a/tests/data/test-annotate/test14-pr18893.so.abi b/tests/data/test-annotate/test14-pr18893.so.abi
index c3a4a673..6df9b65e 100644
--- a/tests/data/test-annotate/test14-pr18893.so.abi
+++ b/tests/data/test-annotate/test14-pr18893.so.abi
@@ -137,209 +137,305 @@
       <!-- <anonymous range>[40] -->
       <subrange length='40' type-id='type-id-3' id='type-id-6'/>
     </array-type-def>
+    <!-- class CachingEvaluator -->
+    <class-decl name='CachingEvaluator' size-in-bits='64' visibility='default' filepath='libnurbs/internals/cachingeval.h' line='39' column='1' id='type-id-7'>
+      <member-type access='private'>
+        <!-- enum CachingEvaluator::ServiceMode -->
+        <enum-decl name='ServiceMode' filepath='libnurbs/internals/cachingeval.h' line='42' column='1' id='type-id-8'>
+          <underlying-type type-id='type-id-9'/>
+          <enumerator name='play' value='0'/>
+          <enumerator name='record' value='1'/>
+          <enumerator name='playAndRecord' value='2'/>
+        </enum-decl>
+      </member-type>
+      <member-function access='private' destructor='yes' vtable-offset='-1'>
+        <!-- CachingEvaluator::~CachingEvaluator(int) -->
+        <function-decl name='~CachingEvaluator' filepath='libnurbs/internals/cachingeval.h' line='41' column='1' visibility='default' binding='global' size-in-bits='64'>
+          <!-- implicit parameter of type 'CachingEvaluator*' -->
+          <parameter type-id='type-id-10' is-artificial='yes'/>
+          <!-- artificial parameter of type 'int' -->
+          <parameter type-id='type-id-11' is-artificial='yes'/>
+          <!-- void -->
+          <return type-id='type-id-12'/>
+        </function-decl>
+      </member-function>
+      <member-function access='private' vtable-offset='2'>
+        <!-- int CachingEvaluator::canRecord() -->
+        <function-decl name='canRecord' mangled-name='_ZN16CachingEvaluator9canRecordEv' filepath='libnurbs/internals/cachingeval.cc' line='43' column='1' visibility='default' binding='global' size-in-bits='64'>
+          <!-- implicit parameter of type 'CachingEvaluator*' -->
+          <parameter type-id='type-id-10' is-artificial='yes'/>
+          <!-- int -->
+          <return type-id='type-id-11'/>
+        </function-decl>
+      </member-function>
+      <member-function access='private' vtable-offset='3'>
+        <!-- int CachingEvaluator::canPlayAndRecord() -->
+        <function-decl name='canPlayAndRecord' mangled-name='_ZN16CachingEvaluator16canPlayAndRecordEv' filepath='libnurbs/internals/cachingeval.cc' line='49' column='1' visibility='default' binding='global' size-in-bits='64'>
+          <!-- implicit parameter of type 'CachingEvaluator*' -->
+          <parameter type-id='type-id-10' is-artificial='yes'/>
+          <!-- int -->
+          <return type-id='type-id-11'/>
+        </function-decl>
+      </member-function>
+      <member-function access='private' vtable-offset='4'>
+        <!-- int CachingEvaluator::createHandle(int) -->
+        <function-decl name='createHandle' mangled-name='_ZN16CachingEvaluator12createHandleEi' filepath='libnurbs/internals/cachingeval.cc' line='55' column='1' visibility='default' binding='global' size-in-bits='64'>
+          <!-- implicit parameter of type 'CachingEvaluator*' -->
+          <parameter type-id='type-id-10' is-artificial='yes'/>
+          <!-- parameter of type 'int' -->
+          <parameter type-id='type-id-11'/>
+          <!-- int -->
+          <return type-id='type-id-11'/>
+        </function-decl>
+      </member-function>
+      <member-function access='private' vtable-offset='5'>
+        <!-- void CachingEvaluator::beginOutput(CachingEvaluator::ServiceMode, int) -->
+        <function-decl name='beginOutput' mangled-name='_ZN16CachingEvaluator11beginOutputENS_11ServiceModeEi' filepath='libnurbs/internals/cachingeval.cc' line='61' column='1' visibility='default' binding='global' size-in-bits='64'>
+          <!-- implicit parameter of type 'CachingEvaluator*' -->
+          <parameter type-id='type-id-10' is-artificial='yes'/>
+          <!-- parameter of type 'enum CachingEvaluator::ServiceMode' -->
+          <parameter type-id='type-id-8'/>
+          <!-- parameter of type 'int' -->
+          <parameter type-id='type-id-11'/>
+          <!-- void -->
+          <return type-id='type-id-12'/>
+        </function-decl>
+      </member-function>
+      <member-function access='private' vtable-offset='6'>
+        <!-- void CachingEvaluator::endOutput() -->
+        <function-decl name='endOutput' mangled-name='_ZN16CachingEvaluator9endOutputEv' filepath='libnurbs/internals/cachingeval.cc' line='66' column='1' visibility='default' binding='global' size-in-bits='64'>
+          <!-- implicit parameter of type 'CachingEvaluator*' -->
+          <parameter type-id='type-id-10' is-artificial='yes'/>
+          <!-- void -->
+          <return type-id='type-id-12'/>
+        </function-decl>
+      </member-function>
+      <member-function access='private' vtable-offset='7'>
+        <!-- void CachingEvaluator::discardRecording(int) -->
+        <function-decl name='discardRecording' mangled-name='_ZN16CachingEvaluator16discardRecordingEi' filepath='libnurbs/internals/cachingeval.cc' line='71' column='1' visibility='default' binding='global' size-in-bits='64'>
+          <!-- implicit parameter of type 'CachingEvaluator*' -->
+          <parameter type-id='type-id-10' is-artificial='yes'/>
+          <!-- artificial parameter of type 'int' -->
+          <parameter type-id='type-id-11' is-artificial='yes'/>
+          <!-- void -->
+          <return type-id='type-id-12'/>
+        </function-decl>
+      </member-function>
+      <member-function access='private' vtable-offset='8'>
+        <!-- void CachingEvaluator::playRecording(int) -->
+        <function-decl name='playRecording' mangled-name='_ZN16CachingEvaluator13playRecordingEi' filepath='libnurbs/internals/cachingeval.cc' line='76' column='1' visibility='default' binding='global' size-in-bits='64'>
+          <!-- implicit parameter of type 'CachingEvaluator*' -->
+          <parameter type-id='type-id-10' is-artificial='yes'/>
+          <!-- artificial parameter of type 'int' -->
+          <parameter type-id='type-id-11' is-artificial='yes'/>
+          <!-- void -->
+          <return type-id='type-id-12'/>
+        </function-decl>
+      </member-function>
+    </class-decl>
     <!-- struct BasicCurveEvaluator -->
-    <class-decl name='BasicCurveEvaluator' size-in-bits='64' is-struct='yes' visibility='default' filepath='libnurbs/internals/basiccrveval.h' line='43' column='1' id='type-id-7'>
+    <class-decl name='BasicCurveEvaluator' size-in-bits='64' is-struct='yes' visibility='default' filepath='libnurbs/internals/basiccrveval.h' line='43' column='1' id='type-id-13'>
       <!-- class CachingEvaluator -->
-      <base-class access='public' layout-offset-in-bits='0' type-id='type-id-8'/>
+      <base-class access='public' layout-offset-in-bits='0' type-id='type-id-7'/>
       <member-function access='public' destructor='yes' vtable-offset='-1'>
         <!-- BasicCurveEvaluator::~BasicCurveEvaluator(int) -->
         <function-decl name='~BasicCurveEvaluator' filepath='libnurbs/internals/basiccrveval.h' line='45' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'BasicCurveEvaluator*' -->
-          <parameter type-id='type-id-9' is-artificial='yes'/>
+          <parameter type-id='type-id-14' is-artificial='yes'/>
           <!-- artificial parameter of type 'int' -->
-          <parameter type-id='type-id-10' is-artificial='yes'/>
+          <parameter type-id='type-id-11' is-artificial='yes'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public' vtable-offset='9'>
         <!-- void BasicCurveEvaluator::domain1f(REAL, REAL) -->
         <function-decl name='domain1f' mangled-name='_ZN19BasicCurveEvaluator8domain1fEff' filepath='libnurbs/internals/basiccrveval.cc' line='45' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'BasicCurveEvaluator*' -->
-          <parameter type-id='type-id-9' is-artificial='yes'/>
+          <parameter type-id='type-id-14' is-artificial='yes'/>
           <!-- parameter of type 'typedef REAL' -->
           <parameter type-id='type-id-1'/>
           <!-- parameter of type 'typedef REAL' -->
           <parameter type-id='type-id-1'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public' vtable-offset='10'>
         <!-- void BasicCurveEvaluator::range1f(long int, REAL*, REAL*) -->
         <function-decl name='range1f' mangled-name='_ZN19BasicCurveEvaluator7range1fElPfS0_' filepath='libnurbs/internals/basiccrveval.cc' line='53' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'BasicCurveEvaluator*' -->
-          <parameter type-id='type-id-9' is-artificial='yes'/>
+          <parameter type-id='type-id-14' is-artificial='yes'/>
           <!-- parameter of type 'long int' -->
-          <parameter type-id='type-id-12'/>
+          <parameter type-id='type-id-15'/>
           <!-- parameter of type 'REAL*' -->
-          <parameter type-id='type-id-13'/>
+          <parameter type-id='type-id-16'/>
           <!-- parameter of type 'REAL*' -->
-          <parameter type-id='type-id-13'/>
+          <parameter type-id='type-id-16'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public' vtable-offset='11'>
         <!-- void BasicCurveEvaluator::enable(long int) -->
         <function-decl name='enable' mangled-name='_ZN19BasicCurveEvaluator6enableEl' filepath='libnurbs/internals/basiccrveval.cc' line='61' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'BasicCurveEvaluator*' -->
-          <parameter type-id='type-id-9' is-artificial='yes'/>
+          <parameter type-id='type-id-14' is-artificial='yes'/>
           <!-- parameter of type 'long int' -->
-          <parameter type-id='type-id-12'/>
+          <parameter type-id='type-id-15'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public' vtable-offset='12'>
         <!-- void BasicCurveEvaluator::disable(long int) -->
         <function-decl name='disable' mangled-name='_ZN19BasicCurveEvaluator7disableEl' filepath='libnurbs/internals/basiccrveval.cc' line='69' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'BasicCurveEvaluator*' -->
-          <parameter type-id='type-id-9' is-artificial='yes'/>
+          <parameter type-id='type-id-14' is-artificial='yes'/>
           <!-- parameter of type 'long int' -->
-          <parameter type-id='type-id-12'/>
+          <parameter type-id='type-id-15'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public' vtable-offset='13'>
         <!-- void BasicCurveEvaluator::bgnmap1f(long int) -->
         <function-decl name='bgnmap1f' mangled-name='_ZN19BasicCurveEvaluator8bgnmap1fEl' filepath='libnurbs/internals/basiccrveval.cc' line='77' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'BasicCurveEvaluator*' -->
-          <parameter type-id='type-id-9' is-artificial='yes'/>
+          <parameter type-id='type-id-14' is-artificial='yes'/>
           <!-- parameter of type 'long int' -->
-          <parameter type-id='type-id-12'/>
+          <parameter type-id='type-id-15'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public' vtable-offset='14'>
         <!-- void BasicCurveEvaluator::map1f(long int, REAL, REAL, long int, long int, REAL*) -->
         <function-decl name='map1f' mangled-name='_ZN19BasicCurveEvaluator5map1fElffllPf' filepath='libnurbs/internals/basiccrveval.cc' line='85' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'BasicCurveEvaluator*' -->
-          <parameter type-id='type-id-9' is-artificial='yes'/>
+          <parameter type-id='type-id-14' is-artificial='yes'/>
           <!-- parameter of type 'long int' -->
-          <parameter type-id='type-id-12'/>
+          <parameter type-id='type-id-15'/>
           <!-- parameter of type 'typedef REAL' -->
           <parameter type-id='type-id-1'/>
           <!-- parameter of type 'typedef REAL' -->
           <parameter type-id='type-id-1'/>
           <!-- parameter of type 'long int' -->
-          <parameter type-id='type-id-12'/>
+          <parameter type-id='type-id-15'/>
           <!-- parameter of type 'long int' -->
-          <parameter type-id='type-id-12'/>
+          <parameter type-id='type-id-15'/>
           <!-- parameter of type 'REAL*' -->
-          <parameter type-id='type-id-13'/>
+          <parameter type-id='type-id-16'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public' vtable-offset='15'>
         <!-- void BasicCurveEvaluator::mapgrid1f(long int, REAL, REAL) -->
         <function-decl name='mapgrid1f' mangled-name='_ZN19BasicCurveEvaluator9mapgrid1fElff' filepath='libnurbs/internals/basiccrveval.cc' line='93' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'BasicCurveEvaluator*' -->
-          <parameter type-id='type-id-9' is-artificial='yes'/>
+          <parameter type-id='type-id-14' is-artificial='yes'/>
           <!-- parameter of type 'long int' -->
-          <parameter type-id='type-id-12'/>
+          <parameter type-id='type-id-15'/>
           <!-- parameter of type 'typedef REAL' -->
           <parameter type-id='type-id-1'/>
           <!-- parameter of type 'typedef REAL' -->
           <parameter type-id='type-id-1'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public' vtable-offset='16'>
         <!-- void BasicCurveEvaluator::mapmesh1f(long int, long int, long int) -->
         <function-decl name='mapmesh1f' mangled-name='_ZN19BasicCurveEvaluator9mapmesh1fElll' filepath='libnurbs/internals/basiccrveval.cc' line='101' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'BasicCurveEvaluator*' -->
-          <parameter type-id='type-id-9' is-artificial='yes'/>
+          <parameter type-id='type-id-14' is-artificial='yes'/>
           <!-- parameter of type 'long int' -->
-          <parameter type-id='type-id-12'/>
+          <parameter type-id='type-id-15'/>
           <!-- parameter of type 'long int' -->
-          <parameter type-id='type-id-12'/>
+          <parameter type-id='type-id-15'/>
           <!-- parameter of type 'long int' -->
-          <parameter type-id='type-id-12'/>
+          <parameter type-id='type-id-15'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public' vtable-offset='17'>
         <!-- void BasicCurveEvaluator::evalcoord1f(long int, REAL) -->
         <function-decl name='evalcoord1f' mangled-name='_ZN19BasicCurveEvaluator11evalcoord1fElf' filepath='libnurbs/internals/basiccrveval.cc' line='109' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'BasicCurveEvaluator*' -->
-          <parameter type-id='type-id-9' is-artificial='yes'/>
+          <parameter type-id='type-id-14' is-artificial='yes'/>
           <!-- parameter of type 'long int' -->
-          <parameter type-id='type-id-12'/>
+          <parameter type-id='type-id-15'/>
           <!-- parameter of type 'typedef REAL' -->
           <parameter type-id='type-id-1'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public' vtable-offset='18'>
         <!-- void BasicCurveEvaluator::endmap1f() -->
         <function-decl name='endmap1f' mangled-name='_ZN19BasicCurveEvaluator8endmap1fEv' filepath='libnurbs/internals/basiccrveval.cc' line='117' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'BasicCurveEvaluator*' -->
-          <parameter type-id='type-id-9' is-artificial='yes'/>
+          <parameter type-id='type-id-14' is-artificial='yes'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public' vtable-offset='19'>
         <!-- void BasicCurveEvaluator::bgnline() -->
         <function-decl name='bgnline' mangled-name='_ZN19BasicCurveEvaluator7bgnlineEv' filepath='libnurbs/internals/basiccrveval.cc' line='125' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'BasicCurveEvaluator*' -->
-          <parameter type-id='type-id-9' is-artificial='yes'/>
+          <parameter type-id='type-id-14' is-artificial='yes'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public' vtable-offset='20'>
         <!-- void BasicCurveEvaluator::endline() -->
         <function-decl name='endline' mangled-name='_ZN19BasicCurveEvaluator7endlineEv' filepath='libnurbs/internals/basiccrveval.cc' line='133' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'BasicCurveEvaluator*' -->
-          <parameter type-id='type-id-9' is-artificial='yes'/>
+          <parameter type-id='type-id-14' is-artificial='yes'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
     </class-decl>
     <!-- class OpenGLCurveEvaluator -->
-    <class-decl name='OpenGLCurveEvaluator' size-in-bits='27584' visibility='default' filepath='libnurbs/interface/glcurveval.h' line='66' column='1' id='type-id-14'>
+    <class-decl name='OpenGLCurveEvaluator' size-in-bits='27584' visibility='default' filepath='libnurbs/interface/glcurveval.h' line='66' column='1' id='type-id-17'>
       <!-- struct BasicCurveEvaluator -->
-      <base-class access='public' layout-offset-in-bits='0' type-id='type-id-7'/>
+      <base-class access='public' layout-offset-in-bits='0' type-id='type-id-13'/>
       <data-member access='private' layout-offset-in-bits='64'>
         <!-- curveEvalMachine OpenGLCurveEvaluator::em_vertex -->
-        <var-decl name='em_vertex' type-id='type-id-15' visibility='default' filepath='libnurbs/interface/glcurveval.h' line='102' column='1'/>
+        <var-decl name='em_vertex' type-id='type-id-18' visibility='default' filepath='libnurbs/interface/glcurveval.h' line='102' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='6656'>
         <!-- curveEvalMachine OpenGLCurveEvaluator::em_normal -->
-        <var-decl name='em_normal' type-id='type-id-15' visibility='default' filepath='libnurbs/interface/glcurveval.h' line='103' column='1'/>
+        <var-decl name='em_normal' type-id='type-id-18' visibility='default' filepath='libnurbs/interface/glcurveval.h' line='103' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='13248'>
         <!-- curveEvalMachine OpenGLCurveEvaluator::em_color -->
-        <var-decl name='em_color' type-id='type-id-15' visibility='default' filepath='libnurbs/interface/glcurveval.h' line='104' column='1'/>
+        <var-decl name='em_color' type-id='type-id-18' visibility='default' filepath='libnurbs/interface/glcurveval.h' line='104' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='19840'>
         <!-- curveEvalMachine OpenGLCurveEvaluator::em_texcoord -->
-        <var-decl name='em_texcoord' type-id='type-id-15' visibility='default' filepath='libnurbs/interface/glcurveval.h' line='105' column='1'/>
+        <var-decl name='em_texcoord' type-id='type-id-18' visibility='default' filepath='libnurbs/interface/glcurveval.h' line='105' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='26432'>
         <!-- int OpenGLCurveEvaluator::vertex_flag -->
-        <var-decl name='vertex_flag' type-id='type-id-10' visibility='default' filepath='libnurbs/interface/glcurveval.h' line='106' column='1'/>
+        <var-decl name='vertex_flag' type-id='type-id-11' visibility='default' filepath='libnurbs/interface/glcurveval.h' line='106' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='26464'>
         <!-- int OpenGLCurveEvaluator::normal_flag -->
-        <var-decl name='normal_flag' type-id='type-id-10' visibility='default' filepath='libnurbs/interface/glcurveval.h' line='107' column='1'/>
+        <var-decl name='normal_flag' type-id='type-id-11' visibility='default' filepath='libnurbs/interface/glcurveval.h' line='107' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='26496'>
         <!-- int OpenGLCurveEvaluator::color_flag -->
-        <var-decl name='color_flag' type-id='type-id-10' visibility='default' filepath='libnurbs/interface/glcurveval.h' line='108' column='1'/>
+        <var-decl name='color_flag' type-id='type-id-11' visibility='default' filepath='libnurbs/interface/glcurveval.h' line='108' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='26528'>
         <!-- int OpenGLCurveEvaluator::texcoord_flag -->
-        <var-decl name='texcoord_flag' type-id='type-id-10' visibility='default' filepath='libnurbs/interface/glcurveval.h' line='109' column='1'/>
+        <var-decl name='texcoord_flag' type-id='type-id-11' visibility='default' filepath='libnurbs/interface/glcurveval.h' line='109' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='26560'>
         <!-- REAL OpenGLCurveEvaluator::global_grid_u0 -->
@@ -351,458 +447,458 @@
       </data-member>
       <data-member access='private' layout-offset-in-bits='26624'>
         <!-- int OpenGLCurveEvaluator::global_grid_nu -->
-        <var-decl name='global_grid_nu' type-id='type-id-10' visibility='default' filepath='libnurbs/interface/glcurveval.h' line='113' column='1'/>
+        <var-decl name='global_grid_nu' type-id='type-id-11' visibility='default' filepath='libnurbs/interface/glcurveval.h' line='113' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='26688'>
         <!-- void (typedef GLenum)* OpenGLCurveEvaluator::beginCallBackN -->
-        <var-decl name='beginCallBackN' type-id='type-id-16' visibility='default' filepath='libnurbs/interface/glcurveval.h' line='128' column='1'/>
+        <var-decl name='beginCallBackN' type-id='type-id-19' visibility='default' filepath='libnurbs/interface/glcurveval.h' line='128' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='26752'>
         <!-- void ()* OpenGLCurveEvaluator::endCallBackN -->
-        <var-decl name='endCallBackN' type-id='type-id-17' visibility='default' filepath='libnurbs/interface/glcurveval.h' line='129' column='1'/>
+        <var-decl name='endCallBackN' type-id='type-id-20' visibility='default' filepath='libnurbs/interface/glcurveval.h' line='129' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='26816'>
         <!-- void (const GLfloat*)* OpenGLCurveEvaluator::vertexCallBackN -->
-        <var-decl name='vertexCallBackN' type-id='type-id-18' visibility='default' filepath='libnurbs/interface/glcurveval.h' line='130' column='1'/>
+        <var-decl name='vertexCallBackN' type-id='type-id-21' visibility='default' filepath='libnurbs/interface/glcurveval.h' line='130' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='26880'>
         <!-- void (const GLfloat*)* OpenGLCurveEvaluator::normalCallBackN -->
-        <var-decl name='normalCallBackN' type-id='type-id-18' visibility='default' filepath='libnurbs/interface/glcurveval.h' line='131' column='1'/>
+        <var-decl name='normalCallBackN' type-id='type-id-21' visibility='default' filepath='libnurbs/interface/glcurveval.h' line='131' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='26944'>
         <!-- void (const GLfloat*)* OpenGLCurveEvaluator::colorCallBackN -->
-        <var-decl name='colorCallBackN' type-id='type-id-18' visibility='default' filepath='libnurbs/interface/glcurveval.h' line='132' column='1'/>
+        <var-decl name='colorCallBackN' type-id='type-id-21' visibility='default' filepath='libnurbs/interface/glcurveval.h' line='132' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='27008'>
         <!-- void (const GLfloat*)* OpenGLCurveEvaluator::texcoordCallBackN -->
-        <var-decl name='texcoordCallBackN' type-id='type-id-18' visibility='default' filepath='libnurbs/interface/glcurveval.h' line='133' column='1'/>
+        <var-decl name='texcoordCallBackN' type-id='type-id-21' visibility='default' filepath='libnurbs/interface/glcurveval.h' line='133' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='27072'>
         <!-- void (typedef GLenum, void*)* OpenGLCurveEvaluator::beginCallBackData -->
-        <var-decl name='beginCallBackData' type-id='type-id-19' visibility='default' filepath='libnurbs/interface/glcurveval.h' line='135' column='1'/>
+        <var-decl name='beginCallBackData' type-id='type-id-22' visibility='default' filepath='libnurbs/interface/glcurveval.h' line='135' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='27136'>
         <!-- void (void*)* OpenGLCurveEvaluator::endCallBackData -->
-        <var-decl name='endCallBackData' type-id='type-id-20' visibility='default' filepath='libnurbs/interface/glcurveval.h' line='136' column='1'/>
+        <var-decl name='endCallBackData' type-id='type-id-23' visibility='default' filepath='libnurbs/interface/glcurveval.h' line='136' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='27200'>
         <!-- void (const GLfloat*, void*)* OpenGLCurveEvaluator::vertexCallBackData -->
-        <var-decl name='vertexCallBackData' type-id='type-id-21' visibility='default' filepath='libnurbs/interface/glcurveval.h' line='137' column='1'/>
+        <var-decl name='vertexCallBackData' type-id='type-id-24' visibility='default' filepath='libnurbs/interface/glcurveval.h' line='137' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='27264'>
         <!-- void (const GLfloat*, void*)* OpenGLCurveEvaluator::normalCallBackData -->
-        <var-decl name='normalCallBackData' type-id='type-id-21' visibility='default' filepath='libnurbs/interface/glcurveval.h' line='138' column='1'/>
+        <var-decl name='normalCallBackData' type-id='type-id-24' visibility='default' filepath='libnurbs/interface/glcurveval.h' line='138' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='27328'>
         <!-- void (const GLfloat*, void*)* OpenGLCurveEvaluator::colorCallBackData -->
-        <var-decl name='colorCallBackData' type-id='type-id-21' visibility='default' filepath='libnurbs/interface/glcurveval.h' line='139' column='1'/>
+        <var-decl name='colorCallBackData' type-id='type-id-24' visibility='default' filepath='libnurbs/interface/glcurveval.h' line='139' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='27392'>
         <!-- void (const GLfloat*, void*)* OpenGLCurveEvaluator::texcoordCallBackData -->
-        <var-decl name='texcoordCallBackData' type-id='type-id-21' visibility='default' filepath='libnurbs/interface/glcurveval.h' line='140' column='1'/>
+        <var-decl name='texcoordCallBackData' type-id='type-id-24' visibility='default' filepath='libnurbs/interface/glcurveval.h' line='140' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='27456'>
         <!-- void* OpenGLCurveEvaluator::userData -->
-        <var-decl name='userData' type-id='type-id-22' visibility='default' filepath='libnurbs/interface/glcurveval.h' line='142' column='1'/>
+        <var-decl name='userData' type-id='type-id-25' visibility='default' filepath='libnurbs/interface/glcurveval.h' line='142' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='27520'>
         <!-- int OpenGLCurveEvaluator::output_triangles -->
-        <var-decl name='output_triangles' type-id='type-id-10' visibility='default' filepath='libnurbs/interface/glcurveval.h' line='154' column='1'/>
+        <var-decl name='output_triangles' type-id='type-id-11' visibility='default' filepath='libnurbs/interface/glcurveval.h' line='154' column='1'/>
       </data-member>
       <member-function access='private' constructor='yes'>
         <!-- OpenGLCurveEvaluator::OpenGLCurveEvaluator() -->
         <function-decl name='OpenGLCurveEvaluator' filepath='libnurbs/interface/glcurveval.cc' line='48' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'OpenGLCurveEvaluator*' -->
-          <parameter type-id='type-id-23' is-artificial='yes'/>
+          <parameter type-id='type-id-26' is-artificial='yes'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
         <!-- void OpenGLCurveEvaluator::addMap(CurveMap*) -->
         <function-decl name='addMap' mangled-name='_ZN20OpenGLCurveEvaluator6addMapEP8CurveMap' filepath='libnurbs/interface/glcurveval.cc' line='84' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'OpenGLCurveEvaluator*' -->
-          <parameter type-id='type-id-23' is-artificial='yes'/>
+          <parameter type-id='type-id-26' is-artificial='yes'/>
           <!-- parameter of type 'CurveMap*' -->
-          <parameter type-id='type-id-24'/>
+          <parameter type-id='type-id-27'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
         <!-- void OpenGLCurveEvaluator::evalpoint1i(long int) -->
         <function-decl name='evalpoint1i' mangled-name='_ZN20OpenGLCurveEvaluator11evalpoint1iEl' filepath='libnurbs/interface/glcurveval.cc' line='287' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'OpenGLCurveEvaluator*' -->
-          <parameter type-id='type-id-23' is-artificial='yes'/>
+          <parameter type-id='type-id-26' is-artificial='yes'/>
           <!-- parameter of type 'long int' -->
-          <parameter type-id='type-id-12'/>
+          <parameter type-id='type-id-15'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
         <!-- void OpenGLCurveEvaluator::put_vertices_call_back(int) -->
         <function-decl name='put_vertices_call_back' mangled-name='_ZN20OpenGLCurveEvaluator22put_vertices_call_backEi' filepath='libnurbs/interface/glcurveval.h' line='87' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'OpenGLCurveEvaluator*' -->
-          <parameter type-id='type-id-23' is-artificial='yes'/>
+          <parameter type-id='type-id-26' is-artificial='yes'/>
           <!-- artificial parameter of type 'int' -->
-          <parameter type-id='type-id-10' is-artificial='yes'/>
+          <parameter type-id='type-id-11' is-artificial='yes'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
         <!-- void OpenGLCurveEvaluator::putCallBack(GLenum, _GLUfuncptr) -->
         <function-decl name='putCallBack' mangled-name='_ZN20OpenGLCurveEvaluator11putCallBackEjPFvvE' filepath='libnurbs/interface/glcurveval.cc' line='305' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'OpenGLCurveEvaluator*' -->
-          <parameter type-id='type-id-23' is-artificial='yes'/>
+          <parameter type-id='type-id-26' is-artificial='yes'/>
           <!-- parameter of type 'typedef GLenum' -->
-          <parameter type-id='type-id-25'/>
+          <parameter type-id='type-id-28'/>
           <!-- parameter of type 'typedef _GLUfuncptr' -->
-          <parameter type-id='type-id-26'/>
+          <parameter type-id='type-id-29'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
         <!-- void OpenGLCurveEvaluator::set_callback_userData(void*) -->
         <function-decl name='set_callback_userData' mangled-name='_ZN20OpenGLCurveEvaluator21set_callback_userDataEPv' filepath='libnurbs/interface/glcurveval.h' line='96' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'OpenGLCurveEvaluator*' -->
-          <parameter type-id='type-id-23' is-artificial='yes'/>
+          <parameter type-id='type-id-26' is-artificial='yes'/>
           <!-- parameter of type 'void*' -->
-          <parameter type-id='type-id-22'/>
+          <parameter type-id='type-id-25'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
         <!-- void OpenGLCurveEvaluator::inMap1f(int, int, REAL, REAL, int, int, REAL*) -->
         <function-decl name='inMap1f' mangled-name='_ZN20OpenGLCurveEvaluator7inMap1fEiiffiiPf' filepath='libnurbs/interface/glcurveval.h' line='115' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'OpenGLCurveEvaluator*' -->
-          <parameter type-id='type-id-23' is-artificial='yes'/>
+          <parameter type-id='type-id-26' is-artificial='yes'/>
           <!-- parameter of type 'int' -->
-          <parameter type-id='type-id-10'/>
+          <parameter type-id='type-id-11'/>
           <!-- parameter of type 'int' -->
-          <parameter type-id='type-id-10'/>
+          <parameter type-id='type-id-11'/>
           <!-- parameter of type 'typedef REAL' -->
           <parameter type-id='type-id-1'/>
           <!-- parameter of type 'typedef REAL' -->
           <parameter type-id='type-id-1'/>
           <!-- parameter of type 'int' -->
-          <parameter type-id='type-id-10'/>
+          <parameter type-id='type-id-11'/>
           <!-- parameter of type 'int' -->
-          <parameter type-id='type-id-10'/>
+          <parameter type-id='type-id-11'/>
           <!-- parameter of type 'REAL*' -->
-          <parameter type-id='type-id-13'/>
+          <parameter type-id='type-id-16'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
         <!-- void OpenGLCurveEvaluator::inPreEvaluate(int, REAL, REAL*) -->
         <function-decl name='inPreEvaluate' mangled-name='_ZN20OpenGLCurveEvaluator13inPreEvaluateEifPf' filepath='libnurbs/interface/glcurveval.h' line='123' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'OpenGLCurveEvaluator*' -->
-          <parameter type-id='type-id-23' is-artificial='yes'/>
+          <parameter type-id='type-id-26' is-artificial='yes'/>
           <!-- parameter of type 'int' -->
-          <parameter type-id='type-id-10'/>
+          <parameter type-id='type-id-11'/>
           <!-- parameter of type 'typedef REAL' -->
           <parameter type-id='type-id-1'/>
           <!-- parameter of type 'REAL*' -->
-          <parameter type-id='type-id-13'/>
+          <parameter type-id='type-id-16'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
         <!-- void OpenGLCurveEvaluator::inDoDomain1(curveEvalMachine*, REAL, REAL*) -->
         <function-decl name='inDoDomain1' mangled-name='_ZN20OpenGLCurveEvaluator11inDoDomain1EP16curveEvalMachinefPf' filepath='libnurbs/interface/glcurveval.h' line='124' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'OpenGLCurveEvaluator*' -->
-          <parameter type-id='type-id-23' is-artificial='yes'/>
+          <parameter type-id='type-id-26' is-artificial='yes'/>
           <!-- parameter of type 'curveEvalMachine*' -->
-          <parameter type-id='type-id-27'/>
+          <parameter type-id='type-id-30'/>
           <!-- parameter of type 'typedef REAL' -->
           <parameter type-id='type-id-1'/>
           <!-- parameter of type 'REAL*' -->
-          <parameter type-id='type-id-13'/>
+          <parameter type-id='type-id-16'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
         <!-- void OpenGLCurveEvaluator::inDoEvalCoord1(REAL) -->
         <function-decl name='inDoEvalCoord1' mangled-name='_ZN20OpenGLCurveEvaluator14inDoEvalCoord1Ef' filepath='libnurbs/interface/glcurveval.h' line='125' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'OpenGLCurveEvaluator*' -->
-          <parameter type-id='type-id-23' is-artificial='yes'/>
+          <parameter type-id='type-id-26' is-artificial='yes'/>
           <!-- parameter of type 'typedef REAL' -->
           <parameter type-id='type-id-1'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
         <!-- void OpenGLCurveEvaluator::inMapMesh1f(int, int) -->
         <function-decl name='inMapMesh1f' mangled-name='_ZN20OpenGLCurveEvaluator11inMapMesh1fEii' filepath='libnurbs/interface/glcurveval.h' line='126' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'OpenGLCurveEvaluator*' -->
-          <parameter type-id='type-id-23' is-artificial='yes'/>
+          <parameter type-id='type-id-26' is-artificial='yes'/>
           <!-- parameter of type 'int' -->
-          <parameter type-id='type-id-10'/>
+          <parameter type-id='type-id-11'/>
           <!-- parameter of type 'int' -->
-          <parameter type-id='type-id-10'/>
+          <parameter type-id='type-id-11'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
         <!-- void OpenGLCurveEvaluator::beginCallBack(GLenum, void*) -->
         <function-decl name='beginCallBack' mangled-name='_ZN20OpenGLCurveEvaluator13beginCallBackEjPv' filepath='libnurbs/interface/glcurveval.cc' line='350' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'OpenGLCurveEvaluator*' -->
-          <parameter type-id='type-id-23' is-artificial='yes'/>
+          <parameter type-id='type-id-26' is-artificial='yes'/>
           <!-- parameter of type 'typedef GLenum' -->
-          <parameter type-id='type-id-25'/>
+          <parameter type-id='type-id-28'/>
           <!-- parameter of type 'void*' -->
-          <parameter type-id='type-id-22'/>
+          <parameter type-id='type-id-25'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
         <!-- void OpenGLCurveEvaluator::endCallBack(void*) -->
         <function-decl name='endCallBack' mangled-name='_ZN20OpenGLCurveEvaluator11endCallBackEPv' filepath='libnurbs/interface/glcurveval.cc' line='359' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'OpenGLCurveEvaluator*' -->
-          <parameter type-id='type-id-23' is-artificial='yes'/>
+          <parameter type-id='type-id-26' is-artificial='yes'/>
           <!-- parameter of type 'void*' -->
-          <parameter type-id='type-id-22'/>
+          <parameter type-id='type-id-25'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
         <!-- void OpenGLCurveEvaluator::vertexCallBack(const GLfloat*, void*) -->
         <function-decl name='vertexCallBack' mangled-name='_ZN20OpenGLCurveEvaluator14vertexCallBackEPKfPv' filepath='libnurbs/interface/glcurveval.cc' line='368' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'OpenGLCurveEvaluator*' -->
-          <parameter type-id='type-id-23' is-artificial='yes'/>
+          <parameter type-id='type-id-26' is-artificial='yes'/>
           <!-- parameter of type 'const GLfloat*' -->
-          <parameter type-id='type-id-28'/>
+          <parameter type-id='type-id-31'/>
           <!-- parameter of type 'void*' -->
-          <parameter type-id='type-id-22'/>
+          <parameter type-id='type-id-25'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
         <!-- void OpenGLCurveEvaluator::normalCallBack(const GLfloat*, void*) -->
         <function-decl name='normalCallBack' mangled-name='_ZN20OpenGLCurveEvaluator14normalCallBackEPKfPv' filepath='libnurbs/interface/glcurveval.cc' line='378' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'OpenGLCurveEvaluator*' -->
-          <parameter type-id='type-id-23' is-artificial='yes'/>
+          <parameter type-id='type-id-26' is-artificial='yes'/>
           <!-- parameter of type 'const GLfloat*' -->
-          <parameter type-id='type-id-28'/>
+          <parameter type-id='type-id-31'/>
           <!-- parameter of type 'void*' -->
-          <parameter type-id='type-id-22'/>
+          <parameter type-id='type-id-25'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
         <!-- void OpenGLCurveEvaluator::colorCallBack(const GLfloat*, void*) -->
         <function-decl name='colorCallBack' mangled-name='_ZN20OpenGLCurveEvaluator13colorCallBackEPKfPv' filepath='libnurbs/interface/glcurveval.cc' line='387' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'OpenGLCurveEvaluator*' -->
-          <parameter type-id='type-id-23' is-artificial='yes'/>
+          <parameter type-id='type-id-26' is-artificial='yes'/>
           <!-- parameter of type 'const GLfloat*' -->
-          <parameter type-id='type-id-28'/>
+          <parameter type-id='type-id-31'/>
           <!-- parameter of type 'void*' -->
-          <parameter type-id='type-id-22'/>
+          <parameter type-id='type-id-25'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
         <!-- void OpenGLCurveEvaluator::texcoordCallBack(const GLfloat*, void*) -->
         <function-decl name='texcoordCallBack' mangled-name='_ZN20OpenGLCurveEvaluator16texcoordCallBackEPKfPv' filepath='libnurbs/interface/glcurveval.cc' line='396' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'OpenGLCurveEvaluator*' -->
-          <parameter type-id='type-id-23' is-artificial='yes'/>
+          <parameter type-id='type-id-26' is-artificial='yes'/>
           <!-- parameter of type 'const GLfloat*' -->
-          <parameter type-id='type-id-28'/>
+          <parameter type-id='type-id-31'/>
           <!-- parameter of type 'void*' -->
-          <parameter type-id='type-id-22'/>
+          <parameter type-id='type-id-25'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private' destructor='yes' vtable-offset='-1'>
         <!-- OpenGLCurveEvaluator::~OpenGLCurveEvaluator(int) -->
         <function-decl name='~OpenGLCurveEvaluator' filepath='libnurbs/interface/glcurveval.cc' line='78' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'OpenGLCurveEvaluator*' -->
-          <parameter type-id='type-id-23' is-artificial='yes'/>
+          <parameter type-id='type-id-26' is-artificial='yes'/>
           <!-- artificial parameter of type 'int' -->
-          <parameter type-id='type-id-10' is-artificial='yes'/>
+          <parameter type-id='type-id-11' is-artificial='yes'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private' vtable-offset='9'>
         <!-- void OpenGLCurveEvaluator::domain1f(REAL, REAL) -->
         <function-decl name='domain1f' mangled-name='_ZN20OpenGLCurveEvaluator8domain1fEff' filepath='libnurbs/interface/glcurveval.cc' line='98' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'OpenGLCurveEvaluator*' -->
-          <parameter type-id='type-id-23' is-artificial='yes'/>
+          <parameter type-id='type-id-26' is-artificial='yes'/>
           <!-- parameter of type 'typedef REAL' -->
           <parameter type-id='type-id-1'/>
           <!-- parameter of type 'typedef REAL' -->
           <parameter type-id='type-id-1'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private' vtable-offset='10'>
         <!-- void OpenGLCurveEvaluator::range1f(long int, REAL*, REAL*) -->
         <function-decl name='range1f' mangled-name='_ZN20OpenGLCurveEvaluator7range1fElPfS0_' filepath='libnurbs/interface/glcurveval.cc' line='90' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'OpenGLCurveEvaluator*' -->
-          <parameter type-id='type-id-23' is-artificial='yes'/>
+          <parameter type-id='type-id-26' is-artificial='yes'/>
           <!-- parameter of type 'long int' -->
-          <parameter type-id='type-id-12'/>
+          <parameter type-id='type-id-15'/>
           <!-- parameter of type 'REAL*' -->
-          <parameter type-id='type-id-13'/>
+          <parameter type-id='type-id-16'/>
           <!-- parameter of type 'REAL*' -->
-          <parameter type-id='type-id-13'/>
+          <parameter type-id='type-id-16'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private' vtable-offset='11'>
         <!-- void OpenGLCurveEvaluator::enable(long int) -->
         <function-decl name='enable' mangled-name='_ZN20OpenGLCurveEvaluator6enableEl' filepath='libnurbs/interface/glcurveval.cc' line='137' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'OpenGLCurveEvaluator*' -->
-          <parameter type-id='type-id-23' is-artificial='yes'/>
+          <parameter type-id='type-id-26' is-artificial='yes'/>
           <!-- parameter of type 'long int' -->
-          <parameter type-id='type-id-12'/>
+          <parameter type-id='type-id-15'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private' vtable-offset='12'>
         <!-- void OpenGLCurveEvaluator::disable(long int) -->
         <function-decl name='disable' mangled-name='_ZN20OpenGLCurveEvaluator7disableEl' filepath='libnurbs/interface/glcurveval.cc' line='127' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'OpenGLCurveEvaluator*' -->
-          <parameter type-id='type-id-23' is-artificial='yes'/>
+          <parameter type-id='type-id-26' is-artificial='yes'/>
           <!-- parameter of type 'long int' -->
-          <parameter type-id='type-id-12'/>
+          <parameter type-id='type-id-15'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private' vtable-offset='13'>
         <!-- void OpenGLCurveEvaluator::bgnmap1f(long int) -->
         <function-decl name='bgnmap1f' mangled-name='_ZN20OpenGLCurveEvaluator8bgnmap1fEl' filepath='libnurbs/interface/glcurveval.cc' line='164' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'OpenGLCurveEvaluator*' -->
-          <parameter type-id='type-id-23' is-artificial='yes'/>
+          <parameter type-id='type-id-26' is-artificial='yes'/>
           <!-- parameter of type 'long int' -->
-          <parameter type-id='type-id-12'/>
+          <parameter type-id='type-id-15'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private' vtable-offset='14'>
         <!-- void OpenGLCurveEvaluator::map1f(long int, REAL, REAL, long int, long int, REAL*) -->
         <function-decl name='map1f' mangled-name='_ZN20OpenGLCurveEvaluator5map1fElffllPf' filepath='libnurbs/interface/glcurveval.cc' line='199' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'OpenGLCurveEvaluator*' -->
-          <parameter type-id='type-id-23' is-artificial='yes'/>
+          <parameter type-id='type-id-26' is-artificial='yes'/>
           <!-- parameter of type 'long int' -->
-          <parameter type-id='type-id-12'/>
+          <parameter type-id='type-id-15'/>
           <!-- parameter of type 'typedef REAL' -->
           <parameter type-id='type-id-1'/>
           <!-- parameter of type 'typedef REAL' -->
           <parameter type-id='type-id-1'/>
           <!-- parameter of type 'long int' -->
-          <parameter type-id='type-id-12'/>
+          <parameter type-id='type-id-15'/>
           <!-- parameter of type 'long int' -->
-          <parameter type-id='type-id-12'/>
+          <parameter type-id='type-id-15'/>
           <!-- parameter of type 'REAL*' -->
-          <parameter type-id='type-id-13'/>
+          <parameter type-id='type-id-16'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private' vtable-offset='15'>
         <!-- void OpenGLCurveEvaluator::mapgrid1f(long int, REAL, REAL) -->
         <function-decl name='mapgrid1f' mangled-name='_ZN20OpenGLCurveEvaluator9mapgrid1fElff' filepath='libnurbs/interface/glcurveval.cc' line='147' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'OpenGLCurveEvaluator*' -->
-          <parameter type-id='type-id-23' is-artificial='yes'/>
+          <parameter type-id='type-id-26' is-artificial='yes'/>
           <!-- parameter of type 'long int' -->
-          <parameter type-id='type-id-12'/>
+          <parameter type-id='type-id-15'/>
           <!-- parameter of type 'typedef REAL' -->
           <parameter type-id='type-id-1'/>
           <!-- parameter of type 'typedef REAL' -->
           <parameter type-id='type-id-1'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private' vtable-offset='16'>
         <!-- void OpenGLCurveEvaluator::mapmesh1f(long int, long int, long int) -->
         <function-decl name='mapmesh1f' mangled-name='_ZN20OpenGLCurveEvaluator9mapmesh1fElll' filepath='libnurbs/interface/glcurveval.cc' line='262' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'OpenGLCurveEvaluator*' -->
-          <parameter type-id='type-id-23' is-artificial='yes'/>
+          <parameter type-id='type-id-26' is-artificial='yes'/>
           <!-- parameter of type 'long int' -->
-          <parameter type-id='type-id-12'/>
+          <parameter type-id='type-id-15'/>
           <!-- parameter of type 'long int' -->
-          <parameter type-id='type-id-12'/>
+          <parameter type-id='type-id-15'/>
           <!-- parameter of type 'long int' -->
-          <parameter type-id='type-id-12'/>
+          <parameter type-id='type-id-15'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private' vtable-offset='17'>
         <!-- void OpenGLCurveEvaluator::evalcoord1f(long int, REAL) -->
         <function-decl name='evalcoord1f' mangled-name='_ZN20OpenGLCurveEvaluator11evalcoord1fElf' filepath='libnurbs/interface/glcurveval.cc' line='296' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'OpenGLCurveEvaluator*' -->
-          <parameter type-id='type-id-23' is-artificial='yes'/>
+          <parameter type-id='type-id-26' is-artificial='yes'/>
           <!-- parameter of type 'long int' -->
-          <parameter type-id='type-id-12'/>
+          <parameter type-id='type-id-15'/>
           <!-- parameter of type 'typedef REAL' -->
           <parameter type-id='type-id-1'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private' vtable-offset='18'>
         <!-- void OpenGLCurveEvaluator::endmap1f() -->
         <function-decl name='endmap1f' mangled-name='_ZN20OpenGLCurveEvaluator8endmap1fEv' filepath='libnurbs/interface/glcurveval.cc' line='184' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'OpenGLCurveEvaluator*' -->
-          <parameter type-id='type-id-23' is-artificial='yes'/>
+          <parameter type-id='type-id-26' is-artificial='yes'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private' vtable-offset='19'>
         <!-- void OpenGLCurveEvaluator::bgnline() -->
         <function-decl name='bgnline' mangled-name='_ZN20OpenGLCurveEvaluator7bgnlineEv' filepath='libnurbs/interface/glcurveval.cc' line='105' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'OpenGLCurveEvaluator*' -->
-          <parameter type-id='type-id-23' is-artificial='yes'/>
+          <parameter type-id='type-id-26' is-artificial='yes'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private' vtable-offset='20'>
         <!-- void OpenGLCurveEvaluator::endline() -->
         <function-decl name='endline' mangled-name='_ZN20OpenGLCurveEvaluator7endlineEv' filepath='libnurbs/interface/glcurveval.cc' line='114' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'OpenGLCurveEvaluator*' -->
-          <parameter type-id='type-id-23' is-artificial='yes'/>
+          <parameter type-id='type-id-26' is-artificial='yes'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
     </class-decl>
     <!-- typedef curveEvalMachine curveEvalMachine -->
-    <typedef-decl name='curveEvalMachine' type-id='type-id-29' filepath='libnurbs/interface/glcurveval.h' line='64' column='1' id='type-id-15'/>
+    <typedef-decl name='curveEvalMachine' type-id='type-id-32' filepath='libnurbs/interface/glcurveval.h' line='64' column='1' id='type-id-18'/>
     <!-- struct curveEvalMachine -->
-    <class-decl name='curveEvalMachine' size-in-bits='6592' is-struct='yes' visibility='default' filepath='libnurbs/interface/glcurveval.h' line='55' column='1' id='type-id-29'>
+    <class-decl name='curveEvalMachine' size-in-bits='6592' is-struct='yes' visibility='default' filepath='libnurbs/interface/glcurveval.h' line='55' column='1' id='type-id-32'>
       <data-member access='public' layout-offset-in-bits='0'>
         <!-- REAL curveEvalMachine::uprime -->
         <var-decl name='uprime' type-id='type-id-1' visibility='default' filepath='libnurbs/interface/glcurveval.h' line='56' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='32'>
         <!-- int curveEvalMachine::k -->
-        <var-decl name='k' type-id='type-id-10' visibility='default' filepath='libnurbs/interface/glcurveval.h' line='57' column='1'/>
+        <var-decl name='k' type-id='type-id-11' visibility='default' filepath='libnurbs/interface/glcurveval.h' line='57' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
         <!-- REAL curveEvalMachine::u1 -->
@@ -814,11 +910,11 @@
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
         <!-- int curveEvalMachine::ustride -->
-        <var-decl name='ustride' type-id='type-id-10' visibility='default' filepath='libnurbs/interface/glcurveval.h' line='60' column='1'/>
+        <var-decl name='ustride' type-id='type-id-11' visibility='default' filepath='libnurbs/interface/glcurveval.h' line='60' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='160'>
         <!-- int curveEvalMachine::uorder -->
-        <var-decl name='uorder' type-id='type-id-10' visibility='default' filepath='libnurbs/interface/glcurveval.h' line='61' column='1'/>
+        <var-decl name='uorder' type-id='type-id-11' visibility='default' filepath='libnurbs/interface/glcurveval.h' line='61' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='192'>
         <!-- REAL curveEvalMachine::ctlpoints[160] -->
@@ -830,141 +926,45 @@
       </data-member>
     </class-decl>
     <!-- typedef float REAL -->
-    <typedef-decl name='REAL' type-id='type-id-30' filepath='libnurbs/internals/types.h' line='41' column='1' id='type-id-1'/>
+    <typedef-decl name='REAL' type-id='type-id-33' filepath='libnurbs/internals/types.h' line='41' column='1' id='type-id-1'/>
     <!-- BasicCurveEvaluator* -->
-    <pointer-type-def type-id='type-id-7' size-in-bits='64' id='type-id-9'/>
+    <pointer-type-def type-id='type-id-13' size-in-bits='64' id='type-id-14'/>
     <!-- CachingEvaluator* -->
-    <pointer-type-def type-id='type-id-8' size-in-bits='64' id='type-id-31'/>
+    <pointer-type-def type-id='type-id-7' size-in-bits='64' id='type-id-10'/>
     <!-- CurveMap* -->
-    <pointer-type-def type-id='type-id-32' size-in-bits='64' id='type-id-24'/>
+    <pointer-type-def type-id='type-id-34' size-in-bits='64' id='type-id-27'/>
     <!-- OpenGLCurveEvaluator* -->
-    <pointer-type-def type-id='type-id-14' size-in-bits='64' id='type-id-23'/>
+    <pointer-type-def type-id='type-id-17' size-in-bits='64' id='type-id-26'/>
     <!-- REAL* -->
-    <pointer-type-def type-id='type-id-1' size-in-bits='64' id='type-id-13'/>
+    <pointer-type-def type-id='type-id-1' size-in-bits='64' id='type-id-16'/>
     <!-- const GLfloat -->
-    <qualified-type-def type-id='type-id-33' const='yes' id='type-id-34'/>
+    <qualified-type-def type-id='type-id-35' const='yes' id='type-id-36'/>
     <!-- const GLfloat* -->
-    <pointer-type-def type-id='type-id-34' size-in-bits='64' id='type-id-28'/>
+    <pointer-type-def type-id='type-id-36' size-in-bits='64' id='type-id-31'/>
     <!-- curveEvalMachine* -->
-    <pointer-type-def type-id='type-id-15' size-in-bits='64' id='type-id-27'/>
+    <pointer-type-def type-id='type-id-18' size-in-bits='64' id='type-id-30'/>
     <!-- void (const GLfloat*)* -->
-    <pointer-type-def type-id='type-id-35' size-in-bits='64' id='type-id-18'/>
+    <pointer-type-def type-id='type-id-37' size-in-bits='64' id='type-id-21'/>
     <!-- void (const GLfloat*, void*)* -->
-    <pointer-type-def type-id='type-id-36' size-in-bits='64' id='type-id-21'/>
-    <!-- class CachingEvaluator -->
-    <class-decl name='CachingEvaluator' size-in-bits='64' visibility='default' filepath='libnurbs/internals/cachingeval.h' line='39' column='1' is-declaration-only='yes' id='type-id-8'>
-      <member-type access='private'>
-        <!-- enum CachingEvaluator::ServiceMode -->
-        <enum-decl name='ServiceMode' filepath='libnurbs/internals/cachingeval.h' line='42' column='1' id='type-id-37'>
-          <underlying-type type-id='type-id-38'/>
-          <enumerator name='play' value='0'/>
-          <enumerator name='record' value='1'/>
-          <enumerator name='playAndRecord' value='2'/>
-        </enum-decl>
-      </member-type>
-      <member-function access='private' destructor='yes' vtable-offset='-1'>
-        <!-- CachingEvaluator::~CachingEvaluator(int) -->
-        <function-decl name='~CachingEvaluator' filepath='libnurbs/internals/cachingeval.h' line='41' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <!-- implicit parameter of type 'CachingEvaluator*' -->
-          <parameter type-id='type-id-31' is-artificial='yes'/>
-          <!-- artificial parameter of type 'int' -->
-          <parameter type-id='type-id-10' is-artificial='yes'/>
-          <!-- void -->
-          <return type-id='type-id-11'/>
-        </function-decl>
-      </member-function>
-      <member-function access='private' vtable-offset='2'>
-        <!-- int CachingEvaluator::canRecord() -->
-        <function-decl name='canRecord' mangled-name='_ZN16CachingEvaluator9canRecordEv' filepath='libnurbs/internals/cachingeval.cc' line='43' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <!-- implicit parameter of type 'CachingEvaluator*' -->
-          <parameter type-id='type-id-31' is-artificial='yes'/>
-          <!-- int -->
-          <return type-id='type-id-10'/>
-        </function-decl>
-      </member-function>
-      <member-function access='private' vtable-offset='3'>
-        <!-- int CachingEvaluator::canPlayAndRecord() -->
-        <function-decl name='canPlayAndRecord' mangled-name='_ZN16CachingEvaluator16canPlayAndRecordEv' filepath='libnurbs/internals/cachingeval.cc' line='49' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <!-- implicit parameter of type 'CachingEvaluator*' -->
-          <parameter type-id='type-id-31' is-artificial='yes'/>
-          <!-- int -->
-          <return type-id='type-id-10'/>
-        </function-decl>
-      </member-function>
-      <member-function access='private' vtable-offset='4'>
-        <!-- int CachingEvaluator::createHandle(int) -->
-        <function-decl name='createHandle' mangled-name='_ZN16CachingEvaluator12createHandleEi' filepath='libnurbs/internals/cachingeval.cc' line='55' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <!-- implicit parameter of type 'CachingEvaluator*' -->
-          <parameter type-id='type-id-31' is-artificial='yes'/>
-          <!-- parameter of type 'int' -->
-          <parameter type-id='type-id-10'/>
-          <!-- int -->
-          <return type-id='type-id-10'/>
-        </function-decl>
-      </member-function>
-      <member-function access='private' vtable-offset='5'>
-        <!-- void CachingEvaluator::beginOutput(CachingEvaluator::ServiceMode, int) -->
-        <function-decl name='beginOutput' mangled-name='_ZN16CachingEvaluator11beginOutputENS_11ServiceModeEi' filepath='libnurbs/internals/cachingeval.cc' line='61' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <!-- implicit parameter of type 'CachingEvaluator*' -->
-          <parameter type-id='type-id-31' is-artificial='yes'/>
-          <!-- parameter of type 'enum CachingEvaluator::ServiceMode' -->
-          <parameter type-id='type-id-37'/>
-          <!-- parameter of type 'int' -->
-          <parameter type-id='type-id-10'/>
-          <!-- void -->
-          <return type-id='type-id-11'/>
-        </function-decl>
-      </member-function>
-      <member-function access='private' vtable-offset='6'>
-        <!-- void CachingEvaluator::endOutput() -->
-        <function-decl name='endOutput' mangled-name='_ZN16CachingEvaluator9endOutputEv' filepath='libnurbs/internals/cachingeval.cc' line='66' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <!-- implicit parameter of type 'CachingEvaluator*' -->
-          <parameter type-id='type-id-31' is-artificial='yes'/>
-          <!-- void -->
-          <return type-id='type-id-11'/>
-        </function-decl>
-      </member-function>
-      <member-function access='private' vtable-offset='7'>
-        <!-- void CachingEvaluator::discardRecording(int) -->
-        <function-decl name='discardRecording' mangled-name='_ZN16CachingEvaluator16discardRecordingEi' filepath='libnurbs/internals/cachingeval.cc' line='71' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <!-- implicit parameter of type 'CachingEvaluator*' -->
-          <parameter type-id='type-id-31' is-artificial='yes'/>
-          <!-- artificial parameter of type 'int' -->
-          <parameter type-id='type-id-10' is-artificial='yes'/>
-          <!-- void -->
-          <return type-id='type-id-11'/>
-        </function-decl>
-      </member-function>
-      <member-function access='private' vtable-offset='8'>
-        <!-- void CachingEvaluator::playRecording(int) -->
-        <function-decl name='playRecording' mangled-name='_ZN16CachingEvaluator13playRecordingEi' filepath='libnurbs/internals/cachingeval.cc' line='76' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <!-- implicit parameter of type 'CachingEvaluator*' -->
-          <parameter type-id='type-id-31' is-artificial='yes'/>
-          <!-- artificial parameter of type 'int' -->
-          <parameter type-id='type-id-10' is-artificial='yes'/>
-          <!-- void -->
-          <return type-id='type-id-11'/>
-        </function-decl>
-      </member-function>
-    </class-decl>
+    <pointer-type-def type-id='type-id-38' size-in-bits='64' id='type-id-24'/>
     <!-- void (const GLfloat*) -->
-    <function-type size-in-bits='64' id='type-id-35'>
+    <function-type size-in-bits='64' id='type-id-37'>
       <!-- parameter of type 'const GLfloat*' -->
-      <parameter type-id='type-id-28'/>
+      <parameter type-id='type-id-31'/>
       <!-- void -->
-      <return type-id='type-id-11'/>
+      <return type-id='type-id-12'/>
     </function-type>
     <!-- void (const GLfloat*, void*) -->
-    <function-type size-in-bits='64' id='type-id-36'>
+    <function-type size-in-bits='64' id='type-id-38'>
       <!-- parameter of type 'const GLfloat*' -->
-      <parameter type-id='type-id-28'/>
+      <parameter type-id='type-id-31'/>
       <!-- parameter of type 'void*' -->
-      <parameter type-id='type-id-22'/>
+      <parameter type-id='type-id-25'/>
       <!-- void -->
-      <return type-id='type-id-11'/>
+      <return type-id='type-id-12'/>
     </function-type>
     <!-- struct CurveMap -->
-    <class-decl name='CurveMap' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-32'/>
+    <class-decl name='CurveMap' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-34'/>
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='libnurbs/interface/glinterface.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-T0fsxk/Mesa-8.0.5/src/glu/sgi' language='LANG_C_plus_plus'>
     <!-- struct GLUnurbs -->
@@ -985,11 +985,11 @@
       </data-member>
       <data-member access='private' layout-offset-in-bits='1121792'>
         <!-- OpenGLCurveEvaluator GLUnurbs::curveEvaluator -->
-        <var-decl name='curveEvaluator' type-id='type-id-14' visibility='default' filepath='libnurbs/interface/glrenderer.h' line='132' column='1'/>
+        <var-decl name='curveEvaluator' type-id='type-id-17' visibility='default' filepath='libnurbs/interface/glrenderer.h' line='132' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='1149376'>
         <!-- int GLUnurbs::callbackFlag -->
-        <var-decl name='callbackFlag' type-id='type-id-10' visibility='default' filepath='libnurbs/interface/glrenderer.h' line='143' column='1'/>
+        <var-decl name='callbackFlag' type-id='type-id-11' visibility='default' filepath='libnurbs/interface/glrenderer.h' line='143' column='1'/>
       </data-member>
       <member-function access='public'>
         <!-- void GLUnurbs::setNurbsCallbackData(void*) -->
@@ -997,9 +997,9 @@
           <!-- implicit parameter of type 'GLUnurbs*' -->
           <parameter type-id='type-id-44' is-artificial='yes'/>
           <!-- parameter of type 'void*' -->
-          <parameter type-id='type-id-22'/>
+          <parameter type-id='type-id-25'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
@@ -1008,11 +1008,11 @@
           <!-- implicit parameter of type 'GLUnurbs*' -->
           <parameter type-id='type-id-44' is-artificial='yes'/>
           <!-- parameter of type 'typedef GLenum' -->
-          <parameter type-id='type-id-25'/>
+          <parameter type-id='type-id-28'/>
           <!-- parameter of type 'typedef _GLUfuncptr' -->
-          <parameter type-id='type-id-26'/>
+          <parameter type-id='type-id-29'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
@@ -1021,9 +1021,9 @@
           <!-- implicit parameter of type 'GLUnurbs*' -->
           <parameter type-id='type-id-44' is-artificial='yes'/>
           <!-- parameter of type 'int' -->
-          <parameter type-id='type-id-10'/>
+          <parameter type-id='type-id-11'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
@@ -1041,7 +1041,7 @@
           <!-- implicit parameter of type 'GLUnurbs*' -->
           <parameter type-id='type-id-44' is-artificial='yes'/>
           <!-- int -->
-          <return type-id='type-id-10'/>
+          <return type-id='type-id-11'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
@@ -1050,9 +1050,9 @@
           <!-- implicit parameter of type 'GLUnurbs*' -->
           <parameter type-id='type-id-44' is-artificial='yes'/>
           <!-- parameter of type 'float' -->
-          <parameter type-id='type-id-30'/>
+          <parameter type-id='type-id-33'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
@@ -1061,9 +1061,9 @@
           <!-- implicit parameter of type 'GLUnurbs*' -->
           <parameter type-id='type-id-44' is-artificial='yes'/>
           <!-- parameter of type 'int' -->
-          <parameter type-id='type-id-10'/>
+          <parameter type-id='type-id-11'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
@@ -1072,9 +1072,9 @@
           <!-- implicit parameter of type 'GLUnurbs*' -->
           <parameter type-id='type-id-44' is-artificial='yes'/>
           <!-- parameter of type 'int' -->
-          <parameter type-id='type-id-10'/>
+          <parameter type-id='type-id-11'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public' constructor='yes'>
@@ -1083,7 +1083,7 @@
           <!-- implicit parameter of type 'GLUnurbs*' -->
           <parameter type-id='type-id-44' is-artificial='yes'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
@@ -1092,7 +1092,7 @@
           <!-- implicit parameter of type 'GLUnurbs*' -->
           <parameter type-id='type-id-44' is-artificial='yes'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
@@ -1101,13 +1101,13 @@
           <!-- implicit parameter of type 'GLUnurbs*' -->
           <parameter type-id='type-id-44' is-artificial='yes'/>
           <!-- parameter of type 'const GLfloat*' -->
-          <parameter type-id='type-id-28'/>
+          <parameter type-id='type-id-31'/>
           <!-- parameter of type 'const GLfloat*' -->
-          <parameter type-id='type-id-28'/>
+          <parameter type-id='type-id-31'/>
           <!-- parameter of type 'const GLint*' -->
           <parameter type-id='type-id-45'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
@@ -1116,7 +1116,7 @@
           <!-- implicit parameter of type 'GLUnurbs*' -->
           <parameter type-id='type-id-44' is-artificial='yes'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
@@ -1125,7 +1125,7 @@
           <!-- implicit parameter of type 'GLUnurbs*' -->
           <parameter type-id='type-id-44' is-artificial='yes'/>
           <!-- int -->
-          <return type-id='type-id-10'/>
+          <return type-id='type-id-11'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
@@ -1134,9 +1134,9 @@
           <!-- implicit parameter of type 'GLUnurbs*' -->
           <parameter type-id='type-id-44' is-artificial='yes'/>
           <!-- parameter of type 'int' -->
-          <parameter type-id='type-id-10'/>
+          <parameter type-id='type-id-11'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
@@ -1145,7 +1145,7 @@
           <!-- implicit parameter of type 'GLUnurbs*' -->
           <parameter type-id='type-id-44' is-artificial='yes'/>
           <!-- int -->
-          <return type-id='type-id-10'/>
+          <return type-id='type-id-11'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
@@ -1154,9 +1154,9 @@
           <!-- implicit parameter of type 'GLUnurbs*' -->
           <parameter type-id='type-id-44' is-artificial='yes'/>
           <!-- parameter of type 'int' -->
-          <parameter type-id='type-id-10'/>
+          <parameter type-id='type-id-11'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -1169,7 +1169,7 @@
           <!-- parameter of type 'const GLint*' -->
           <parameter type-id='type-id-45'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -1180,7 +1180,7 @@
           <!-- parameter of type 'GLfloat[4]*' -->
           <parameter type-id='type-id-46'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private' static='yes'>
@@ -1189,7 +1189,7 @@
           <!-- parameter of type 'GLfloat[4]*' -->
           <parameter type-id='type-id-46'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private' static='yes'>
@@ -1202,7 +1202,7 @@
           <!-- parameter of type 'GLfloat[4]*' -->
           <parameter type-id='type-id-46'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private' static='yes'>
@@ -1215,7 +1215,7 @@
           <!-- parameter of type 'GLfloat[4]*' -->
           <parameter type-id='type-id-46'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public' vtable-offset='2'>
@@ -1224,7 +1224,7 @@
           <!-- implicit parameter of type 'GLUnurbs*' -->
           <parameter type-id='type-id-44' is-artificial='yes'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public' vtable-offset='3'>
@@ -1233,7 +1233,7 @@
           <!-- implicit parameter of type 'GLUnurbs*' -->
           <parameter type-id='type-id-44' is-artificial='yes'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public' vtable-offset='6'>
@@ -1242,9 +1242,9 @@
           <!-- implicit parameter of type 'GLUnurbs*' -->
           <parameter type-id='type-id-44' is-artificial='yes'/>
           <!-- parameter of type 'int' -->
-          <parameter type-id='type-id-10'/>
+          <parameter type-id='type-id-11'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
     </class-decl>
@@ -1258,15 +1258,15 @@
       </data-member>
       <data-member access='private' layout-offset-in-bits='256'>
         <!-- int OpenGLSurfaceEvaluator::tmeshing -->
-        <var-decl name='tmeshing' type-id='type-id-10' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='181' column='1'/>
+        <var-decl name='tmeshing' type-id='type-id-11' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='181' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='288'>
         <!-- int OpenGLSurfaceEvaluator::which -->
-        <var-decl name='which' type-id='type-id-10' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='182' column='1'/>
+        <var-decl name='which' type-id='type-id-11' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='182' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='320'>
         <!-- int OpenGLSurfaceEvaluator::vcount -->
-        <var-decl name='vcount' type-id='type-id-10' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='183' column='1'/>
+        <var-decl name='vcount' type-id='type-id-11' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='183' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='352'>
         <!-- GLint OpenGLSurfaceEvaluator::gl_polygon_mode[2] -->
@@ -1278,71 +1278,71 @@
       </data-member>
       <data-member access='private' layout-offset-in-bits='512'>
         <!-- int OpenGLSurfaceEvaluator::output_triangles -->
-        <var-decl name='output_triangles' type-id='type-id-10' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='189' column='1'/>
+        <var-decl name='output_triangles' type-id='type-id-11' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='189' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='576'>
         <!-- void (typedef GLenum)* OpenGLSurfaceEvaluator::beginCallBackN -->
-        <var-decl name='beginCallBackN' type-id='type-id-16' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='193' column='1'/>
+        <var-decl name='beginCallBackN' type-id='type-id-19' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='193' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='640'>
         <!-- void ()* OpenGLSurfaceEvaluator::endCallBackN -->
-        <var-decl name='endCallBackN' type-id='type-id-17' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='194' column='1'/>
+        <var-decl name='endCallBackN' type-id='type-id-20' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='194' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='704'>
         <!-- void (const GLfloat*)* OpenGLSurfaceEvaluator::vertexCallBackN -->
-        <var-decl name='vertexCallBackN' type-id='type-id-18' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='195' column='1'/>
+        <var-decl name='vertexCallBackN' type-id='type-id-21' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='195' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='768'>
         <!-- void (const GLfloat*)* OpenGLSurfaceEvaluator::normalCallBackN -->
-        <var-decl name='normalCallBackN' type-id='type-id-18' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='196' column='1'/>
+        <var-decl name='normalCallBackN' type-id='type-id-21' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='196' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='832'>
         <!-- void (const GLfloat*)* OpenGLSurfaceEvaluator::colorCallBackN -->
-        <var-decl name='colorCallBackN' type-id='type-id-18' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='197' column='1'/>
+        <var-decl name='colorCallBackN' type-id='type-id-21' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='197' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='896'>
         <!-- void (const GLfloat*)* OpenGLSurfaceEvaluator::texcoordCallBackN -->
-        <var-decl name='texcoordCallBackN' type-id='type-id-18' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='198' column='1'/>
+        <var-decl name='texcoordCallBackN' type-id='type-id-21' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='198' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='960'>
         <!-- void (typedef GLenum, void*)* OpenGLSurfaceEvaluator::beginCallBackData -->
-        <var-decl name='beginCallBackData' type-id='type-id-19' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='200' column='1'/>
+        <var-decl name='beginCallBackData' type-id='type-id-22' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='200' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='1024'>
         <!-- void (void*)* OpenGLSurfaceEvaluator::endCallBackData -->
-        <var-decl name='endCallBackData' type-id='type-id-20' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='201' column='1'/>
+        <var-decl name='endCallBackData' type-id='type-id-23' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='201' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='1088'>
         <!-- void (const GLfloat*, void*)* OpenGLSurfaceEvaluator::vertexCallBackData -->
-        <var-decl name='vertexCallBackData' type-id='type-id-21' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='202' column='1'/>
+        <var-decl name='vertexCallBackData' type-id='type-id-24' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='202' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='1152'>
         <!-- void (const GLfloat*, void*)* OpenGLSurfaceEvaluator::normalCallBackData -->
-        <var-decl name='normalCallBackData' type-id='type-id-21' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='203' column='1'/>
+        <var-decl name='normalCallBackData' type-id='type-id-24' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='203' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='1216'>
         <!-- void (const GLfloat*, void*)* OpenGLSurfaceEvaluator::colorCallBackData -->
-        <var-decl name='colorCallBackData' type-id='type-id-21' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='204' column='1'/>
+        <var-decl name='colorCallBackData' type-id='type-id-24' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='204' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='1280'>
         <!-- void (const GLfloat*, void*)* OpenGLSurfaceEvaluator::texcoordCallBackData -->
-        <var-decl name='texcoordCallBackData' type-id='type-id-21' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='205' column='1'/>
+        <var-decl name='texcoordCallBackData' type-id='type-id-24' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='205' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='1344'>
         <!-- void* OpenGLSurfaceEvaluator::userData -->
-        <var-decl name='userData' type-id='type-id-22' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='215' column='1'/>
+        <var-decl name='userData' type-id='type-id-25' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='215' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='1408'>
         <!-- int OpenGLSurfaceEvaluator::LOD_eval_level -->
-        <var-decl name='LOD_eval_level' type-id='type-id-10' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='222' column='1'/>
+        <var-decl name='LOD_eval_level' type-id='type-id-11' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='222' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='1440'>
         <!-- int OpenGLSurfaceEvaluator::global_uorder -->
-        <var-decl name='global_uorder' type-id='type-id-10' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='231' column='1'/>
+        <var-decl name='global_uorder' type-id='type-id-11' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='231' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='1472'>
         <!-- int OpenGLSurfaceEvaluator::global_vorder -->
-        <var-decl name='global_vorder' type-id='type-id-10' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='232' column='1'/>
+        <var-decl name='global_vorder' type-id='type-id-11' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='232' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='1504'>
         <!-- REAL OpenGLSurfaceEvaluator::global_uprime -->
@@ -1362,19 +1362,19 @@
       </data-member>
       <data-member access='private' layout-offset-in-bits='1632'>
         <!-- int OpenGLSurfaceEvaluator::global_uorder_BV -->
-        <var-decl name='global_uorder_BV' type-id='type-id-10' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='237' column='1'/>
+        <var-decl name='global_uorder_BV' type-id='type-id-11' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='237' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='1664'>
         <!-- int OpenGLSurfaceEvaluator::global_vorder_BV -->
-        <var-decl name='global_vorder_BV' type-id='type-id-10' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='238' column='1'/>
+        <var-decl name='global_vorder_BV' type-id='type-id-11' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='238' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='1696'>
         <!-- int OpenGLSurfaceEvaluator::global_uorder_BU -->
-        <var-decl name='global_uorder_BU' type-id='type-id-10' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='239' column='1'/>
+        <var-decl name='global_uorder_BU' type-id='type-id-11' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='239' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='1728'>
         <!-- int OpenGLSurfaceEvaluator::global_vorder_BU -->
-        <var-decl name='global_vorder_BU' type-id='type-id-10' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='240' column='1'/>
+        <var-decl name='global_vorder_BU' type-id='type-id-11' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='240' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='1760'>
         <!-- REAL OpenGLSurfaceEvaluator::global_ucoeff[40] -->
@@ -1410,11 +1410,11 @@
       </data-member>
       <data-member access='private' layout-offset-in-bits='27392'>
         <!-- REAL* OpenGLSurfaceEvaluator::global_baseData -->
-        <var-decl name='global_baseData' type-id='type-id-13' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='251' column='1'/>
+        <var-decl name='global_baseData' type-id='type-id-16' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='251' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='27456'>
         <!-- int OpenGLSurfaceEvaluator::global_ev_k -->
-        <var-decl name='global_ev_k' type-id='type-id-10' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='253' column='1'/>
+        <var-decl name='global_ev_k' type-id='type-id-11' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='253' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='27488'>
         <!-- REAL OpenGLSurfaceEvaluator::global_ev_u1 -->
@@ -1426,11 +1426,11 @@
       </data-member>
       <data-member access='private' layout-offset-in-bits='27552'>
         <!-- int OpenGLSurfaceEvaluator::global_ev_ustride -->
-        <var-decl name='global_ev_ustride' type-id='type-id-10' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='256' column='1'/>
+        <var-decl name='global_ev_ustride' type-id='type-id-11' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='256' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='27584'>
         <!-- int OpenGLSurfaceEvaluator::global_ev_uorder -->
-        <var-decl name='global_ev_uorder' type-id='type-id-10' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='257' column='1'/>
+        <var-decl name='global_ev_uorder' type-id='type-id-11' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='257' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='27616'>
         <!-- REAL OpenGLSurfaceEvaluator::global_ev_v1 -->
@@ -1442,11 +1442,11 @@
       </data-member>
       <data-member access='private' layout-offset-in-bits='27680'>
         <!-- int OpenGLSurfaceEvaluator::global_ev_vstride -->
-        <var-decl name='global_ev_vstride' type-id='type-id-10' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='260' column='1'/>
+        <var-decl name='global_ev_vstride' type-id='type-id-11' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='260' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='27712'>
         <!-- int OpenGLSurfaceEvaluator::global_ev_vorder -->
-        <var-decl name='global_ev_vorder' type-id='type-id-10' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='261' column='1'/>
+        <var-decl name='global_ev_vorder' type-id='type-id-11' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='261' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='27744'>
         <!-- REAL OpenGLSurfaceEvaluator::global_ev_ctlPoints[6400] -->
@@ -1462,7 +1462,7 @@
       </data-member>
       <data-member access='private' layout-offset-in-bits='232608'>
         <!-- int OpenGLSurfaceEvaluator::global_grid_nu -->
-        <var-decl name='global_grid_nu' type-id='type-id-10' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='266' column='1'/>
+        <var-decl name='global_grid_nu' type-id='type-id-11' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='266' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='232640'>
         <!-- REAL OpenGLSurfaceEvaluator::global_grid_v0 -->
@@ -1474,7 +1474,7 @@
       </data-member>
       <data-member access='private' layout-offset-in-bits='232704'>
         <!-- int OpenGLSurfaceEvaluator::global_grid_nv -->
-        <var-decl name='global_grid_nv' type-id='type-id-10' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='269' column='1'/>
+        <var-decl name='global_grid_nv' type-id='type-id-11' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='269' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='232736'>
         <!-- surfEvalMachine OpenGLSurfaceEvaluator::em_vertex -->
@@ -1494,27 +1494,27 @@
       </data-member>
       <data-member access='private' layout-offset-in-bits='1073824'>
         <!-- int OpenGLSurfaceEvaluator::auto_normal_flag -->
-        <var-decl name='auto_normal_flag' type-id='type-id-10' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='354' column='1'/>
+        <var-decl name='auto_normal_flag' type-id='type-id-11' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='354' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='1073856'>
         <!-- int OpenGLSurfaceEvaluator::callback_auto_normal -->
-        <var-decl name='callback_auto_normal' type-id='type-id-10' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='356' column='1'/>
+        <var-decl name='callback_auto_normal' type-id='type-id-11' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='356' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='1073888'>
         <!-- int OpenGLSurfaceEvaluator::vertex_flag -->
-        <var-decl name='vertex_flag' type-id='type-id-10' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='357' column='1'/>
+        <var-decl name='vertex_flag' type-id='type-id-11' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='357' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='1073920'>
         <!-- int OpenGLSurfaceEvaluator::normal_flag -->
-        <var-decl name='normal_flag' type-id='type-id-10' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='358' column='1'/>
+        <var-decl name='normal_flag' type-id='type-id-11' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='358' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='1073952'>
         <!-- int OpenGLSurfaceEvaluator::color_flag -->
-        <var-decl name='color_flag' type-id='type-id-10' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='359' column='1'/>
+        <var-decl name='color_flag' type-id='type-id-11' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='359' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='1073984'>
         <!-- int OpenGLSurfaceEvaluator::texcoord_flag -->
-        <var-decl name='texcoord_flag' type-id='type-id-10' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='360' column='1'/>
+        <var-decl name='texcoord_flag' type-id='type-id-11' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='360' column='1'/>
       </data-member>
       <member-function access='public'>
         <!-- void OpenGLSurfaceEvaluator::set_callback_userData(void*) -->
@@ -1522,9 +1522,9 @@
           <!-- implicit parameter of type 'OpenGLSurfaceEvaluator*' -->
           <parameter type-id='type-id-55' is-artificial='yes'/>
           <!-- parameter of type 'void*' -->
-          <parameter type-id='type-id-22'/>
+          <parameter type-id='type-id-25'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
@@ -1533,9 +1533,9 @@
           <!-- implicit parameter of type 'OpenGLSurfaceEvaluator*' -->
           <parameter type-id='type-id-55' is-artificial='yes'/>
           <!-- parameter of type 'int' -->
-          <parameter type-id='type-id-10'/>
+          <parameter type-id='type-id-11'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public' constructor='yes'>
@@ -1544,7 +1544,7 @@
           <!-- implicit parameter of type 'OpenGLSurfaceEvaluator*' -->
           <parameter type-id='type-id-55' is-artificial='yes'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
@@ -1555,7 +1555,7 @@
           <!-- parameter of type 'SurfaceMap*' -->
           <parameter type-id='type-id-56'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
@@ -1568,7 +1568,7 @@
           <!-- parameter of type 'typedef REAL' -->
           <parameter type-id='type-id-1'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
@@ -1577,11 +1577,11 @@
           <!-- implicit parameter of type 'OpenGLSurfaceEvaluator*' -->
           <parameter type-id='type-id-55' is-artificial='yes'/>
           <!-- parameter of type 'long int' -->
-          <parameter type-id='type-id-12'/>
+          <parameter type-id='type-id-15'/>
           <!-- parameter of type 'long int' -->
-          <parameter type-id='type-id-12'/>
+          <parameter type-id='type-id-15'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
@@ -1594,7 +1594,7 @@
           <!-- parameter of type 'typedef REAL' -->
           <parameter type-id='type-id-1'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
@@ -1603,11 +1603,11 @@
           <!-- implicit parameter of type 'OpenGLSurfaceEvaluator*' -->
           <parameter type-id='type-id-55' is-artificial='yes'/>
           <!-- parameter of type 'long int' -->
-          <parameter type-id='type-id-12'/>
+          <parameter type-id='type-id-15'/>
           <!-- parameter of type 'long int' -->
-          <parameter type-id='type-id-12'/>
+          <parameter type-id='type-id-15'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
@@ -1616,11 +1616,11 @@
           <!-- implicit parameter of type 'OpenGLSurfaceEvaluator*' -->
           <parameter type-id='type-id-55' is-artificial='yes'/>
           <!-- parameter of type 'typedef GLenum' -->
-          <parameter type-id='type-id-25'/>
+          <parameter type-id='type-id-28'/>
           <!-- parameter of type 'typedef _GLUfuncptr' -->
-          <parameter type-id='type-id-26'/>
+          <parameter type-id='type-id-29'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
@@ -1629,7 +1629,7 @@
           <!-- implicit parameter of type 'OpenGLSurfaceEvaluator*' -->
           <parameter type-id='type-id-55' is-artificial='yes'/>
           <!-- int -->
-          <return type-id='type-id-10'/>
+          <return type-id='type-id-11'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
@@ -1638,9 +1638,9 @@
           <!-- implicit parameter of type 'OpenGLSurfaceEvaluator*' -->
           <parameter type-id='type-id-55' is-artificial='yes'/>
           <!-- parameter of type 'int' -->
-          <parameter type-id='type-id-10'/>
+          <parameter type-id='type-id-11'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
@@ -1649,7 +1649,7 @@
           <!-- implicit parameter of type 'OpenGLSurfaceEvaluator*' -->
           <parameter type-id='type-id-55' is-artificial='yes'/>
           <!-- int -->
-          <return type-id='type-id-10'/>
+          <return type-id='type-id-11'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
@@ -1658,9 +1658,9 @@
           <!-- implicit parameter of type 'OpenGLSurfaceEvaluator*' -->
           <parameter type-id='type-id-55' is-artificial='yes'/>
           <!-- parameter of type 'int' -->
-          <parameter type-id='type-id-10'/>
+          <parameter type-id='type-id-11'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -1669,11 +1669,11 @@
           <!-- implicit parameter of type 'OpenGLSurfaceEvaluator*' -->
           <parameter type-id='type-id-55' is-artificial='yes'/>
           <!-- parameter of type 'typedef GLenum' -->
-          <parameter type-id='type-id-25'/>
+          <parameter type-id='type-id-28'/>
           <!-- parameter of type 'void*' -->
-          <parameter type-id='type-id-22'/>
+          <parameter type-id='type-id-25'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -1682,9 +1682,9 @@
           <!-- implicit parameter of type 'OpenGLSurfaceEvaluator*' -->
           <parameter type-id='type-id-55' is-artificial='yes'/>
           <!-- parameter of type 'void*' -->
-          <parameter type-id='type-id-22'/>
+          <parameter type-id='type-id-25'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -1693,11 +1693,11 @@
           <!-- implicit parameter of type 'OpenGLSurfaceEvaluator*' -->
           <parameter type-id='type-id-55' is-artificial='yes'/>
           <!-- parameter of type 'const GLfloat*' -->
-          <parameter type-id='type-id-28'/>
+          <parameter type-id='type-id-31'/>
           <!-- parameter of type 'void*' -->
-          <parameter type-id='type-id-22'/>
+          <parameter type-id='type-id-25'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -1706,11 +1706,11 @@
           <!-- implicit parameter of type 'OpenGLSurfaceEvaluator*' -->
           <parameter type-id='type-id-55' is-artificial='yes'/>
           <!-- parameter of type 'const GLfloat*' -->
-          <parameter type-id='type-id-28'/>
+          <parameter type-id='type-id-31'/>
           <!-- parameter of type 'void*' -->
-          <parameter type-id='type-id-22'/>
+          <parameter type-id='type-id-25'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -1719,11 +1719,11 @@
           <!-- implicit parameter of type 'OpenGLSurfaceEvaluator*' -->
           <parameter type-id='type-id-55' is-artificial='yes'/>
           <!-- parameter of type 'const GLfloat*' -->
-          <parameter type-id='type-id-28'/>
+          <parameter type-id='type-id-31'/>
           <!-- parameter of type 'void*' -->
-          <parameter type-id='type-id-22'/>
+          <parameter type-id='type-id-25'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -1732,11 +1732,11 @@
           <!-- implicit parameter of type 'OpenGLSurfaceEvaluator*' -->
           <parameter type-id='type-id-55' is-artificial='yes'/>
           <!-- parameter of type 'const GLfloat*' -->
-          <parameter type-id='type-id-28'/>
+          <parameter type-id='type-id-31'/>
           <!-- parameter of type 'void*' -->
-          <parameter type-id='type-id-22'/>
+          <parameter type-id='type-id-25'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -1745,15 +1745,15 @@
           <!-- implicit parameter of type 'OpenGLSurfaceEvaluator*' -->
           <parameter type-id='type-id-55' is-artificial='yes'/>
           <!-- parameter of type 'REAL*' -->
-          <parameter type-id='type-id-13'/>
+          <parameter type-id='type-id-16'/>
           <!-- parameter of type 'REAL*' -->
-          <parameter type-id='type-id-13'/>
+          <parameter type-id='type-id-16'/>
           <!-- parameter of type 'REAL*' -->
-          <parameter type-id='type-id-13'/>
+          <parameter type-id='type-id-16'/>
           <!-- parameter of type 'int' -->
-          <parameter type-id='type-id-10'/>
+          <parameter type-id='type-id-11'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -1762,15 +1762,15 @@
           <!-- implicit parameter of type 'OpenGLSurfaceEvaluator*' -->
           <parameter type-id='type-id-55' is-artificial='yes'/>
           <!-- parameter of type 'int' -->
-          <parameter type-id='type-id-10'/>
+          <parameter type-id='type-id-11'/>
           <!-- parameter of type 'REAL*' -->
-          <parameter type-id='type-id-13'/>
+          <parameter type-id='type-id-16'/>
           <!-- parameter of type 'int' -->
-          <parameter type-id='type-id-10'/>
+          <parameter type-id='type-id-11'/>
           <!-- parameter of type 'int' -->
-          <parameter type-id='type-id-10'/>
+          <parameter type-id='type-id-11'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -1779,7 +1779,7 @@
           <!-- implicit parameter of type 'OpenGLSurfaceEvaluator*' -->
           <parameter type-id='type-id-55' is-artificial='yes'/>
           <!-- parameter of type 'int' -->
-          <parameter type-id='type-id-10'/>
+          <parameter type-id='type-id-11'/>
           <!-- parameter of type 'typedef REAL' -->
           <parameter type-id='type-id-1'/>
           <!-- parameter of type 'typedef REAL' -->
@@ -1789,23 +1789,23 @@
           <!-- parameter of type 'typedef REAL' -->
           <parameter type-id='type-id-1'/>
           <!-- parameter of type 'int' -->
-          <parameter type-id='type-id-10'/>
+          <parameter type-id='type-id-11'/>
           <!-- parameter of type 'typedef REAL' -->
           <parameter type-id='type-id-1'/>
           <!-- parameter of type 'typedef REAL' -->
           <parameter type-id='type-id-1'/>
           <!-- parameter of type 'int' -->
-          <parameter type-id='type-id-10'/>
+          <parameter type-id='type-id-11'/>
           <!-- parameter of type 'REAL*' -->
-          <parameter type-id='type-id-13'/>
+          <parameter type-id='type-id-16'/>
           <!-- parameter of type 'REAL*' -->
-          <parameter type-id='type-id-13'/>
+          <parameter type-id='type-id-16'/>
           <!-- parameter of type 'REAL*' -->
-          <parameter type-id='type-id-13'/>
+          <parameter type-id='type-id-16'/>
           <!-- parameter of type 'REAL*' -->
-          <parameter type-id='type-id-13'/>
+          <parameter type-id='type-id-16'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -1814,13 +1814,13 @@
           <!-- implicit parameter of type 'OpenGLSurfaceEvaluator*' -->
           <parameter type-id='type-id-55' is-artificial='yes'/>
           <!-- parameter of type 'int' -->
-          <parameter type-id='type-id-10'/>
+          <parameter type-id='type-id-11'/>
           <!-- parameter of type 'typedef REAL' -->
           <parameter type-id='type-id-1'/>
           <!-- parameter of type 'REAL*' -->
-          <parameter type-id='type-id-13'/>
+          <parameter type-id='type-id-16'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -1829,15 +1829,15 @@
           <!-- implicit parameter of type 'OpenGLSurfaceEvaluator*' -->
           <parameter type-id='type-id-55' is-artificial='yes'/>
           <!-- parameter of type 'int' -->
-          <parameter type-id='type-id-10'/>
+          <parameter type-id='type-id-11'/>
           <!-- parameter of type 'typedef REAL' -->
           <parameter type-id='type-id-1'/>
           <!-- parameter of type 'REAL*' -->
-          <parameter type-id='type-id-13'/>
+          <parameter type-id='type-id-16'/>
           <!-- parameter of type 'REAL*' -->
-          <parameter type-id='type-id-13'/>
+          <parameter type-id='type-id-16'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -1846,13 +1846,13 @@
           <!-- implicit parameter of type 'OpenGLSurfaceEvaluator*' -->
           <parameter type-id='type-id-55' is-artificial='yes'/>
           <!-- parameter of type 'REAL*' -->
-          <parameter type-id='type-id-13'/>
+          <parameter type-id='type-id-16'/>
           <!-- parameter of type 'REAL*' -->
-          <parameter type-id='type-id-13'/>
+          <parameter type-id='type-id-16'/>
           <!-- parameter of type 'REAL*' -->
-          <parameter type-id='type-id-13'/>
+          <parameter type-id='type-id-16'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -1861,13 +1861,13 @@
           <!-- implicit parameter of type 'OpenGLSurfaceEvaluator*' -->
           <parameter type-id='type-id-55' is-artificial='yes'/>
           <!-- parameter of type 'REAL*' -->
-          <parameter type-id='type-id-13'/>
+          <parameter type-id='type-id-16'/>
           <!-- parameter of type 'REAL*' -->
-          <parameter type-id='type-id-13'/>
+          <parameter type-id='type-id-16'/>
           <!-- parameter of type 'REAL*' -->
-          <parameter type-id='type-id-13'/>
+          <parameter type-id='type-id-16'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -1880,11 +1880,11 @@
           <!-- parameter of type 'typedef REAL' -->
           <parameter type-id='type-id-1'/>
           <!-- parameter of type 'REAL*' -->
-          <parameter type-id='type-id-13'/>
+          <parameter type-id='type-id-16'/>
           <!-- parameter of type 'REAL*' -->
-          <parameter type-id='type-id-13'/>
+          <parameter type-id='type-id-16'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -1893,27 +1893,27 @@
           <!-- implicit parameter of type 'OpenGLSurfaceEvaluator*' -->
           <parameter type-id='type-id-55' is-artificial='yes'/>
           <!-- parameter of type 'int' -->
-          <parameter type-id='type-id-10'/>
+          <parameter type-id='type-id-11'/>
           <!-- parameter of type 'typedef REAL' -->
           <parameter type-id='type-id-1'/>
           <!-- parameter of type 'typedef REAL' -->
           <parameter type-id='type-id-1'/>
           <!-- parameter of type 'int' -->
-          <parameter type-id='type-id-10'/>
+          <parameter type-id='type-id-11'/>
           <!-- parameter of type 'int' -->
-          <parameter type-id='type-id-10'/>
+          <parameter type-id='type-id-11'/>
           <!-- parameter of type 'typedef REAL' -->
           <parameter type-id='type-id-1'/>
           <!-- parameter of type 'typedef REAL' -->
           <parameter type-id='type-id-1'/>
           <!-- parameter of type 'int' -->
-          <parameter type-id='type-id-10'/>
+          <parameter type-id='type-id-11'/>
           <!-- parameter of type 'int' -->
-          <parameter type-id='type-id-10'/>
+          <parameter type-id='type-id-11'/>
           <!-- parameter of type 'REAL*' -->
-          <parameter type-id='type-id-13'/>
+          <parameter type-id='type-id-16'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -1922,19 +1922,19 @@
           <!-- implicit parameter of type 'OpenGLSurfaceEvaluator*' -->
           <parameter type-id='type-id-55' is-artificial='yes'/>
           <!-- parameter of type 'int' -->
-          <parameter type-id='type-id-10'/>
+          <parameter type-id='type-id-11'/>
           <!-- parameter of type 'typedef REAL' -->
           <parameter type-id='type-id-1'/>
           <!-- parameter of type 'typedef REAL' -->
           <parameter type-id='type-id-1'/>
           <!-- parameter of type 'int' -->
-          <parameter type-id='type-id-10'/>
+          <parameter type-id='type-id-11'/>
           <!-- parameter of type 'typedef REAL' -->
           <parameter type-id='type-id-1'/>
           <!-- parameter of type 'typedef REAL' -->
           <parameter type-id='type-id-1'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -1943,15 +1943,15 @@
           <!-- implicit parameter of type 'OpenGLSurfaceEvaluator*' -->
           <parameter type-id='type-id-55' is-artificial='yes'/>
           <!-- parameter of type 'int' -->
-          <parameter type-id='type-id-10'/>
+          <parameter type-id='type-id-11'/>
           <!-- parameter of type 'int' -->
-          <parameter type-id='type-id-10'/>
+          <parameter type-id='type-id-11'/>
           <!-- parameter of type 'int' -->
-          <parameter type-id='type-id-10'/>
+          <parameter type-id='type-id-11'/>
           <!-- parameter of type 'int' -->
-          <parameter type-id='type-id-10'/>
+          <parameter type-id='type-id-11'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -1960,11 +1960,11 @@
           <!-- implicit parameter of type 'OpenGLSurfaceEvaluator*' -->
           <parameter type-id='type-id-55' is-artificial='yes'/>
           <!-- parameter of type 'int' -->
-          <parameter type-id='type-id-10'/>
+          <parameter type-id='type-id-11'/>
           <!-- parameter of type 'int' -->
-          <parameter type-id='type-id-10'/>
+          <parameter type-id='type-id-11'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -1977,7 +1977,7 @@
           <!-- parameter of type 'typedef REAL' -->
           <parameter type-id='type-id-1'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -1986,19 +1986,19 @@
           <!-- implicit parameter of type 'OpenGLSurfaceEvaluator*' -->
           <parameter type-id='type-id-55' is-artificial='yes'/>
           <!-- parameter of type 'int' -->
-          <parameter type-id='type-id-10'/>
+          <parameter type-id='type-id-11'/>
           <!-- parameter of type 'typedef REAL' -->
           <parameter type-id='type-id-1'/>
           <!-- parameter of type 'REAL*' -->
-          <parameter type-id='type-id-13'/>
+          <parameter type-id='type-id-16'/>
           <!-- parameter of type 'int' -->
-          <parameter type-id='type-id-10'/>
+          <parameter type-id='type-id-11'/>
           <!-- parameter of type 'REAL[3]*' -->
           <parameter type-id='type-id-57'/>
           <!-- parameter of type 'REAL[3]*' -->
           <parameter type-id='type-id-57'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -2007,19 +2007,19 @@
           <!-- implicit parameter of type 'OpenGLSurfaceEvaluator*' -->
           <parameter type-id='type-id-55' is-artificial='yes'/>
           <!-- parameter of type 'int' -->
-          <parameter type-id='type-id-10'/>
+          <parameter type-id='type-id-11'/>
           <!-- parameter of type 'typedef REAL' -->
           <parameter type-id='type-id-1'/>
           <!-- parameter of type 'REAL*' -->
-          <parameter type-id='type-id-13'/>
+          <parameter type-id='type-id-16'/>
           <!-- parameter of type 'int' -->
-          <parameter type-id='type-id-10'/>
+          <parameter type-id='type-id-11'/>
           <!-- parameter of type 'REAL[3]*' -->
           <parameter type-id='type-id-57'/>
           <!-- parameter of type 'REAL[3]*' -->
           <parameter type-id='type-id-57'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -2028,19 +2028,19 @@
           <!-- implicit parameter of type 'OpenGLSurfaceEvaluator*' -->
           <parameter type-id='type-id-55' is-artificial='yes'/>
           <!-- parameter of type 'int' -->
-          <parameter type-id='type-id-10'/>
+          <parameter type-id='type-id-11'/>
           <!-- parameter of type 'typedef REAL' -->
           <parameter type-id='type-id-1'/>
           <!-- parameter of type 'REAL*' -->
-          <parameter type-id='type-id-13'/>
+          <parameter type-id='type-id-16'/>
           <!-- parameter of type 'int' -->
-          <parameter type-id='type-id-10'/>
+          <parameter type-id='type-id-11'/>
           <!-- parameter of type 'typedef REAL' -->
           <parameter type-id='type-id-1'/>
           <!-- parameter of type 'REAL*' -->
-          <parameter type-id='type-id-13'/>
+          <parameter type-id='type-id-16'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -2049,19 +2049,19 @@
           <!-- implicit parameter of type 'OpenGLSurfaceEvaluator*' -->
           <parameter type-id='type-id-55' is-artificial='yes'/>
           <!-- parameter of type 'int' -->
-          <parameter type-id='type-id-10'/>
+          <parameter type-id='type-id-11'/>
           <!-- parameter of type 'typedef REAL' -->
           <parameter type-id='type-id-1'/>
           <!-- parameter of type 'REAL*' -->
-          <parameter type-id='type-id-13'/>
+          <parameter type-id='type-id-16'/>
           <!-- parameter of type 'int' -->
-          <parameter type-id='type-id-10'/>
+          <parameter type-id='type-id-11'/>
           <!-- parameter of type 'typedef REAL' -->
           <parameter type-id='type-id-1'/>
           <!-- parameter of type 'REAL*' -->
-          <parameter type-id='type-id-13'/>
+          <parameter type-id='type-id-16'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -2070,17 +2070,17 @@
           <!-- implicit parameter of type 'OpenGLSurfaceEvaluator*' -->
           <parameter type-id='type-id-55' is-artificial='yes'/>
           <!-- parameter of type 'int' -->
-          <parameter type-id='type-id-10'/>
+          <parameter type-id='type-id-11'/>
           <!-- parameter of type 'int' -->
-          <parameter type-id='type-id-10'/>
+          <parameter type-id='type-id-11'/>
           <!-- parameter of type 'int' -->
-          <parameter type-id='type-id-10'/>
+          <parameter type-id='type-id-11'/>
           <!-- parameter of type 'typedef REAL' -->
           <parameter type-id='type-id-1'/>
           <!-- parameter of type 'REAL*' -->
-          <parameter type-id='type-id-13'/>
+          <parameter type-id='type-id-16'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -2089,17 +2089,17 @@
           <!-- implicit parameter of type 'OpenGLSurfaceEvaluator*' -->
           <parameter type-id='type-id-55' is-artificial='yes'/>
           <!-- parameter of type 'int' -->
-          <parameter type-id='type-id-10'/>
+          <parameter type-id='type-id-11'/>
           <!-- parameter of type 'int' -->
-          <parameter type-id='type-id-10'/>
+          <parameter type-id='type-id-11'/>
           <!-- parameter of type 'int' -->
-          <parameter type-id='type-id-10'/>
+          <parameter type-id='type-id-11'/>
           <!-- parameter of type 'typedef REAL' -->
           <parameter type-id='type-id-1'/>
           <!-- parameter of type 'REAL*' -->
-          <parameter type-id='type-id-13'/>
+          <parameter type-id='type-id-16'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -2108,7 +2108,7 @@
           <!-- implicit parameter of type 'OpenGLSurfaceEvaluator*' -->
           <parameter type-id='type-id-55' is-artificial='yes'/>
           <!-- parameter of type 'int' -->
-          <parameter type-id='type-id-10'/>
+          <parameter type-id='type-id-11'/>
           <!-- parameter of type 'typedef REAL' -->
           <parameter type-id='type-id-1'/>
           <!-- parameter of type 'typedef REAL' -->
@@ -2118,23 +2118,23 @@
           <!-- parameter of type 'typedef REAL' -->
           <parameter type-id='type-id-1'/>
           <!-- parameter of type 'int' -->
-          <parameter type-id='type-id-10'/>
+          <parameter type-id='type-id-11'/>
           <!-- parameter of type 'typedef REAL' -->
           <parameter type-id='type-id-1'/>
           <!-- parameter of type 'typedef REAL' -->
           <parameter type-id='type-id-1'/>
           <!-- parameter of type 'int' -->
-          <parameter type-id='type-id-10'/>
+          <parameter type-id='type-id-11'/>
           <!-- parameter of type 'REAL*' -->
-          <parameter type-id='type-id-13'/>
+          <parameter type-id='type-id-16'/>
           <!-- parameter of type 'REAL*' -->
-          <parameter type-id='type-id-13'/>
+          <parameter type-id='type-id-16'/>
           <!-- parameter of type 'REAL*' -->
-          <parameter type-id='type-id-13'/>
+          <parameter type-id='type-id-16'/>
           <!-- parameter of type 'REAL*' -->
-          <parameter type-id='type-id-13'/>
+          <parameter type-id='type-id-16'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -2143,7 +2143,7 @@
           <!-- implicit parameter of type 'OpenGLSurfaceEvaluator*' -->
           <parameter type-id='type-id-55' is-artificial='yes'/>
           <!-- parameter of type 'int' -->
-          <parameter type-id='type-id-10'/>
+          <parameter type-id='type-id-11'/>
           <!-- parameter of type 'typedef REAL' -->
           <parameter type-id='type-id-1'/>
           <!-- parameter of type 'typedef REAL' -->
@@ -2153,23 +2153,23 @@
           <!-- parameter of type 'typedef REAL' -->
           <parameter type-id='type-id-1'/>
           <!-- parameter of type 'int' -->
-          <parameter type-id='type-id-10'/>
+          <parameter type-id='type-id-11'/>
           <!-- parameter of type 'typedef REAL' -->
           <parameter type-id='type-id-1'/>
           <!-- parameter of type 'typedef REAL' -->
           <parameter type-id='type-id-1'/>
           <!-- parameter of type 'int' -->
-          <parameter type-id='type-id-10'/>
+          <parameter type-id='type-id-11'/>
           <!-- parameter of type 'REAL*' -->
-          <parameter type-id='type-id-13'/>
+          <parameter type-id='type-id-16'/>
           <!-- parameter of type 'REAL*' -->
-          <parameter type-id='type-id-13'/>
+          <parameter type-id='type-id-16'/>
           <!-- parameter of type 'REAL*' -->
-          <parameter type-id='type-id-13'/>
+          <parameter type-id='type-id-16'/>
           <!-- parameter of type 'REAL*' -->
-          <parameter type-id='type-id-13'/>
+          <parameter type-id='type-id-16'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -2180,7 +2180,7 @@
           <!-- parameter of type 'bezierPatchMesh*' -->
           <parameter type-id='type-id-51'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -2191,7 +2191,7 @@
           <!-- parameter of type 'bezierPatchMesh*' -->
           <parameter type-id='type-id-51'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -2200,29 +2200,29 @@
           <!-- implicit parameter of type 'OpenGLSurfaceEvaluator*' -->
           <parameter type-id='type-id-55' is-artificial='yes'/>
           <!-- parameter of type 'int' -->
-          <parameter type-id='type-id-10'/>
+          <parameter type-id='type-id-11'/>
           <!-- parameter of type 'int' -->
-          <parameter type-id='type-id-10'/>
+          <parameter type-id='type-id-11'/>
           <!-- parameter of type 'typedef REAL' -->
           <parameter type-id='type-id-1'/>
           <!-- parameter of type 'typedef REAL' -->
           <parameter type-id='type-id-1'/>
           <!-- parameter of type 'int' -->
-          <parameter type-id='type-id-10'/>
+          <parameter type-id='type-id-11'/>
           <!-- parameter of type 'int' -->
-          <parameter type-id='type-id-10'/>
+          <parameter type-id='type-id-11'/>
           <!-- parameter of type 'typedef REAL' -->
           <parameter type-id='type-id-1'/>
           <!-- parameter of type 'typedef REAL' -->
           <parameter type-id='type-id-1'/>
           <!-- parameter of type 'int' -->
-          <parameter type-id='type-id-10'/>
+          <parameter type-id='type-id-11'/>
           <!-- parameter of type 'int' -->
-          <parameter type-id='type-id-10'/>
+          <parameter type-id='type-id-11'/>
           <!-- parameter of type 'REAL*' -->
-          <parameter type-id='type-id-13'/>
+          <parameter type-id='type-id-16'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -2237,13 +2237,13 @@
           <!-- parameter of type 'typedef REAL' -->
           <parameter type-id='type-id-1'/>
           <!-- parameter of type 'REAL*' -->
-          <parameter type-id='type-id-13'/>
+          <parameter type-id='type-id-16'/>
           <!-- parameter of type 'REAL*' -->
-          <parameter type-id='type-id-13'/>
+          <parameter type-id='type-id-16'/>
           <!-- parameter of type 'REAL*' -->
-          <parameter type-id='type-id-13'/>
+          <parameter type-id='type-id-16'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -2258,9 +2258,9 @@
           <!-- parameter of type 'typedef REAL' -->
           <parameter type-id='type-id-1'/>
           <!-- parameter of type 'REAL*' -->
-          <parameter type-id='type-id-13'/>
+          <parameter type-id='type-id-16'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -2273,7 +2273,7 @@
           <!-- parameter of type 'typedef REAL' -->
           <parameter type-id='type-id-1'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -2284,7 +2284,7 @@
           <!-- parameter of type 'bezierPatchMesh*' -->
           <parameter type-id='type-id-51'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -2295,7 +2295,7 @@
           <!-- parameter of type 'bezierPatchMesh*' -->
           <parameter type-id='type-id-51'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public' destructor='yes' vtable-offset='-1'>
@@ -2304,9 +2304,9 @@
           <!-- implicit parameter of type 'OpenGLSurfaceEvaluator*' -->
           <parameter type-id='type-id-55' is-artificial='yes'/>
           <!-- parameter of type 'int' -->
-          <parameter type-id='type-id-10'/>
+          <parameter type-id='type-id-11'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public' vtable-offset='9'>
@@ -2315,13 +2315,13 @@
           <!-- implicit parameter of type 'OpenGLSurfaceEvaluator*' -->
           <parameter type-id='type-id-55' is-artificial='yes'/>
           <!-- parameter of type 'long int' -->
-          <parameter type-id='type-id-12'/>
+          <parameter type-id='type-id-15'/>
           <!-- parameter of type 'REAL*' -->
-          <parameter type-id='type-id-13'/>
+          <parameter type-id='type-id-16'/>
           <!-- parameter of type 'REAL*' -->
-          <parameter type-id='type-id-13'/>
+          <parameter type-id='type-id-16'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public' vtable-offset='10'>
@@ -2338,7 +2338,7 @@
           <!-- parameter of type 'typedef REAL' -->
           <parameter type-id='type-id-1'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public' vtable-offset='11'>
@@ -2347,9 +2347,9 @@
           <!-- implicit parameter of type 'OpenGLSurfaceEvaluator*' -->
           <parameter type-id='type-id-55' is-artificial='yes'/>
           <!-- parameter of type 'long int' -->
-          <parameter type-id='type-id-12'/>
+          <parameter type-id='type-id-15'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public' vtable-offset='12'>
@@ -2358,9 +2358,9 @@
           <!-- implicit parameter of type 'OpenGLSurfaceEvaluator*' -->
           <parameter type-id='type-id-55' is-artificial='yes'/>
           <!-- parameter of type 'long int' -->
-          <parameter type-id='type-id-12'/>
+          <parameter type-id='type-id-15'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public' vtable-offset='13'>
@@ -2369,9 +2369,9 @@
           <!-- implicit parameter of type 'OpenGLSurfaceEvaluator*' -->
           <parameter type-id='type-id-55' is-artificial='yes'/>
           <!-- parameter of type 'long int' -->
-          <parameter type-id='type-id-12'/>
+          <parameter type-id='type-id-15'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public' vtable-offset='14'>
@@ -2380,27 +2380,27 @@
           <!-- implicit parameter of type 'OpenGLSurfaceEvaluator*' -->
           <parameter type-id='type-id-55' is-artificial='yes'/>
           <!-- parameter of type 'long int' -->
-          <parameter type-id='type-id-12'/>
+          <parameter type-id='type-id-15'/>
           <!-- parameter of type 'typedef REAL' -->
           <parameter type-id='type-id-1'/>
           <!-- parameter of type 'typedef REAL' -->
           <parameter type-id='type-id-1'/>
           <!-- parameter of type 'long int' -->
-          <parameter type-id='type-id-12'/>
+          <parameter type-id='type-id-15'/>
           <!-- parameter of type 'long int' -->
-          <parameter type-id='type-id-12'/>
+          <parameter type-id='type-id-15'/>
           <!-- parameter of type 'typedef REAL' -->
           <parameter type-id='type-id-1'/>
           <!-- parameter of type 'typedef REAL' -->
           <parameter type-id='type-id-1'/>
           <!-- parameter of type 'long int' -->
-          <parameter type-id='type-id-12'/>
+          <parameter type-id='type-id-15'/>
           <!-- parameter of type 'long int' -->
-          <parameter type-id='type-id-12'/>
+          <parameter type-id='type-id-15'/>
           <!-- parameter of type 'REAL*' -->
-          <parameter type-id='type-id-13'/>
+          <parameter type-id='type-id-16'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public' vtable-offset='15'>
@@ -2409,19 +2409,19 @@
           <!-- implicit parameter of type 'OpenGLSurfaceEvaluator*' -->
           <parameter type-id='type-id-55' is-artificial='yes'/>
           <!-- parameter of type 'long int' -->
-          <parameter type-id='type-id-12'/>
+          <parameter type-id='type-id-15'/>
           <!-- parameter of type 'typedef REAL' -->
           <parameter type-id='type-id-1'/>
           <!-- parameter of type 'typedef REAL' -->
           <parameter type-id='type-id-1'/>
           <!-- parameter of type 'long int' -->
-          <parameter type-id='type-id-12'/>
+          <parameter type-id='type-id-15'/>
           <!-- parameter of type 'typedef REAL' -->
           <parameter type-id='type-id-1'/>
           <!-- parameter of type 'typedef REAL' -->
           <parameter type-id='type-id-1'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public' vtable-offset='16'>
@@ -2430,17 +2430,17 @@
           <!-- implicit parameter of type 'OpenGLSurfaceEvaluator*' -->
           <parameter type-id='type-id-55' is-artificial='yes'/>
           <!-- parameter of type 'long int' -->
-          <parameter type-id='type-id-12'/>
+          <parameter type-id='type-id-15'/>
           <!-- parameter of type 'long int' -->
-          <parameter type-id='type-id-12'/>
+          <parameter type-id='type-id-15'/>
           <!-- parameter of type 'long int' -->
-          <parameter type-id='type-id-12'/>
+          <parameter type-id='type-id-15'/>
           <!-- parameter of type 'long int' -->
-          <parameter type-id='type-id-12'/>
+          <parameter type-id='type-id-15'/>
           <!-- parameter of type 'long int' -->
-          <parameter type-id='type-id-12'/>
+          <parameter type-id='type-id-15'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public' vtable-offset='17'>
@@ -2449,13 +2449,13 @@
           <!-- implicit parameter of type 'OpenGLSurfaceEvaluator*' -->
           <parameter type-id='type-id-55' is-artificial='yes'/>
           <!-- parameter of type 'long int' -->
-          <parameter type-id='type-id-12'/>
+          <parameter type-id='type-id-15'/>
           <!-- parameter of type 'typedef REAL' -->
           <parameter type-id='type-id-1'/>
           <!-- parameter of type 'typedef REAL' -->
           <parameter type-id='type-id-1'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public' vtable-offset='18'>
@@ -2464,11 +2464,11 @@
           <!-- implicit parameter of type 'OpenGLSurfaceEvaluator*' -->
           <parameter type-id='type-id-55' is-artificial='yes'/>
           <!-- parameter of type 'long int' -->
-          <parameter type-id='type-id-12'/>
+          <parameter type-id='type-id-15'/>
           <!-- parameter of type 'long int' -->
-          <parameter type-id='type-id-12'/>
+          <parameter type-id='type-id-15'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public' vtable-offset='19'>
@@ -2477,7 +2477,7 @@
           <!-- implicit parameter of type 'OpenGLSurfaceEvaluator*' -->
           <parameter type-id='type-id-55' is-artificial='yes'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public' vtable-offset='20'>
@@ -2486,9 +2486,9 @@
           <!-- implicit parameter of type 'OpenGLSurfaceEvaluator*' -->
           <parameter type-id='type-id-55' is-artificial='yes'/>
           <!-- parameter of type 'long int' -->
-          <parameter type-id='type-id-12'/>
+          <parameter type-id='type-id-15'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public' vtable-offset='21'>
@@ -2497,7 +2497,7 @@
           <!-- implicit parameter of type 'OpenGLSurfaceEvaluator*' -->
           <parameter type-id='type-id-55' is-artificial='yes'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public' vtable-offset='22'>
@@ -2506,7 +2506,7 @@
           <!-- implicit parameter of type 'OpenGLSurfaceEvaluator*' -->
           <parameter type-id='type-id-55' is-artificial='yes'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public' vtable-offset='23'>
@@ -2515,7 +2515,7 @@
           <!-- implicit parameter of type 'OpenGLSurfaceEvaluator*' -->
           <parameter type-id='type-id-55' is-artificial='yes'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public' vtable-offset='24'>
@@ -2524,7 +2524,7 @@
           <!-- implicit parameter of type 'OpenGLSurfaceEvaluator*' -->
           <parameter type-id='type-id-55' is-artificial='yes'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public' vtable-offset='25'>
@@ -2533,7 +2533,7 @@
           <!-- implicit parameter of type 'OpenGLSurfaceEvaluator*' -->
           <parameter type-id='type-id-55' is-artificial='yes'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public' vtable-offset='26'>
@@ -2542,7 +2542,7 @@
           <!-- implicit parameter of type 'OpenGLSurfaceEvaluator*' -->
           <parameter type-id='type-id-55' is-artificial='yes'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public' vtable-offset='27'>
@@ -2551,7 +2551,7 @@
           <!-- implicit parameter of type 'OpenGLSurfaceEvaluator*' -->
           <parameter type-id='type-id-55' is-artificial='yes'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public' vtable-offset='28'>
@@ -2560,7 +2560,7 @@
           <!-- implicit parameter of type 'OpenGLSurfaceEvaluator*' -->
           <parameter type-id='type-id-55' is-artificial='yes'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public' vtable-offset='29'>
@@ -2569,7 +2569,7 @@
           <!-- implicit parameter of type 'OpenGLSurfaceEvaluator*' -->
           <parameter type-id='type-id-55' is-artificial='yes'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public' vtable-offset='30'>
@@ -2578,7 +2578,7 @@
           <!-- implicit parameter of type 'OpenGLSurfaceEvaluator*' -->
           <parameter type-id='type-id-55' is-artificial='yes'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public' vtable-offset='31'>
@@ -2587,7 +2587,7 @@
           <!-- implicit parameter of type 'OpenGLSurfaceEvaluator*' -->
           <parameter type-id='type-id-55' is-artificial='yes'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public' vtable-offset='32'>
@@ -2596,19 +2596,19 @@
           <!-- implicit parameter of type 'OpenGLSurfaceEvaluator*' -->
           <parameter type-id='type-id-55' is-artificial='yes'/>
           <!-- parameter of type 'int' -->
-          <parameter type-id='type-id-10'/>
+          <parameter type-id='type-id-11'/>
           <!-- parameter of type 'typedef REAL' -->
           <parameter type-id='type-id-1'/>
           <!-- parameter of type 'REAL*' -->
-          <parameter type-id='type-id-13'/>
+          <parameter type-id='type-id-16'/>
           <!-- parameter of type 'int' -->
-          <parameter type-id='type-id-10'/>
+          <parameter type-id='type-id-11'/>
           <!-- parameter of type 'typedef REAL' -->
           <parameter type-id='type-id-1'/>
           <!-- parameter of type 'REAL*' -->
-          <parameter type-id='type-id-13'/>
+          <parameter type-id='type-id-16'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public' vtable-offset='33'>
@@ -2617,19 +2617,19 @@
           <!-- implicit parameter of type 'OpenGLSurfaceEvaluator*' -->
           <parameter type-id='type-id-55' is-artificial='yes'/>
           <!-- parameter of type 'int' -->
-          <parameter type-id='type-id-10'/>
+          <parameter type-id='type-id-11'/>
           <!-- parameter of type 'typedef REAL' -->
           <parameter type-id='type-id-1'/>
           <!-- parameter of type 'REAL*' -->
-          <parameter type-id='type-id-13'/>
+          <parameter type-id='type-id-16'/>
           <!-- parameter of type 'int' -->
-          <parameter type-id='type-id-10'/>
+          <parameter type-id='type-id-11'/>
           <!-- parameter of type 'typedef REAL' -->
           <parameter type-id='type-id-1'/>
           <!-- parameter of type 'REAL*' -->
-          <parameter type-id='type-id-13'/>
+          <parameter type-id='type-id-16'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private' vtable-offset='34'>
@@ -2642,11 +2642,11 @@
           <!-- parameter of type 'typedef REAL' -->
           <parameter type-id='type-id-1'/>
           <!-- parameter of type 'REAL*' -->
-          <parameter type-id='type-id-13'/>
+          <parameter type-id='type-id-16'/>
           <!-- parameter of type 'REAL*' -->
-          <parameter type-id='type-id-13'/>
+          <parameter type-id='type-id-16'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private' vtable-offset='35'>
@@ -2659,11 +2659,11 @@
           <!-- parameter of type 'typedef REAL' -->
           <parameter type-id='type-id-1'/>
           <!-- parameter of type 'REAL*' -->
-          <parameter type-id='type-id-13'/>
+          <parameter type-id='type-id-16'/>
           <!-- parameter of type 'REAL*' -->
-          <parameter type-id='type-id-13'/>
+          <parameter type-id='type-id-16'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private' vtable-offset='36'>
@@ -2676,11 +2676,11 @@
           <!-- parameter of type 'typedef REAL' -->
           <parameter type-id='type-id-1'/>
           <!-- parameter of type 'REAL*' -->
-          <parameter type-id='type-id-13'/>
+          <parameter type-id='type-id-16'/>
           <!-- parameter of type 'REAL*' -->
-          <parameter type-id='type-id-13'/>
+          <parameter type-id='type-id-16'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private' vtable-offset='37'>
@@ -2691,7 +2691,7 @@
           <!-- parameter of type 'typedef REAL' -->
           <parameter type-id='type-id-1'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private' vtable-offset='38'>
@@ -2702,7 +2702,7 @@
           <!-- parameter of type 'typedef REAL' -->
           <parameter type-id='type-id-1'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
     </class-decl>
@@ -2711,77 +2711,77 @@
     <!-- OpenGLSurfaceEvaluator* -->
     <pointer-type-def type-id='type-id-43' size-in-bits='64' id='type-id-55'/>
     <!-- float* -->
-    <pointer-type-def type-id='type-id-30' size-in-bits='64' id='type-id-59'/>
+    <pointer-type-def type-id='type-id-33' size-in-bits='64' id='type-id-59'/>
     <!-- void gluDeleteNurbsRenderer(GLUnurbs*) -->
     <function-decl name='gluDeleteNurbsRenderer' mangled-name='gluDeleteNurbsRenderer' filepath='libnurbs/interface/glinterface.cc' line='75' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gluDeleteNurbsRenderer'>
       <!-- parameter of type 'GLUnurbs*' -->
       <parameter type-id='type-id-44' name='r' filepath='libnurbs/interface/glinterface.cc' line='75' column='1'/>
       <!-- void -->
-      <return type-id='type-id-11'/>
+      <return type-id='type-id-12'/>
     </function-decl>
     <!-- void gluNurbsCallbackDataEXT(GLUnurbs*, void*) -->
     <function-decl name='gluNurbsCallbackDataEXT' mangled-name='gluNurbsCallbackDataEXT' filepath='libnurbs/interface/glinterface.cc' line='459' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gluNurbsCallbackDataEXT'>
       <!-- parameter of type 'GLUnurbs*' -->
       <parameter type-id='type-id-44' name='r' filepath='libnurbs/interface/glinterface.cc' line='459' column='1'/>
       <!-- parameter of type 'void*' -->
-      <parameter type-id='type-id-22' name='userData' filepath='libnurbs/interface/glinterface.cc' line='459' column='1'/>
+      <parameter type-id='type-id-25' name='userData' filepath='libnurbs/interface/glinterface.cc' line='459' column='1'/>
       <!-- void -->
-      <return type-id='type-id-11'/>
+      <return type-id='type-id-12'/>
     </function-decl>
     <!-- void gluNurbsCallbackData(GLUnurbs*, void*) -->
     <function-decl name='gluNurbsCallbackData' mangled-name='gluNurbsCallbackData' filepath='libnurbs/interface/glinterface.cc' line='466' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gluNurbsCallbackData'>
       <!-- parameter of type 'GLUnurbs*' -->
       <parameter type-id='type-id-44' name='r' filepath='libnurbs/interface/glinterface.cc' line='459' column='1'/>
       <!-- parameter of type 'void*' -->
-      <parameter type-id='type-id-22' name='userData' filepath='libnurbs/interface/glinterface.cc' line='459' column='1'/>
+      <parameter type-id='type-id-25' name='userData' filepath='libnurbs/interface/glinterface.cc' line='459' column='1'/>
       <!-- void -->
-      <return type-id='type-id-11'/>
+      <return type-id='type-id-12'/>
     </function-decl>
     <!-- void gluNurbsCallback(GLUnurbs*, GLenum, _GLUfuncptr) -->
     <function-decl name='gluNurbsCallback' mangled-name='gluNurbsCallback' filepath='libnurbs/interface/glinterface.cc' line='430' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gluNurbsCallback'>
       <!-- parameter of type 'GLUnurbs*' -->
       <parameter type-id='type-id-44' name='r' filepath='libnurbs/interface/glinterface.cc' line='430' column='1'/>
       <!-- parameter of type 'typedef GLenum' -->
-      <parameter type-id='type-id-25' name='which' filepath='libnurbs/interface/glinterface.cc' line='430' column='1'/>
+      <parameter type-id='type-id-28' name='which' filepath='libnurbs/interface/glinterface.cc' line='430' column='1'/>
       <!-- parameter of type 'typedef _GLUfuncptr' -->
-      <parameter type-id='type-id-26' name='fn' filepath='libnurbs/interface/glinterface.cc' line='430' column='1'/>
+      <parameter type-id='type-id-29' name='fn' filepath='libnurbs/interface/glinterface.cc' line='430' column='1'/>
       <!-- void -->
-      <return type-id='type-id-11'/>
+      <return type-id='type-id-12'/>
     </function-decl>
     <!-- void gluGetNurbsProperty(GLUnurbs*, GLenum, GLfloat*) -->
     <function-decl name='gluGetNurbsProperty' mangled-name='gluGetNurbsProperty' filepath='libnurbs/interface/glinterface.cc' line='359' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gluGetNurbsProperty'>
       <!-- parameter of type 'GLUnurbs*' -->
       <parameter type-id='type-id-44' name='r' filepath='libnurbs/interface/glinterface.cc' line='359' column='1'/>
       <!-- parameter of type 'typedef GLenum' -->
-      <parameter type-id='type-id-25' name='property' filepath='libnurbs/interface/glinterface.cc' line='359' column='1'/>
+      <parameter type-id='type-id-28' name='property' filepath='libnurbs/interface/glinterface.cc' line='359' column='1'/>
       <!-- parameter of type 'GLfloat*' -->
       <parameter type-id='type-id-47' name='value' filepath='libnurbs/interface/glinterface.cc' line='359' column='1'/>
       <!-- void -->
-      <return type-id='type-id-11'/>
+      <return type-id='type-id-12'/>
     </function-decl>
     <!-- void gluNurbsProperty(GLUnurbs*, GLenum, GLfloat) -->
     <function-decl name='gluNurbsProperty' mangled-name='gluNurbsProperty' filepath='libnurbs/interface/glinterface.cc' line='243' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gluNurbsProperty'>
       <!-- parameter of type 'GLUnurbs*' -->
       <parameter type-id='type-id-44' name='r' filepath='libnurbs/interface/glinterface.cc' line='243' column='1'/>
       <!-- parameter of type 'typedef GLenum' -->
-      <parameter type-id='type-id-25' name='property' filepath='libnurbs/interface/glinterface.cc' line='243' column='1'/>
+      <parameter type-id='type-id-28' name='property' filepath='libnurbs/interface/glinterface.cc' line='243' column='1'/>
       <!-- parameter of type 'typedef GLfloat' -->
-      <parameter type-id='type-id-33' name='value' filepath='libnurbs/interface/glinterface.cc' line='243' column='1'/>
+      <parameter type-id='type-id-35' name='value' filepath='libnurbs/interface/glinterface.cc' line='243' column='1'/>
       <!-- void -->
-      <return type-id='type-id-11'/>
+      <return type-id='type-id-12'/>
     </function-decl>
     <!-- void gluLoadSamplingMatrices(GLUnurbs*, const GLfloat*, const GLfloat*, const GLint*) -->
     <function-decl name='gluLoadSamplingMatrices' mangled-name='gluLoadSamplingMatrices' filepath='libnurbs/interface/glinterface.cc' line='235' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gluLoadSamplingMatrices'>
       <!-- parameter of type 'GLUnurbs*' -->
       <parameter type-id='type-id-44' name='r' filepath='libnurbs/interface/glinterface.cc' line='235' column='1'/>
       <!-- parameter of type 'const GLfloat*' -->
-      <parameter type-id='type-id-28' name='modelMatrix' filepath='libnurbs/interface/glinterface.cc' line='235' column='1'/>
+      <parameter type-id='type-id-31' name='modelMatrix' filepath='libnurbs/interface/glinterface.cc' line='235' column='1'/>
       <!-- parameter of type 'const GLfloat*' -->
-      <parameter type-id='type-id-28' name='projMatrix' filepath='libnurbs/interface/glinterface.cc' line='236' column='1'/>
+      <parameter type-id='type-id-31' name='projMatrix' filepath='libnurbs/interface/glinterface.cc' line='236' column='1'/>
       <!-- parameter of type 'const GLint*' -->
       <parameter type-id='type-id-45' name='viewport' filepath='libnurbs/interface/glinterface.cc' line='237' column='1'/>
       <!-- void -->
-      <return type-id='type-id-11'/>
+      <return type-id='type-id-12'/>
     </function-decl>
     <!-- void gluNurbsSurface(GLUnurbs*, GLint, GLfloat*, GLint, GLfloat*, GLint, GLint, GLfloat*, GLint, GLint, GLenum) -->
     <function-decl name='gluNurbsSurface' mangled-name='gluNurbsSurface' filepath='libnurbs/interface/glinterface.cc' line='199' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gluNurbsSurface'>
@@ -2806,9 +2806,9 @@
       <!-- parameter of type 'typedef GLint' -->
       <parameter type-id='type-id-60' name='torder' filepath='libnurbs/interface/glinterface.cc' line='202' column='1'/>
       <!-- parameter of type 'typedef GLenum' -->
-      <parameter type-id='type-id-25' name='type' filepath='libnurbs/interface/glinterface.cc' line='203' column='1'/>
+      <parameter type-id='type-id-28' name='type' filepath='libnurbs/interface/glinterface.cc' line='203' column='1'/>
       <!-- void -->
-      <return type-id='type-id-11'/>
+      <return type-id='type-id-12'/>
     </function-decl>
     <!-- void gluNurbsCurve(GLUnurbs*, GLint, float*, GLint, float*, GLint, GLenum) -->
     <function-decl name='gluNurbsCurve' mangled-name='gluNurbsCurve' filepath='libnurbs/interface/glinterface.cc' line='173' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gluNurbsCurve'>
@@ -2825,9 +2825,9 @@
       <!-- parameter of type 'typedef GLint' -->
       <parameter type-id='type-id-60' name='order' filepath='libnurbs/interface/glinterface.cc' line='174' column='1'/>
       <!-- parameter of type 'typedef GLenum' -->
-      <parameter type-id='type-id-25' name='type' filepath='libnurbs/interface/glinterface.cc' line='174' column='1'/>
+      <parameter type-id='type-id-28' name='type' filepath='libnurbs/interface/glinterface.cc' line='174' column='1'/>
       <!-- void -->
-      <return type-id='type-id-11'/>
+      <return type-id='type-id-12'/>
     </function-decl>
     <!-- void gluPwlCurve(GLUnurbs*, GLint, float*, GLint, GLenum) -->
     <function-decl name='gluPwlCurve' mangled-name='gluPwlCurve' filepath='libnurbs/interface/glinterface.cc' line='150' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gluPwlCurve'>
@@ -2840,51 +2840,51 @@
       <!-- parameter of type 'typedef GLint' -->
       <parameter type-id='type-id-60' name='stride' filepath='libnurbs/interface/glinterface.cc' line='151' column='1'/>
       <!-- parameter of type 'typedef GLenum' -->
-      <parameter type-id='type-id-25' name='type' filepath='libnurbs/interface/glinterface.cc' line='151' column='1'/>
+      <parameter type-id='type-id-28' name='type' filepath='libnurbs/interface/glinterface.cc' line='151' column='1'/>
       <!-- void -->
-      <return type-id='type-id-11'/>
+      <return type-id='type-id-12'/>
     </function-decl>
     <!-- void gluEndTrim(GLUnurbs*) -->
     <function-decl name='gluEndTrim' mangled-name='gluEndTrim' filepath='libnurbs/interface/glinterface.cc' line='141' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gluEndTrim'>
       <!-- parameter of type 'GLUnurbs*' -->
       <parameter type-id='type-id-44' name='r' filepath='libnurbs/interface/glinterface.cc' line='75' column='1'/>
       <!-- void -->
-      <return type-id='type-id-11'/>
+      <return type-id='type-id-12'/>
     </function-decl>
     <!-- void gluBeginTrim(GLUnurbs*) -->
     <function-decl name='gluBeginTrim' mangled-name='gluBeginTrim' filepath='libnurbs/interface/glinterface.cc' line='131' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gluBeginTrim'>
       <!-- parameter of type 'GLUnurbs*' -->
       <parameter type-id='type-id-44' name='r' filepath='libnurbs/interface/glinterface.cc' line='75' column='1'/>
       <!-- void -->
-      <return type-id='type-id-11'/>
+      <return type-id='type-id-12'/>
     </function-decl>
     <!-- void gluEndSurface(GLUnurbs*) -->
     <function-decl name='gluEndSurface' mangled-name='gluEndSurface' filepath='libnurbs/interface/glinterface.cc' line='111' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gluEndSurface'>
       <!-- parameter of type 'GLUnurbs*' -->
       <parameter type-id='type-id-44' name='r' filepath='libnurbs/interface/glinterface.cc' line='75' column='1'/>
       <!-- void -->
-      <return type-id='type-id-11'/>
+      <return type-id='type-id-12'/>
     </function-decl>
     <!-- void gluEndCurve(GLUnurbs*) -->
     <function-decl name='gluEndCurve' mangled-name='gluEndCurve' filepath='libnurbs/interface/glinterface.cc' line='105' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gluEndCurve'>
       <!-- parameter of type 'GLUnurbs*' -->
       <parameter type-id='type-id-44' name='r' filepath='libnurbs/interface/glinterface.cc' line='75' column='1'/>
       <!-- void -->
-      <return type-id='type-id-11'/>
+      <return type-id='type-id-12'/>
     </function-decl>
     <!-- void gluBeginCurve(GLUnurbs*) -->
     <function-decl name='gluBeginCurve' mangled-name='gluBeginCurve' filepath='libnurbs/interface/glinterface.cc' line='99' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gluBeginCurve'>
       <!-- parameter of type 'GLUnurbs*' -->
       <parameter type-id='type-id-44' name='r' filepath='libnurbs/interface/glinterface.cc' line='75' column='1'/>
       <!-- void -->
-      <return type-id='type-id-11'/>
+      <return type-id='type-id-12'/>
     </function-decl>
     <!-- void gluBeginSurface(GLUnurbs*) -->
     <function-decl name='gluBeginSurface' mangled-name='gluBeginSurface' filepath='libnurbs/interface/glinterface.cc' line='89' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gluBeginSurface'>
       <!-- parameter of type 'GLUnurbs*' -->
       <parameter type-id='type-id-44' name='r' filepath='libnurbs/interface/glinterface.cc' line='75' column='1'/>
       <!-- void -->
-      <return type-id='type-id-11'/>
+      <return type-id='type-id-12'/>
     </function-decl>
     <!-- GLUnurbs* gluNewNurbsRenderer() -->
     <function-decl name='gluNewNurbsRenderer' mangled-name='gluNewNurbsRenderer' filepath='libnurbs/interface/glinterface.cc' line='66' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gluNewNurbsRenderer'>
@@ -2894,12 +2894,12 @@
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='libnurbs/interface/glrenderer.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-T0fsxk/Mesa-8.0.5/src/glu/sgi' language='LANG_C_plus_plus'>
     <!-- GLfloat[4] -->
-    <array-type-def dimensions='1' type-id='type-id-33' size-in-bits='128' id='type-id-61'>
+    <array-type-def dimensions='1' type-id='type-id-35' size-in-bits='128' id='type-id-61'>
       <!-- <anonymous range>[4] -->
       <subrange length='4' type-id='type-id-3' id='type-id-62'/>
     </array-type-def>
     <!-- typedef void (typedef GLenum)* errorCallbackType -->
-    <typedef-decl name='errorCallbackType' type-id='type-id-16' filepath='libnurbs/interface/glrenderer.h' line='46' column='1' id='type-id-41'/>
+    <typedef-decl name='errorCallbackType' type-id='type-id-19' filepath='libnurbs/interface/glrenderer.h' line='46' column='1' id='type-id-41'/>
     <!-- class NurbsTessellator -->
     <class-decl name='NurbsTessellator' size-in-bits='47616' visibility='default' filepath='libnurbs/internals/nurbstess.h' line='53' column='1' id='type-id-40'>
       <data-member access='protected' layout-offset-in-bits='64'>
@@ -2960,39 +2960,39 @@
       </data-member>
       <data-member access='private' layout-offset-in-bits='46720'>
         <!-- int NurbsTessellator::inSurface -->
-        <var-decl name='inSurface' type-id='type-id-10' visibility='default' filepath='libnurbs/internals/nurbstess.h' line='148' column='1'/>
+        <var-decl name='inSurface' type-id='type-id-11' visibility='default' filepath='libnurbs/internals/nurbstess.h' line='148' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='46752'>
         <!-- int NurbsTessellator::inCurve -->
-        <var-decl name='inCurve' type-id='type-id-10' visibility='default' filepath='libnurbs/internals/nurbstess.h' line='149' column='1'/>
+        <var-decl name='inCurve' type-id='type-id-11' visibility='default' filepath='libnurbs/internals/nurbstess.h' line='149' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='46784'>
         <!-- int NurbsTessellator::inTrim -->
-        <var-decl name='inTrim' type-id='type-id-10' visibility='default' filepath='libnurbs/internals/nurbstess.h' line='150' column='1'/>
+        <var-decl name='inTrim' type-id='type-id-11' visibility='default' filepath='libnurbs/internals/nurbstess.h' line='150' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='46816'>
         <!-- int NurbsTessellator::isCurveModified -->
-        <var-decl name='isCurveModified' type-id='type-id-10' visibility='default' filepath='libnurbs/internals/nurbstess.h' line='151' column='1'/>
+        <var-decl name='isCurveModified' type-id='type-id-11' visibility='default' filepath='libnurbs/internals/nurbstess.h' line='151' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='46848'>
         <!-- int NurbsTessellator::isTrimModified -->
-        <var-decl name='isTrimModified' type-id='type-id-10' visibility='default' filepath='libnurbs/internals/nurbstess.h' line='152' column='1'/>
+        <var-decl name='isTrimModified' type-id='type-id-11' visibility='default' filepath='libnurbs/internals/nurbstess.h' line='152' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='46880'>
         <!-- int NurbsTessellator::isSurfaceModified -->
-        <var-decl name='isSurfaceModified' type-id='type-id-10' visibility='default' filepath='libnurbs/internals/nurbstess.h' line='153' column='1'/>
+        <var-decl name='isSurfaceModified' type-id='type-id-11' visibility='default' filepath='libnurbs/internals/nurbstess.h' line='153' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='46912'>
         <!-- int NurbsTessellator::isDataValid -->
-        <var-decl name='isDataValid' type-id='type-id-10' visibility='default' filepath='libnurbs/internals/nurbstess.h' line='154' column='1'/>
+        <var-decl name='isDataValid' type-id='type-id-11' visibility='default' filepath='libnurbs/internals/nurbstess.h' line='154' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='46944'>
         <!-- int NurbsTessellator::numTrims -->
-        <var-decl name='numTrims' type-id='type-id-10' visibility='default' filepath='libnurbs/internals/nurbstess.h' line='155' column='1'/>
+        <var-decl name='numTrims' type-id='type-id-11' visibility='default' filepath='libnurbs/internals/nurbstess.h' line='155' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='46976'>
         <!-- int NurbsTessellator::playBack -->
-        <var-decl name='playBack' type-id='type-id-10' visibility='default' filepath='libnurbs/internals/nurbstess.h' line='156' column='1'/>
+        <var-decl name='playBack' type-id='type-id-11' visibility='default' filepath='libnurbs/internals/nurbstess.h' line='156' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='47040'>
         <!-- O_trim** NurbsTessellator::nextTrim -->
@@ -3040,7 +3040,7 @@
           <!-- parameter of type 'BasicSurfaceEvaluator&' -->
           <parameter type-id='type-id-81'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -3049,11 +3049,11 @@
           <!-- implicit parameter of type 'NurbsTessellator*' -->
           <parameter type-id='type-id-79' is-artificial='yes'/>
           <!-- parameter of type 'long int' -->
-          <parameter type-id='type-id-12'/>
+          <parameter type-id='type-id-15'/>
           <!-- parameter of type 'float*' -->
           <parameter type-id='type-id-59'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -3062,13 +3062,13 @@
           <!-- implicit parameter of type 'NurbsTessellator*' -->
           <parameter type-id='type-id-79' is-artificial='yes'/>
           <!-- parameter of type 'long int' -->
-          <parameter type-id='type-id-12'/>
+          <parameter type-id='type-id-15'/>
           <!-- parameter of type 'long int' -->
-          <parameter type-id='type-id-12'/>
+          <parameter type-id='type-id-15'/>
           <!-- parameter of type 'float*' -->
           <parameter type-id='type-id-59'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -3077,11 +3077,11 @@
           <!-- implicit parameter of type 'NurbsTessellator*' -->
           <parameter type-id='type-id-79' is-artificial='yes'/>
           <!-- parameter of type 'long int' -->
-          <parameter type-id='type-id-12'/>
+          <parameter type-id='type-id-15'/>
           <!-- parameter of type 'float' -->
-          <parameter type-id='type-id-30'/>
+          <parameter type-id='type-id-33'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -3090,13 +3090,13 @@
           <!-- implicit parameter of type 'NurbsTessellator*' -->
           <parameter type-id='type-id-79' is-artificial='yes'/>
           <!-- parameter of type 'long int' -->
-          <parameter type-id='type-id-12'/>
+          <parameter type-id='type-id-15'/>
           <!-- parameter of type 'long int' -->
-          <parameter type-id='type-id-12'/>
+          <parameter type-id='type-id-15'/>
           <!-- parameter of type 'float' -->
-          <parameter type-id='type-id-30'/>
+          <parameter type-id='type-id-33'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -3105,13 +3105,13 @@
           <!-- implicit parameter of type 'NurbsTessellator*' -->
           <parameter type-id='type-id-79' is-artificial='yes'/>
           <!-- parameter of type 'long int' -->
-          <parameter type-id='type-id-12'/>
+          <parameter type-id='type-id-15'/>
           <!-- parameter of type 'long int' -->
-          <parameter type-id='type-id-12'/>
+          <parameter type-id='type-id-15'/>
           <!-- parameter of type 'float*' -->
           <parameter type-id='type-id-59'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -3120,17 +3120,17 @@
           <!-- implicit parameter of type 'NurbsTessellator*' -->
           <parameter type-id='type-id-79' is-artificial='yes'/>
           <!-- parameter of type 'long int' -->
-          <parameter type-id='type-id-12'/>
+          <parameter type-id='type-id-15'/>
           <!-- parameter of type 'long int' -->
-          <parameter type-id='type-id-12'/>
+          <parameter type-id='type-id-15'/>
           <!-- parameter of type 'float*' -->
           <parameter type-id='type-id-59'/>
           <!-- parameter of type 'long int' -->
-          <parameter type-id='type-id-12'/>
+          <parameter type-id='type-id-15'/>
           <!-- parameter of type 'long int' -->
-          <parameter type-id='type-id-12'/>
+          <parameter type-id='type-id-15'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -3139,9 +3139,9 @@
           <!-- implicit parameter of type 'NurbsTessellator*' -->
           <parameter type-id='type-id-79' is-artificial='yes'/>
           <!-- parameter of type 'long int' -->
-          <parameter type-id='type-id-12'/>
+          <parameter type-id='type-id-15'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -3150,7 +3150,7 @@
           <!-- implicit parameter of type 'NurbsTessellator*' -->
           <parameter type-id='type-id-79' is-artificial='yes'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -3159,7 +3159,7 @@
           <!-- implicit parameter of type 'NurbsTessellator*' -->
           <parameter type-id='type-id-79' is-artificial='yes'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -3168,7 +3168,7 @@
           <!-- implicit parameter of type 'NurbsTessellator*' -->
           <parameter type-id='type-id-79' is-artificial='yes'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -3177,9 +3177,9 @@
           <!-- implicit parameter of type 'NurbsTessellator*' -->
           <parameter type-id='type-id-79' is-artificial='yes'/>
           <!-- parameter of type 'long int' -->
-          <parameter type-id='type-id-12'/>
+          <parameter type-id='type-id-15'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -3188,7 +3188,7 @@
           <!-- implicit parameter of type 'NurbsTessellator*' -->
           <parameter type-id='type-id-79' is-artificial='yes'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -3197,15 +3197,15 @@
           <!-- implicit parameter of type 'NurbsTessellator*' -->
           <parameter type-id='type-id-79' is-artificial='yes'/>
           <!-- parameter of type 'long int' -->
-          <parameter type-id='type-id-12'/>
+          <parameter type-id='type-id-15'/>
           <!-- parameter of type 'float*' -->
           <parameter type-id='type-id-59'/>
           <!-- parameter of type 'long int' -->
-          <parameter type-id='type-id-12'/>
+          <parameter type-id='type-id-15'/>
           <!-- parameter of type 'long int' -->
-          <parameter type-id='type-id-12'/>
+          <parameter type-id='type-id-15'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -3214,19 +3214,19 @@
           <!-- implicit parameter of type 'NurbsTessellator*' -->
           <parameter type-id='type-id-79' is-artificial='yes'/>
           <!-- parameter of type 'long int' -->
-          <parameter type-id='type-id-12'/>
+          <parameter type-id='type-id-15'/>
           <!-- parameter of type 'float*' -->
           <parameter type-id='type-id-59'/>
           <!-- parameter of type 'long int' -->
-          <parameter type-id='type-id-12'/>
+          <parameter type-id='type-id-15'/>
           <!-- parameter of type 'float*' -->
           <parameter type-id='type-id-59'/>
           <!-- parameter of type 'long int' -->
-          <parameter type-id='type-id-12'/>
+          <parameter type-id='type-id-15'/>
           <!-- parameter of type 'long int' -->
-          <parameter type-id='type-id-12'/>
+          <parameter type-id='type-id-15'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -3235,27 +3235,27 @@
           <!-- implicit parameter of type 'NurbsTessellator*' -->
           <parameter type-id='type-id-79' is-artificial='yes'/>
           <!-- parameter of type 'long int' -->
-          <parameter type-id='type-id-12'/>
+          <parameter type-id='type-id-15'/>
           <!-- parameter of type 'float*' -->
           <parameter type-id='type-id-59'/>
           <!-- parameter of type 'long int' -->
-          <parameter type-id='type-id-12'/>
+          <parameter type-id='type-id-15'/>
           <!-- parameter of type 'float*' -->
           <parameter type-id='type-id-59'/>
           <!-- parameter of type 'long int' -->
-          <parameter type-id='type-id-12'/>
+          <parameter type-id='type-id-15'/>
           <!-- parameter of type 'long int' -->
-          <parameter type-id='type-id-12'/>
+          <parameter type-id='type-id-15'/>
           <!-- parameter of type 'float*' -->
           <parameter type-id='type-id-59'/>
           <!-- parameter of type 'long int' -->
-          <parameter type-id='type-id-12'/>
+          <parameter type-id='type-id-15'/>
           <!-- parameter of type 'long int' -->
-          <parameter type-id='type-id-12'/>
+          <parameter type-id='type-id-15'/>
           <!-- parameter of type 'long int' -->
-          <parameter type-id='type-id-12'/>
+          <parameter type-id='type-id-15'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -3264,13 +3264,13 @@
           <!-- implicit parameter of type 'NurbsTessellator*' -->
           <parameter type-id='type-id-79' is-artificial='yes'/>
           <!-- parameter of type 'long int' -->
-          <parameter type-id='type-id-12'/>
+          <parameter type-id='type-id-15'/>
           <!-- parameter of type 'long int' -->
-          <parameter type-id='type-id-12'/>
+          <parameter type-id='type-id-15'/>
           <!-- parameter of type 'long int' -->
-          <parameter type-id='type-id-12'/>
+          <parameter type-id='type-id-15'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -3279,7 +3279,7 @@
           <!-- implicit parameter of type 'NurbsTessellator*' -->
           <parameter type-id='type-id-79' is-artificial='yes'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -3288,9 +3288,9 @@
           <!-- implicit parameter of type 'NurbsTessellator*' -->
           <parameter type-id='type-id-79' is-artificial='yes'/>
           <!-- parameter of type 'void*' -->
-          <parameter type-id='type-id-22'/>
+          <parameter type-id='type-id-25'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -3299,7 +3299,7 @@
           <!-- implicit parameter of type 'NurbsTessellator*' -->
           <parameter type-id='type-id-79' is-artificial='yes'/>
           <!-- void* -->
-          <return type-id='type-id-22'/>
+          <return type-id='type-id-25'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -3308,7 +3308,7 @@
           <!-- implicit parameter of type 'NurbsTessellator*' -->
           <parameter type-id='type-id-79' is-artificial='yes'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -3317,9 +3317,9 @@
           <!-- implicit parameter of type 'NurbsTessellator*' -->
           <parameter type-id='type-id-79' is-artificial='yes'/>
           <!-- parameter of type 'void*' -->
-          <parameter type-id='type-id-22'/>
+          <parameter type-id='type-id-25'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -3330,7 +3330,7 @@
           <!-- parameter of type 'typedef REAL' -->
           <parameter type-id='type-id-1'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -3341,7 +3341,7 @@
           <!-- parameter of type 'typedef REAL' -->
           <parameter type-id='type-id-1'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -3350,9 +3350,9 @@
           <!-- implicit parameter of type 'NurbsTessellator*' -->
           <parameter type-id='type-id-79' is-artificial='yes'/>
           <!-- artificial parameter of type 'int' -->
-          <parameter type-id='type-id-10' is-artificial='yes'/>
+          <parameter type-id='type-id-11' is-artificial='yes'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -3361,7 +3361,7 @@
           <!-- implicit parameter of type 'NurbsTessellator*' -->
           <parameter type-id='type-id-79' is-artificial='yes'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -3374,7 +3374,7 @@
           <!-- parameter of type 'const char*' -->
           <parameter type-id='type-id-83'/>
           <!-- int -->
-          <return type-id='type-id-10'/>
+          <return type-id='type-id-11'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -3383,9 +3383,9 @@
           <!-- implicit parameter of type 'NurbsTessellator*' -->
           <parameter type-id='type-id-79' is-artificial='yes'/>
           <!-- artificial parameter of type 'int' -->
-          <parameter type-id='type-id-10' is-artificial='yes'/>
+          <parameter type-id='type-id-11' is-artificial='yes'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -3396,7 +3396,7 @@
           <!-- parameter of type 'O_curve*' -->
           <parameter type-id='type-id-77'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -3405,7 +3405,7 @@
           <!-- implicit parameter of type 'NurbsTessellator*' -->
           <parameter type-id='type-id-79' is-artificial='yes'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -3414,7 +3414,7 @@
           <!-- implicit parameter of type 'NurbsTessellator*' -->
           <parameter type-id='type-id-79' is-artificial='yes'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -3425,7 +3425,7 @@
           <!-- parameter of type 'O_curve*' -->
           <parameter type-id='type-id-77'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -3436,7 +3436,7 @@
           <!-- parameter of type 'O_trim*' -->
           <parameter type-id='type-id-76'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -3447,7 +3447,7 @@
           <!-- parameter of type 'O_curve*' -->
           <parameter type-id='type-id-77'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -3458,7 +3458,7 @@
           <!-- parameter of type 'O_pwlcurve*' -->
           <parameter type-id='type-id-84'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -3469,7 +3469,7 @@
           <!-- parameter of type 'O_nurbscurve*' -->
           <parameter type-id='type-id-85'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -3480,7 +3480,7 @@
           <!-- parameter of type 'O_nurbssurface*' -->
           <parameter type-id='type-id-86'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -3491,7 +3491,7 @@
           <!-- parameter of type 'O_surface*' -->
           <parameter type-id='type-id-75'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -3502,7 +3502,7 @@
           <!-- parameter of type 'O_surface*' -->
           <parameter type-id='type-id-75'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -3511,7 +3511,7 @@
           <!-- implicit parameter of type 'NurbsTessellator*' -->
           <parameter type-id='type-id-79' is-artificial='yes'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -3522,7 +3522,7 @@
           <!-- parameter of type 'O_trim*' -->
           <parameter type-id='type-id-76'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -3531,7 +3531,7 @@
           <!-- implicit parameter of type 'NurbsTessellator*' -->
           <parameter type-id='type-id-79' is-artificial='yes'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -3542,7 +3542,7 @@
           <!-- parameter of type 'O_pwlcurve*' -->
           <parameter type-id='type-id-84'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -3553,7 +3553,7 @@
           <!-- parameter of type 'O_nurbscurve*' -->
           <parameter type-id='type-id-85'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -3564,7 +3564,7 @@
           <!-- parameter of type 'O_nurbssurface*' -->
           <parameter type-id='type-id-86'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -3575,7 +3575,7 @@
           <!-- parameter of type 'Property*' -->
           <parameter type-id='type-id-87'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -3586,7 +3586,7 @@
           <!-- parameter of type 'Property*' -->
           <parameter type-id='type-id-87'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -3597,7 +3597,7 @@
           <!-- parameter of type 'Property*' -->
           <parameter type-id='type-id-87'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private' destructor='yes' vtable-offset='-1'>
@@ -3606,9 +3606,9 @@
           <!-- implicit parameter of type 'NurbsTessellator*' -->
           <parameter type-id='type-id-79' is-artificial='yes'/>
           <!-- artificial parameter of type 'int' -->
-          <parameter type-id='type-id-10' is-artificial='yes'/>
+          <parameter type-id='type-id-11' is-artificial='yes'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private' vtable-offset='2'>
@@ -3617,7 +3617,7 @@
           <!-- implicit parameter of type 'NurbsTessellator*' -->
           <parameter type-id='type-id-79' is-artificial='yes'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private' vtable-offset='3'>
@@ -3626,7 +3626,7 @@
           <!-- implicit parameter of type 'NurbsTessellator*' -->
           <parameter type-id='type-id-79' is-artificial='yes'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private' vtable-offset='4'>
@@ -3635,9 +3635,9 @@
           <!-- implicit parameter of type 'NurbsTessellator*' -->
           <parameter type-id='type-id-79' is-artificial='yes'/>
           <!-- artificial parameter of type 'int' -->
-          <parameter type-id='type-id-10' is-artificial='yes'/>
+          <parameter type-id='type-id-11' is-artificial='yes'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private' vtable-offset='5'>
@@ -3646,7 +3646,7 @@
           <!-- implicit parameter of type 'NurbsTessellator*' -->
           <parameter type-id='type-id-79' is-artificial='yes'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private' vtable-offset='6'>
@@ -3655,9 +3655,9 @@
           <!-- implicit parameter of type 'NurbsTessellator*' -->
           <parameter type-id='type-id-79' is-artificial='yes'/>
           <!-- artificial parameter of type 'int' -->
-          <parameter type-id='type-id-10' is-artificial='yes'/>
+          <parameter type-id='type-id-11' is-artificial='yes'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
     </class-decl>
@@ -3698,7 +3698,7 @@
       <subrange length='3' type-id='type-id-3' id='type-id-91'/>
     </array-type-def>
     <!-- long int[2] -->
-    <array-type-def dimensions='1' type-id='type-id-12' size-in-bits='128' id='type-id-94'>
+    <array-type-def dimensions='1' type-id='type-id-15' size-in-bits='128' id='type-id-94'>
       <!-- <anonymous range>[2] -->
       <subrange length='2' type-id='type-id-3' id='type-id-88'/>
     </array-type-def>
@@ -3706,7 +3706,7 @@
     <class-decl name='StoredVertex' size-in-bits='256' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='84' column='1' id='type-id-95'>
       <data-member access='private' layout-offset-in-bits='0'>
         <!-- int StoredVertex::type -->
-        <var-decl name='type' type-id='type-id-10' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='95' column='1'/>
+        <var-decl name='type' type-id='type-id-11' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='95' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='32'>
         <!-- REAL StoredVertex::coord[2] -->
@@ -3722,7 +3722,7 @@
           <!-- implicit parameter of type 'StoredVertex*' -->
           <parameter type-id='type-id-93' is-artificial='yes'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private' destructor='yes'>
@@ -3731,9 +3731,9 @@
           <!-- implicit parameter of type 'StoredVertex*' -->
           <parameter type-id='type-id-93' is-artificial='yes'/>
           <!-- artificial parameter of type 'int' -->
-          <parameter type-id='type-id-10' is-artificial='yes'/>
+          <parameter type-id='type-id-11' is-artificial='yes'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -3746,7 +3746,7 @@
           <!-- parameter of type 'typedef REAL' -->
           <parameter type-id='type-id-1'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -3755,11 +3755,11 @@
           <!-- implicit parameter of type 'StoredVertex*' -->
           <parameter type-id='type-id-93' is-artificial='yes'/>
           <!-- parameter of type 'long int' -->
-          <parameter type-id='type-id-12'/>
+          <parameter type-id='type-id-15'/>
           <!-- parameter of type 'long int' -->
-          <parameter type-id='type-id-12'/>
+          <parameter type-id='type-id-15'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -3770,23 +3770,23 @@
           <!-- parameter of type 'OpenGLSurfaceEvaluator*' -->
           <parameter type-id='type-id-55'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
     </class-decl>
     <!-- struct BasicSurfaceEvaluator -->
     <class-decl name='BasicSurfaceEvaluator' size-in-bits='64' is-struct='yes' visibility='default' filepath='libnurbs/internals/basicsurfeval.h' line='43' column='1' id='type-id-48'>
       <!-- class CachingEvaluator -->
-      <base-class access='public' layout-offset-in-bits='0' type-id='type-id-8'/>
+      <base-class access='public' layout-offset-in-bits='0' type-id='type-id-7'/>
       <member-function access='public' destructor='yes' vtable-offset='-1'>
         <!-- BasicSurfaceEvaluator::~BasicSurfaceEvaluator(int) -->
         <function-decl name='~BasicSurfaceEvaluator' filepath='libnurbs/internals/basicsurfeval.h' line='45' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'BasicSurfaceEvaluator*' -->
           <parameter type-id='type-id-96' is-artificial='yes'/>
           <!-- artificial parameter of type 'int' -->
-          <parameter type-id='type-id-10' is-artificial='yes'/>
+          <parameter type-id='type-id-11' is-artificial='yes'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public' vtable-offset='9'>
@@ -3795,13 +3795,13 @@
           <!-- implicit parameter of type 'BasicSurfaceEvaluator*' -->
           <parameter type-id='type-id-96' is-artificial='yes'/>
           <!-- parameter of type 'long int' -->
-          <parameter type-id='type-id-12'/>
+          <parameter type-id='type-id-15'/>
           <!-- parameter of type 'REAL*' -->
-          <parameter type-id='type-id-13'/>
+          <parameter type-id='type-id-16'/>
           <!-- parameter of type 'REAL*' -->
-          <parameter type-id='type-id-13'/>
+          <parameter type-id='type-id-16'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public' vtable-offset='10'>
@@ -3818,7 +3818,7 @@
           <!-- parameter of type 'typedef REAL' -->
           <parameter type-id='type-id-1'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public' vtable-offset='11'>
@@ -3827,9 +3827,9 @@
           <!-- implicit parameter of type 'BasicSurfaceEvaluator*' -->
           <parameter type-id='type-id-96' is-artificial='yes'/>
           <!-- parameter of type 'long int' -->
-          <parameter type-id='type-id-12'/>
+          <parameter type-id='type-id-15'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public' vtable-offset='12'>
@@ -3838,9 +3838,9 @@
           <!-- implicit parameter of type 'BasicSurfaceEvaluator*' -->
           <parameter type-id='type-id-96' is-artificial='yes'/>
           <!-- parameter of type 'long int' -->
-          <parameter type-id='type-id-12'/>
+          <parameter type-id='type-id-15'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public' vtable-offset='13'>
@@ -3849,9 +3849,9 @@
           <!-- implicit parameter of type 'BasicSurfaceEvaluator*' -->
           <parameter type-id='type-id-96' is-artificial='yes'/>
           <!-- parameter of type 'long int' -->
-          <parameter type-id='type-id-12'/>
+          <parameter type-id='type-id-15'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public' vtable-offset='14'>
@@ -3860,27 +3860,27 @@
           <!-- implicit parameter of type 'BasicSurfaceEvaluator*' -->
           <parameter type-id='type-id-96' is-artificial='yes'/>
           <!-- parameter of type 'long int' -->
-          <parameter type-id='type-id-12'/>
+          <parameter type-id='type-id-15'/>
           <!-- parameter of type 'typedef REAL' -->
           <parameter type-id='type-id-1'/>
           <!-- parameter of type 'typedef REAL' -->
           <parameter type-id='type-id-1'/>
           <!-- parameter of type 'long int' -->
-          <parameter type-id='type-id-12'/>
+          <parameter type-id='type-id-15'/>
           <!-- parameter of type 'long int' -->
-          <parameter type-id='type-id-12'/>
+          <parameter type-id='type-id-15'/>
           <!-- parameter of type 'typedef REAL' -->
           <parameter type-id='type-id-1'/>
           <!-- parameter of type 'typedef REAL' -->
           <parameter type-id='type-id-1'/>
           <!-- parameter of type 'long int' -->
-          <parameter type-id='type-id-12'/>
+          <parameter type-id='type-id-15'/>
           <!-- parameter of type 'long int' -->
-          <parameter type-id='type-id-12'/>
+          <parameter type-id='type-id-15'/>
           <!-- parameter of type 'REAL*' -->
-          <parameter type-id='type-id-13'/>
+          <parameter type-id='type-id-16'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public' vtable-offset='15'>
@@ -3889,19 +3889,19 @@
           <!-- implicit parameter of type 'BasicSurfaceEvaluator*' -->
           <parameter type-id='type-id-96' is-artificial='yes'/>
           <!-- parameter of type 'long int' -->
-          <parameter type-id='type-id-12'/>
+          <parameter type-id='type-id-15'/>
           <!-- parameter of type 'typedef REAL' -->
           <parameter type-id='type-id-1'/>
           <!-- parameter of type 'typedef REAL' -->
           <parameter type-id='type-id-1'/>
           <!-- parameter of type 'long int' -->
-          <parameter type-id='type-id-12'/>
+          <parameter type-id='type-id-15'/>
           <!-- parameter of type 'typedef REAL' -->
           <parameter type-id='type-id-1'/>
           <!-- parameter of type 'typedef REAL' -->
           <parameter type-id='type-id-1'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public' vtable-offset='16'>
@@ -3910,17 +3910,17 @@
           <!-- implicit parameter of type 'BasicSurfaceEvaluator*' -->
           <parameter type-id='type-id-96' is-artificial='yes'/>
           <!-- parameter of type 'long int' -->
-          <parameter type-id='type-id-12'/>
+          <parameter type-id='type-id-15'/>
           <!-- parameter of type 'long int' -->
-          <parameter type-id='type-id-12'/>
+          <parameter type-id='type-id-15'/>
           <!-- parameter of type 'long int' -->
-          <parameter type-id='type-id-12'/>
+          <parameter type-id='type-id-15'/>
           <!-- parameter of type 'long int' -->
-          <parameter type-id='type-id-12'/>
+          <parameter type-id='type-id-15'/>
           <!-- parameter of type 'long int' -->
-          <parameter type-id='type-id-12'/>
+          <parameter type-id='type-id-15'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public' vtable-offset='17'>
@@ -3929,13 +3929,13 @@
           <!-- implicit parameter of type 'BasicSurfaceEvaluator*' -->
           <parameter type-id='type-id-96' is-artificial='yes'/>
           <!-- parameter of type 'long int' -->
-          <parameter type-id='type-id-12'/>
+          <parameter type-id='type-id-15'/>
           <!-- parameter of type 'typedef REAL' -->
           <parameter type-id='type-id-1'/>
           <!-- parameter of type 'typedef REAL' -->
           <parameter type-id='type-id-1'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public' vtable-offset='18'>
@@ -3944,11 +3944,11 @@
           <!-- implicit parameter of type 'BasicSurfaceEvaluator*' -->
           <parameter type-id='type-id-96' is-artificial='yes'/>
           <!-- parameter of type 'long int' -->
-          <parameter type-id='type-id-12'/>
+          <parameter type-id='type-id-15'/>
           <!-- parameter of type 'long int' -->
-          <parameter type-id='type-id-12'/>
+          <parameter type-id='type-id-15'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public' vtable-offset='19'>
@@ -3957,7 +3957,7 @@
           <!-- implicit parameter of type 'BasicSurfaceEvaluator*' -->
           <parameter type-id='type-id-96' is-artificial='yes'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public' vtable-offset='20'>
@@ -3966,9 +3966,9 @@
           <!-- implicit parameter of type 'BasicSurfaceEvaluator*' -->
           <parameter type-id='type-id-96' is-artificial='yes'/>
           <!-- parameter of type 'long int' -->
-          <parameter type-id='type-id-12'/>
+          <parameter type-id='type-id-15'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public' vtable-offset='21'>
@@ -3977,7 +3977,7 @@
           <!-- implicit parameter of type 'BasicSurfaceEvaluator*' -->
           <parameter type-id='type-id-96' is-artificial='yes'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public' vtable-offset='22'>
@@ -3986,7 +3986,7 @@
           <!-- implicit parameter of type 'BasicSurfaceEvaluator*' -->
           <parameter type-id='type-id-96' is-artificial='yes'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public' vtable-offset='23'>
@@ -3995,7 +3995,7 @@
           <!-- implicit parameter of type 'BasicSurfaceEvaluator*' -->
           <parameter type-id='type-id-96' is-artificial='yes'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public' vtable-offset='24'>
@@ -4004,7 +4004,7 @@
           <!-- implicit parameter of type 'BasicSurfaceEvaluator*' -->
           <parameter type-id='type-id-96' is-artificial='yes'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public' vtable-offset='25'>
@@ -4013,7 +4013,7 @@
           <!-- implicit parameter of type 'BasicSurfaceEvaluator*' -->
           <parameter type-id='type-id-96' is-artificial='yes'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public' vtable-offset='26'>
@@ -4022,7 +4022,7 @@
           <!-- implicit parameter of type 'BasicSurfaceEvaluator*' -->
           <parameter type-id='type-id-96' is-artificial='yes'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public' vtable-offset='27'>
@@ -4031,7 +4031,7 @@
           <!-- implicit parameter of type 'BasicSurfaceEvaluator*' -->
           <parameter type-id='type-id-96' is-artificial='yes'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public' vtable-offset='28'>
@@ -4040,7 +4040,7 @@
           <!-- implicit parameter of type 'BasicSurfaceEvaluator*' -->
           <parameter type-id='type-id-96' is-artificial='yes'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public' vtable-offset='29'>
@@ -4049,7 +4049,7 @@
           <!-- implicit parameter of type 'BasicSurfaceEvaluator*' -->
           <parameter type-id='type-id-96' is-artificial='yes'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public' vtable-offset='30'>
@@ -4058,7 +4058,7 @@
           <!-- implicit parameter of type 'BasicSurfaceEvaluator*' -->
           <parameter type-id='type-id-96' is-artificial='yes'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public' vtable-offset='31'>
@@ -4067,7 +4067,7 @@
           <!-- implicit parameter of type 'BasicSurfaceEvaluator*' -->
           <parameter type-id='type-id-96' is-artificial='yes'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public' vtable-offset='32'>
@@ -4076,19 +4076,19 @@
           <!-- implicit parameter of type 'BasicSurfaceEvaluator*' -->
           <parameter type-id='type-id-96' is-artificial='yes'/>
           <!-- parameter of type 'int' -->
-          <parameter type-id='type-id-10'/>
+          <parameter type-id='type-id-11'/>
           <!-- parameter of type 'typedef REAL' -->
           <parameter type-id='type-id-1'/>
           <!-- parameter of type 'REAL*' -->
-          <parameter type-id='type-id-13'/>
+          <parameter type-id='type-id-16'/>
           <!-- parameter of type 'int' -->
-          <parameter type-id='type-id-10'/>
+          <parameter type-id='type-id-11'/>
           <!-- parameter of type 'typedef REAL' -->
           <parameter type-id='type-id-1'/>
           <!-- parameter of type 'REAL*' -->
-          <parameter type-id='type-id-13'/>
+          <parameter type-id='type-id-16'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public' vtable-offset='33'>
@@ -4097,19 +4097,19 @@
           <!-- implicit parameter of type 'BasicSurfaceEvaluator*' -->
           <parameter type-id='type-id-96' is-artificial='yes'/>
           <!-- parameter of type 'int' -->
-          <parameter type-id='type-id-10'/>
+          <parameter type-id='type-id-11'/>
           <!-- parameter of type 'typedef REAL' -->
           <parameter type-id='type-id-1'/>
           <!-- parameter of type 'REAL*' -->
-          <parameter type-id='type-id-13'/>
+          <parameter type-id='type-id-16'/>
           <!-- parameter of type 'int' -->
-          <parameter type-id='type-id-10'/>
+          <parameter type-id='type-id-11'/>
           <!-- parameter of type 'typedef REAL' -->
           <parameter type-id='type-id-1'/>
           <!-- parameter of type 'REAL*' -->
-          <parameter type-id='type-id-13'/>
+          <parameter type-id='type-id-16'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public' vtable-offset='34'>
@@ -4122,11 +4122,11 @@
           <!-- parameter of type 'typedef REAL' -->
           <parameter type-id='type-id-1'/>
           <!-- parameter of type 'REAL*' -->
-          <parameter type-id='type-id-13'/>
+          <parameter type-id='type-id-16'/>
           <!-- parameter of type 'REAL*' -->
-          <parameter type-id='type-id-13'/>
+          <parameter type-id='type-id-16'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public' vtable-offset='35'>
@@ -4139,11 +4139,11 @@
           <!-- parameter of type 'typedef REAL' -->
           <parameter type-id='type-id-1'/>
           <!-- parameter of type 'REAL*' -->
-          <parameter type-id='type-id-13'/>
+          <parameter type-id='type-id-16'/>
           <!-- parameter of type 'REAL*' -->
-          <parameter type-id='type-id-13'/>
+          <parameter type-id='type-id-16'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public' vtable-offset='36'>
@@ -4156,11 +4156,11 @@
           <!-- parameter of type 'typedef REAL' -->
           <parameter type-id='type-id-1'/>
           <!-- parameter of type 'REAL*' -->
-          <parameter type-id='type-id-13'/>
+          <parameter type-id='type-id-16'/>
           <!-- parameter of type 'REAL*' -->
-          <parameter type-id='type-id-13'/>
+          <parameter type-id='type-id-16'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public' vtable-offset='37'>
@@ -4171,7 +4171,7 @@
           <!-- parameter of type 'typedef REAL' -->
           <parameter type-id='type-id-1'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public' vtable-offset='38'>
@@ -4182,7 +4182,7 @@
           <!-- parameter of type 'typedef REAL' -->
           <parameter type-id='type-id-1'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
     </class-decl>
@@ -4220,27 +4220,27 @@
       </data-member>
       <data-member access='public' layout-offset-in-bits='448'>
         <!-- int bezierPatchMesh::size_UVarray -->
-        <var-decl name='size_UVarray' type-id='type-id-10' visibility='default' filepath='libnurbs/interface/bezierPatchMesh.h' line='50' column='1'/>
+        <var-decl name='size_UVarray' type-id='type-id-11' visibility='default' filepath='libnurbs/interface/bezierPatchMesh.h' line='50' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='480'>
         <!-- int bezierPatchMesh::index_UVarray -->
-        <var-decl name='index_UVarray' type-id='type-id-10' visibility='default' filepath='libnurbs/interface/bezierPatchMesh.h' line='51' column='1'/>
+        <var-decl name='index_UVarray' type-id='type-id-11' visibility='default' filepath='libnurbs/interface/bezierPatchMesh.h' line='51' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='512'>
         <!-- int bezierPatchMesh::size_length_array -->
-        <var-decl name='size_length_array' type-id='type-id-10' visibility='default' filepath='libnurbs/interface/bezierPatchMesh.h' line='52' column='1'/>
+        <var-decl name='size_length_array' type-id='type-id-11' visibility='default' filepath='libnurbs/interface/bezierPatchMesh.h' line='52' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='544'>
         <!-- int bezierPatchMesh::index_length_array -->
-        <var-decl name='index_length_array' type-id='type-id-10' visibility='default' filepath='libnurbs/interface/bezierPatchMesh.h' line='53' column='1'/>
+        <var-decl name='index_length_array' type-id='type-id-11' visibility='default' filepath='libnurbs/interface/bezierPatchMesh.h' line='53' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='576'>
         <!-- int bezierPatchMesh::counter -->
-        <var-decl name='counter' type-id='type-id-10' visibility='default' filepath='libnurbs/interface/bezierPatchMesh.h' line='55' column='1'/>
+        <var-decl name='counter' type-id='type-id-11' visibility='default' filepath='libnurbs/interface/bezierPatchMesh.h' line='55' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='608'>
         <!-- GLenum bezierPatchMesh::type -->
-        <var-decl name='type' type-id='type-id-25' visibility='default' filepath='libnurbs/interface/bezierPatchMesh.h' line='56' column='1'/>
+        <var-decl name='type' type-id='type-id-28' visibility='default' filepath='libnurbs/interface/bezierPatchMesh.h' line='56' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='640'>
         <!-- float* bezierPatchMesh::vertex_array -->
@@ -4269,31 +4269,31 @@
     <class-decl name='bezierPatch' size-in-bits='384' is-struct='yes' visibility='default' filepath='libnurbs/interface/bezierPatch.h' line='36' column='1' id='type-id-102'>
       <data-member access='public' layout-offset-in-bits='0'>
         <!-- float bezierPatch::umin -->
-        <var-decl name='umin' type-id='type-id-30' visibility='default' filepath='libnurbs/interface/bezierPatch.h' line='37' column='1'/>
+        <var-decl name='umin' type-id='type-id-33' visibility='default' filepath='libnurbs/interface/bezierPatch.h' line='37' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='32'>
         <!-- float bezierPatch::vmin -->
-        <var-decl name='vmin' type-id='type-id-30' visibility='default' filepath='libnurbs/interface/bezierPatch.h' line='37' column='1'/>
+        <var-decl name='vmin' type-id='type-id-33' visibility='default' filepath='libnurbs/interface/bezierPatch.h' line='37' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
         <!-- float bezierPatch::umax -->
-        <var-decl name='umax' type-id='type-id-30' visibility='default' filepath='libnurbs/interface/bezierPatch.h' line='37' column='1'/>
+        <var-decl name='umax' type-id='type-id-33' visibility='default' filepath='libnurbs/interface/bezierPatch.h' line='37' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='96'>
         <!-- float bezierPatch::vmax -->
-        <var-decl name='vmax' type-id='type-id-30' visibility='default' filepath='libnurbs/interface/bezierPatch.h' line='37' column='1'/>
+        <var-decl name='vmax' type-id='type-id-33' visibility='default' filepath='libnurbs/interface/bezierPatch.h' line='37' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
         <!-- int bezierPatch::uorder -->
-        <var-decl name='uorder' type-id='type-id-10' visibility='default' filepath='libnurbs/interface/bezierPatch.h' line='38' column='1'/>
+        <var-decl name='uorder' type-id='type-id-11' visibility='default' filepath='libnurbs/interface/bezierPatch.h' line='38' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='160'>
         <!-- int bezierPatch::vorder -->
-        <var-decl name='vorder' type-id='type-id-10' visibility='default' filepath='libnurbs/interface/bezierPatch.h' line='39' column='1'/>
+        <var-decl name='vorder' type-id='type-id-11' visibility='default' filepath='libnurbs/interface/bezierPatch.h' line='39' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='192'>
         <!-- int bezierPatch::dimension -->
-        <var-decl name='dimension' type-id='type-id-10' visibility='default' filepath='libnurbs/interface/bezierPatch.h' line='57' column='1'/>
+        <var-decl name='dimension' type-id='type-id-11' visibility='default' filepath='libnurbs/interface/bezierPatch.h' line='57' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='256'>
         <!-- float* bezierPatch::ctlpoints -->
@@ -4318,7 +4318,7 @@
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
         <!-- int surfEvalMachine::k -->
-        <var-decl name='k' type-id='type-id-10' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='66' column='1'/>
+        <var-decl name='k' type-id='type-id-11' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='66' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='96'>
         <!-- REAL surfEvalMachine::u1 -->
@@ -4330,11 +4330,11 @@
       </data-member>
       <data-member access='public' layout-offset-in-bits='160'>
         <!-- int surfEvalMachine::ustride -->
-        <var-decl name='ustride' type-id='type-id-10' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='69' column='1'/>
+        <var-decl name='ustride' type-id='type-id-11' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='69' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='192'>
         <!-- int surfEvalMachine::uorder -->
-        <var-decl name='uorder' type-id='type-id-10' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='70' column='1'/>
+        <var-decl name='uorder' type-id='type-id-11' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='70' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='224'>
         <!-- REAL surfEvalMachine::v1 -->
@@ -4346,11 +4346,11 @@
       </data-member>
       <data-member access='public' layout-offset-in-bits='288'>
         <!-- int surfEvalMachine::vstride -->
-        <var-decl name='vstride' type-id='type-id-10' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='73' column='1'/>
+        <var-decl name='vstride' type-id='type-id-11' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='73' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='320'>
         <!-- int surfEvalMachine::vorder -->
-        <var-decl name='vorder' type-id='type-id-10' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='74' column='1'/>
+        <var-decl name='vorder' type-id='type-id-11' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='74' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='352'>
         <!-- REAL surfEvalMachine::ctlPoints[6400] -->
@@ -4376,7 +4376,7 @@
     <!-- BasicSurfaceEvaluator* -->
     <pointer-type-def type-id='type-id-48' size-in-bits='64' id='type-id-96'/>
     <!-- GLenum* -->
-    <pointer-type-def type-id='type-id-25' size-in-bits='64' id='type-id-101'/>
+    <pointer-type-def type-id='type-id-28' size-in-bits='64' id='type-id-101'/>
     <!-- REAL[3]* -->
     <pointer-type-def type-id='type-id-90' size-in-bits='64' id='type-id-57'/>
     <!-- StoredVertex* -->
@@ -4388,7 +4388,7 @@
     <!-- bezierPatchMesh* -->
     <pointer-type-def type-id='type-id-97' size-in-bits='64' id='type-id-51'/>
     <!-- int* -->
-    <pointer-type-def type-id='type-id-10' size-in-bits='64' id='type-id-100'/>
+    <pointer-type-def type-id='type-id-11' size-in-bits='64' id='type-id-100'/>
     <!-- surfEvalMachine* -->
     <pointer-type-def type-id='type-id-54' size-in-bits='64' id='type-id-58'/>
     <!-- struct SurfaceMap -->
@@ -4442,11 +4442,11 @@
       </data-member>
       <data-member access='public' layout-offset-in-bits='320'>
         <!-- long int Arc::type -->
-        <var-decl name='type' type-id='type-id-12' visibility='default' filepath='libnurbs/internals/arc.h' line='66' column='1'/>
+        <var-decl name='type' type-id='type-id-15' visibility='default' filepath='libnurbs/internals/arc.h' line='66' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='384'>
         <!-- long int Arc::nuid -->
-        <var-decl name='nuid' type-id='type-id-12' visibility='default' filepath='libnurbs/internals/arc.h' line='67' column='1'/>
+        <var-decl name='nuid' type-id='type-id-15' visibility='default' filepath='libnurbs/internals/arc.h' line='67' column='1'/>
       </data-member>
       <member-function access='public' constructor='yes'>
         <!-- Arc::Arc(Arc*, PwlArc*) -->
@@ -4458,7 +4458,7 @@
           <!-- parameter of type 'PwlArc*' -->
           <parameter type-id='type-id-115'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public' constructor='yes'>
@@ -4469,9 +4469,9 @@
           <!-- parameter of type 'enum arc_side' -->
           <parameter type-id='type-id-117'/>
           <!-- parameter of type 'long int' -->
-          <parameter type-id='type-id-12'/>
+          <parameter type-id='type-id-15'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
@@ -4491,7 +4491,7 @@
           <!-- implicit parameter of type 'Arc*' -->
           <parameter type-id='type-id-116' is-artificial='yes'/>
           <!-- int -->
-          <return type-id='type-id-10'/>
+          <return type-id='type-id-11'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
@@ -4500,7 +4500,7 @@
           <!-- implicit parameter of type 'Arc*' -->
           <parameter type-id='type-id-116' is-artificial='yes'/>
           <!-- int -->
-          <return type-id='type-id-10'/>
+          <return type-id='type-id-11'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
@@ -4509,7 +4509,7 @@
           <!-- implicit parameter of type 'Arc*' -->
           <parameter type-id='type-id-116' is-artificial='yes'/>
           <!-- int -->
-          <return type-id='type-id-10'/>
+          <return type-id='type-id-11'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
@@ -4518,7 +4518,7 @@
           <!-- implicit parameter of type 'Arc*' -->
           <parameter type-id='type-id-116' is-artificial='yes'/>
           <!-- int -->
-          <return type-id='type-id-10'/>
+          <return type-id='type-id-11'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
@@ -4527,7 +4527,7 @@
           <!-- implicit parameter of type 'Arc*' -->
           <parameter type-id='type-id-116' is-artificial='yes'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
@@ -4538,7 +4538,7 @@
           <!-- parameter of type 'Arc_ptr*' -->
           <parameter type-id='type-id-118'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
@@ -4547,7 +4547,7 @@
           <!-- implicit parameter of type 'Arc*' -->
           <parameter type-id='type-id-116' is-artificial='yes'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
@@ -4556,7 +4556,7 @@
           <!-- implicit parameter of type 'Arc*' -->
           <parameter type-id='type-id-116' is-artificial='yes'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
@@ -4569,7 +4569,7 @@
           <!-- parameter of type 'enum arc_side' -->
           <parameter type-id='type-id-117'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
@@ -4578,7 +4578,7 @@
           <!-- implicit parameter of type 'Arc*' -->
           <parameter type-id='type-id-116' is-artificial='yes'/>
           <!-- int -->
-          <return type-id='type-id-10'/>
+          <return type-id='type-id-11'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
@@ -4587,7 +4587,7 @@
           <!-- implicit parameter of type 'Arc*' -->
           <parameter type-id='type-id-116' is-artificial='yes'/>
           <!-- long int -->
-          <return type-id='type-id-12'/>
+          <return type-id='type-id-15'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
@@ -4596,7 +4596,7 @@
           <!-- implicit parameter of type 'Arc*' -->
           <parameter type-id='type-id-116' is-artificial='yes'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
@@ -4605,7 +4605,7 @@
           <!-- implicit parameter of type 'Arc*' -->
           <parameter type-id='type-id-116' is-artificial='yes'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
@@ -4614,7 +4614,7 @@
           <!-- implicit parameter of type 'Arc*' -->
           <parameter type-id='type-id-116' is-artificial='yes'/>
           <!-- long int -->
-          <return type-id='type-id-12'/>
+          <return type-id='type-id-15'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
@@ -4632,7 +4632,7 @@
           <!-- implicit parameter of type 'Arc*' -->
           <parameter type-id='type-id-116' is-artificial='yes'/>
           <!-- REAL* -->
-          <return type-id='type-id-13'/>
+          <return type-id='type-id-16'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
@@ -4641,7 +4641,7 @@
           <!-- implicit parameter of type 'Arc*' -->
           <parameter type-id='type-id-116' is-artificial='yes'/>
           <!-- REAL* -->
-          <return type-id='type-id-13'/>
+          <return type-id='type-id-16'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
@@ -4650,7 +4650,7 @@
           <!-- implicit parameter of type 'Arc*' -->
           <parameter type-id='type-id-116' is-artificial='yes'/>
           <!-- REAL* -->
-          <return type-id='type-id-13'/>
+          <return type-id='type-id-16'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
@@ -4659,7 +4659,7 @@
           <!-- implicit parameter of type 'Arc*' -->
           <parameter type-id='type-id-116' is-artificial='yes'/>
           <!-- long int -->
-          <return type-id='type-id-12'/>
+          <return type-id='type-id-15'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
@@ -4668,7 +4668,7 @@
           <!-- implicit parameter of type 'Arc*' -->
           <parameter type-id='type-id-116' is-artificial='yes'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
@@ -4677,7 +4677,7 @@
           <!-- implicit parameter of type 'Arc*' -->
           <parameter type-id='type-id-116' is-artificial='yes'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
@@ -4686,7 +4686,7 @@
           <!-- implicit parameter of type 'Arc*' -->
           <parameter type-id='type-id-116' is-artificial='yes'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
@@ -4697,7 +4697,7 @@
           <!-- parameter of type 'enum arc_side' -->
           <parameter type-id='type-id-117'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
@@ -4715,7 +4715,7 @@
           <!-- implicit parameter of type 'Arc*' -->
           <parameter type-id='type-id-116' is-artificial='yes'/>
           <!-- int -->
-          <return type-id='type-id-10'/>
+          <return type-id='type-id-11'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
@@ -4724,7 +4724,7 @@
           <!-- implicit parameter of type 'Arc*' -->
           <parameter type-id='type-id-116' is-artificial='yes'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
@@ -4733,7 +4733,7 @@
           <!-- implicit parameter of type 'Arc*' -->
           <parameter type-id='type-id-116' is-artificial='yes'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
     </class-decl>
@@ -4742,7 +4742,7 @@
       <member-type access='protected'>
         <!-- enum Pool::Magic -->
         <enum-decl name='Magic' filepath='libnurbs/internals/bufpool.h' line='70' column='1' id='type-id-120'>
-          <underlying-type type-id='type-id-38'/>
+          <underlying-type type-id='type-id-9'/>
           <enumerator name='is_allocated' value='62369'/>
           <enumerator name='is_free' value='61858'/>
         </enum-decl>
@@ -4757,7 +4757,7 @@
       </data-member>
       <data-member access='protected' layout-offset-in-bits='2112'>
         <!-- int Pool::nextblock -->
-        <var-decl name='nextblock' type-id='type-id-10' visibility='default' filepath='libnurbs/internals/bufpool.h' line='64' column='1'/>
+        <var-decl name='nextblock' type-id='type-id-11' visibility='default' filepath='libnurbs/internals/bufpool.h' line='64' column='1'/>
       </data-member>
       <data-member access='protected' layout-offset-in-bits='2176'>
         <!-- char* Pool::curblock -->
@@ -4765,19 +4765,19 @@
       </data-member>
       <data-member access='protected' layout-offset-in-bits='2240'>
         <!-- int Pool::buffersize -->
-        <var-decl name='buffersize' type-id='type-id-10' visibility='default' filepath='libnurbs/internals/bufpool.h' line='66' column='1'/>
+        <var-decl name='buffersize' type-id='type-id-11' visibility='default' filepath='libnurbs/internals/bufpool.h' line='66' column='1'/>
       </data-member>
       <data-member access='protected' layout-offset-in-bits='2272'>
         <!-- int Pool::nextsize -->
-        <var-decl name='nextsize' type-id='type-id-10' visibility='default' filepath='libnurbs/internals/bufpool.h' line='67' column='1'/>
+        <var-decl name='nextsize' type-id='type-id-11' visibility='default' filepath='libnurbs/internals/bufpool.h' line='67' column='1'/>
       </data-member>
       <data-member access='protected' layout-offset-in-bits='2304'>
         <!-- int Pool::nextfree -->
-        <var-decl name='nextfree' type-id='type-id-10' visibility='default' filepath='libnurbs/internals/bufpool.h' line='68' column='1'/>
+        <var-decl name='nextfree' type-id='type-id-11' visibility='default' filepath='libnurbs/internals/bufpool.h' line='68' column='1'/>
       </data-member>
       <data-member access='protected' layout-offset-in-bits='2336'>
         <!-- int Pool::initsize -->
-        <var-decl name='initsize' type-id='type-id-10' visibility='default' filepath='libnurbs/internals/bufpool.h' line='69' column='1'/>
+        <var-decl name='initsize' type-id='type-id-11' visibility='default' filepath='libnurbs/internals/bufpool.h' line='69' column='1'/>
       </data-member>
       <data-member access='protected' layout-offset-in-bits='2368'>
         <!-- const char* Pool::name -->
@@ -4793,13 +4793,13 @@
           <!-- implicit parameter of type 'Pool*' -->
           <parameter type-id='type-id-122' is-artificial='yes'/>
           <!-- parameter of type 'int' -->
-          <parameter type-id='type-id-10'/>
+          <parameter type-id='type-id-11'/>
           <!-- parameter of type 'int' -->
-          <parameter type-id='type-id-10'/>
+          <parameter type-id='type-id-11'/>
           <!-- parameter of type 'const char*' -->
           <parameter type-id='type-id-83'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private' destructor='yes'>
@@ -4808,9 +4808,9 @@
           <!-- implicit parameter of type 'Pool*' -->
           <parameter type-id='type-id-122' is-artificial='yes'/>
           <!-- artificial parameter of type 'int' -->
-          <parameter type-id='type-id-10' is-artificial='yes'/>
+          <parameter type-id='type-id-11' is-artificial='yes'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -4819,7 +4819,7 @@
           <!-- implicit parameter of type 'Pool*' -->
           <parameter type-id='type-id-122' is-artificial='yes'/>
           <!-- void* -->
-          <return type-id='type-id-22'/>
+          <return type-id='type-id-25'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -4828,9 +4828,9 @@
           <!-- implicit parameter of type 'Pool*' -->
           <parameter type-id='type-id-122' is-artificial='yes'/>
           <!-- parameter of type 'void*' -->
-          <parameter type-id='type-id-22'/>
+          <parameter type-id='type-id-25'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -4839,7 +4839,7 @@
           <!-- implicit parameter of type 'Pool*' -->
           <parameter type-id='type-id-122' is-artificial='yes'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -4848,7 +4848,7 @@
           <!-- implicit parameter of type 'Pool*' -->
           <parameter type-id='type-id-122' is-artificial='yes'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
     </class-decl>
@@ -4871,7 +4871,7 @@
           <!-- parameter of type 'Pool&' -->
           <parameter type-id='type-id-125'/>
           <!-- void* -->
-          <return type-id='type-id-22'/>
+          <return type-id='type-id-25'/>
         </function-decl>
       </member-function>
       <member-function access='private' static='yes'>
@@ -4880,9 +4880,9 @@
           <!-- parameter of type 'typedef size_t' -->
           <parameter type-id='type-id-123'/>
           <!-- parameter of type 'void*' -->
-          <parameter type-id='type-id-22'/>
+          <parameter type-id='type-id-25'/>
           <!-- void* -->
-          <return type-id='type-id-22'/>
+          <return type-id='type-id-25'/>
         </function-decl>
       </member-function>
       <member-function access='private' static='yes'>
@@ -4891,27 +4891,27 @@
           <!-- parameter of type 'typedef size_t' -->
           <parameter type-id='type-id-123'/>
           <!-- void* -->
-          <return type-id='type-id-22'/>
+          <return type-id='type-id-25'/>
         </function-decl>
       </member-function>
       <member-function access='private' static='yes'>
         <!-- void PooledObj::operator delete() -->
         <function-decl name='operator delete' mangled-name='_ZN9PooledObjdlEPv' filepath='libnurbs/internals/bufpool.h' line='124' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- parameter of type 'void*' -->
-          <parameter type-id='type-id-22'/>
+          <parameter type-id='type-id-25'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private' static='yes'>
         <!-- void PooledObj::operator delete(Pool&) -->
         <function-decl name='operator delete' mangled-name='_ZN9PooledObjdlEPvR4Pool' filepath='libnurbs/internals/bufpool.h' line='125' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- parameter of type 'void*' -->
-          <parameter type-id='type-id-22'/>
+          <parameter type-id='type-id-25'/>
           <!-- parameter of type 'Pool&' -->
           <parameter type-id='type-id-125'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -4922,7 +4922,7 @@
           <!-- parameter of type 'Pool&' -->
           <parameter type-id='type-id-125'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
     </class-decl>
@@ -4930,7 +4930,7 @@
     <typedef-decl name='Arc_ptr' type-id='type-id-116' filepath='libnurbs/internals/arc.h' line='50' column='1' id='type-id-113'/>
     <!-- enum arc_side -->
     <enum-decl name='arc_side' filepath='libnurbs/internals/arc.h' line='52' column='1' id='type-id-117'>
-      <underlying-type type-id='type-id-38'/>
+      <underlying-type type-id='type-id-9'/>
       <enumerator name='arc_none' value='0'/>
       <enumerator name='arc_right' value='1'/>
       <enumerator name='arc_top' value='2'/>
@@ -4947,11 +4947,11 @@
       </data-member>
       <data-member access='private' layout-offset-in-bits='64'>
         <!-- int PwlArc::npts -->
-        <var-decl name='npts' type-id='type-id-10' visibility='default' filepath='libnurbs/internals/pwlarc.h' line='47' column='1'/>
+        <var-decl name='npts' type-id='type-id-11' visibility='default' filepath='libnurbs/internals/pwlarc.h' line='47' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='128'>
         <!-- long int PwlArc::type -->
-        <var-decl name='type' type-id='type-id-12' visibility='default' filepath='libnurbs/internals/pwlarc.h' line='48' column='1'/>
+        <var-decl name='type' type-id='type-id-15' visibility='default' filepath='libnurbs/internals/pwlarc.h' line='48' column='1'/>
       </data-member>
       <member-function access='private' constructor='yes'>
         <!-- PwlArc::PwlArc() -->
@@ -4959,7 +4959,7 @@
           <!-- implicit parameter of type 'PwlArc*' -->
           <parameter type-id='type-id-115' is-artificial='yes'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private' constructor='yes'>
@@ -4968,11 +4968,11 @@
           <!-- implicit parameter of type 'PwlArc*' -->
           <parameter type-id='type-id-115' is-artificial='yes'/>
           <!-- parameter of type 'int' -->
-          <parameter type-id='type-id-10'/>
+          <parameter type-id='type-id-11'/>
           <!-- parameter of type 'TrimVertex*' -->
           <parameter type-id='type-id-119'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private' constructor='yes'>
@@ -4981,13 +4981,13 @@
           <!-- implicit parameter of type 'PwlArc*' -->
           <parameter type-id='type-id-115' is-artificial='yes'/>
           <!-- parameter of type 'int' -->
-          <parameter type-id='type-id-10'/>
+          <parameter type-id='type-id-11'/>
           <!-- parameter of type 'TrimVertex*' -->
           <parameter type-id='type-id-119'/>
           <!-- parameter of type 'long int' -->
-          <parameter type-id='type-id-12'/>
+          <parameter type-id='type-id-15'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
     </class-decl>
@@ -4999,7 +4999,7 @@
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
         <!-- long int TrimVertex::nuid -->
-        <var-decl name='nuid' type-id='type-id-12' visibility='default' filepath='libnurbs/internals/trimvertex.h' line='50' column='1'/>
+        <var-decl name='nuid' type-id='type-id-15' visibility='default' filepath='libnurbs/internals/trimvertex.h' line='50' column='1'/>
       </data-member>
     </class-decl>
     <!-- Arc* -->
@@ -5027,7 +5027,7 @@
     <!-- const char* -->
     <pointer-type-def type-id='type-id-130' size-in-bits='64' id='type-id-83'/>
     <!-- const int -->
-    <qualified-type-def type-id='type-id-10' const='yes' id='type-id-112'/>
+    <qualified-type-def type-id='type-id-11' const='yes' id='type-id-112'/>
     <!-- struct BezierArc -->
     <class-decl name='BezierArc' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-129'/>
   </abi-instr>
@@ -5058,11 +5058,11 @@
       </data-member>
       <data-member access='private' layout-offset-in-bits='160'>
         <!-- int Curvelist::needsSubdivision -->
-        <var-decl name='needsSubdivision' type-id='type-id-10' visibility='default' filepath='libnurbs/internals/curvelist.h' line='59' column='1'/>
+        <var-decl name='needsSubdivision' type-id='type-id-11' visibility='default' filepath='libnurbs/internals/curvelist.h' line='59' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='192'>
         <!-- float Curvelist::stepsize -->
-        <var-decl name='stepsize' type-id='type-id-30' visibility='default' filepath='libnurbs/internals/curvelist.h' line='60' column='1'/>
+        <var-decl name='stepsize' type-id='type-id-33' visibility='default' filepath='libnurbs/internals/curvelist.h' line='60' column='1'/>
       </data-member>
       <member-function access='public' constructor='yes'>
         <!-- Curvelist::Curvelist(Quilt*, REAL, REAL) -->
@@ -5076,7 +5076,7 @@
           <!-- parameter of type 'typedef REAL' -->
           <parameter type-id='type-id-1'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public' constructor='yes'>
@@ -5089,7 +5089,7 @@
           <!-- parameter of type 'typedef REAL' -->
           <parameter type-id='type-id-1'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public' destructor='yes'>
@@ -5098,9 +5098,9 @@
           <!-- implicit parameter of type 'Curvelist*' -->
           <parameter type-id='type-id-138' is-artificial='yes'/>
           <!-- artificial parameter of type 'int' -->
-          <parameter type-id='type-id-10' is-artificial='yes'/>
+          <parameter type-id='type-id-11' is-artificial='yes'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
@@ -5109,7 +5109,7 @@
           <!-- implicit parameter of type 'Curvelist*' -->
           <parameter type-id='type-id-138' is-artificial='yes'/>
           <!-- int -->
-          <return type-id='type-id-10'/>
+          <return type-id='type-id-11'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
@@ -5118,7 +5118,7 @@
           <!-- implicit parameter of type 'Curvelist*' -->
           <parameter type-id='type-id-138' is-artificial='yes'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
@@ -5127,7 +5127,7 @@
           <!-- implicit parameter of type 'Curvelist*' -->
           <parameter type-id='type-id-138' is-artificial='yes'/>
           <!-- int -->
-          <return type-id='type-id-10'/>
+          <return type-id='type-id-11'/>
         </function-decl>
       </member-function>
     </class-decl>
@@ -5151,19 +5151,19 @@
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
         <!-- int Renderhints::displaydomain -->
-        <var-decl name='displaydomain' type-id='type-id-10' visibility='default' filepath='libnurbs/internals/renderhints.h' line='54' column='1'/>
+        <var-decl name='displaydomain' type-id='type-id-11' visibility='default' filepath='libnurbs/internals/renderhints.h' line='54' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='160'>
         <!-- int Renderhints::maxsubdivisions -->
-        <var-decl name='maxsubdivisions' type-id='type-id-10' visibility='default' filepath='libnurbs/internals/renderhints.h' line='55' column='1'/>
+        <var-decl name='maxsubdivisions' type-id='type-id-11' visibility='default' filepath='libnurbs/internals/renderhints.h' line='55' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='192'>
         <!-- int Renderhints::wiretris -->
-        <var-decl name='wiretris' type-id='type-id-10' visibility='default' filepath='libnurbs/internals/renderhints.h' line='56' column='1'/>
+        <var-decl name='wiretris' type-id='type-id-11' visibility='default' filepath='libnurbs/internals/renderhints.h' line='56' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='224'>
         <!-- int Renderhints::wirequads -->
-        <var-decl name='wirequads' type-id='type-id-10' visibility='default' filepath='libnurbs/internals/renderhints.h' line='57' column='1'/>
+        <var-decl name='wirequads' type-id='type-id-11' visibility='default' filepath='libnurbs/internals/renderhints.h' line='57' column='1'/>
       </data-member>
       <member-function access='public' constructor='yes'>
         <!-- Renderhints::Renderhints() -->
@@ -5171,7 +5171,7 @@
           <!-- implicit parameter of type 'Renderhints*' -->
           <parameter type-id='type-id-141' is-artificial='yes'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
@@ -5180,7 +5180,7 @@
           <!-- implicit parameter of type 'Renderhints*' -->
           <parameter type-id='type-id-141' is-artificial='yes'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
@@ -5189,9 +5189,9 @@
           <!-- implicit parameter of type 'Renderhints*' -->
           <parameter type-id='type-id-141' is-artificial='yes'/>
           <!-- parameter of type 'long int' -->
-          <parameter type-id='type-id-12'/>
+          <parameter type-id='type-id-15'/>
           <!-- int -->
-          <return type-id='type-id-10'/>
+          <return type-id='type-id-11'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
@@ -5200,7 +5200,7 @@
           <!-- implicit parameter of type 'Renderhints*' -->
           <parameter type-id='type-id-141' is-artificial='yes'/>
           <!-- parameter of type 'long int' -->
-          <parameter type-id='type-id-12'/>
+          <parameter type-id='type-id-15'/>
           <!-- typedef REAL -->
           <return type-id='type-id-1'/>
         </function-decl>
@@ -5211,11 +5211,11 @@
           <!-- implicit parameter of type 'Renderhints*' -->
           <parameter type-id='type-id-141' is-artificial='yes'/>
           <!-- parameter of type 'long int' -->
-          <parameter type-id='type-id-12'/>
+          <parameter type-id='type-id-15'/>
           <!-- parameter of type 'typedef REAL' -->
           <parameter type-id='type-id-1'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
     </class-decl>
@@ -5223,7 +5223,7 @@
     <class-decl name='Sorter' size-in-bits='128' visibility='default' filepath='libnurbs/internals/sorter.h' line='36' column='1' id='type-id-142'>
       <data-member access='private' layout-offset-in-bits='64'>
         <!-- int Sorter::es -->
-        <var-decl name='es' type-id='type-id-10' visibility='default' filepath='libnurbs/internals/sorter.h' line='49' column='1'/>
+        <var-decl name='es' type-id='type-id-11' visibility='default' filepath='libnurbs/internals/sorter.h' line='49' column='1'/>
       </data-member>
       <member-function access='private' constructor='yes'>
         <!-- Sorter::Sorter(int) -->
@@ -5231,9 +5231,9 @@
           <!-- implicit parameter of type 'Sorter*' -->
           <parameter type-id='type-id-143' is-artificial='yes'/>
           <!-- artificial parameter of type 'int' -->
-          <parameter type-id='type-id-10' is-artificial='yes'/>
+          <parameter type-id='type-id-11' is-artificial='yes'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -5242,11 +5242,11 @@
           <!-- implicit parameter of type 'Sorter*' -->
           <parameter type-id='type-id-143' is-artificial='yes'/>
           <!-- parameter of type 'void*' -->
-          <parameter type-id='type-id-22'/>
+          <parameter type-id='type-id-25'/>
           <!-- parameter of type 'int' -->
-          <parameter type-id='type-id-10'/>
+          <parameter type-id='type-id-11'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -5259,7 +5259,7 @@
           <!-- parameter of type 'char*' -->
           <parameter type-id='type-id-107'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private' destructor='yes' vtable-offset='-1'>
@@ -5268,9 +5268,9 @@
           <!-- implicit parameter of type 'Sorter*' -->
           <parameter type-id='type-id-143' is-artificial='yes'/>
           <!-- artificial parameter of type 'int' -->
-          <parameter type-id='type-id-10' is-artificial='yes'/>
+          <parameter type-id='type-id-11' is-artificial='yes'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='protected' vtable-offset='2'>
@@ -5283,7 +5283,7 @@
           <!-- parameter of type 'char*' -->
           <parameter type-id='type-id-107'/>
           <!-- int -->
-          <return type-id='type-id-10'/>
+          <return type-id='type-id-11'/>
         </function-decl>
       </member-function>
       <member-function access='protected' vtable-offset='3'>
@@ -5296,7 +5296,7 @@
           <!-- parameter of type 'char*' -->
           <parameter type-id='type-id-107'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='protected' vtable-offset='4'>
@@ -5311,7 +5311,7 @@
           <!-- parameter of type 'char*' -->
           <parameter type-id='type-id-107'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
     </class-decl>
@@ -5331,7 +5331,7 @@
           <!-- parameter of type 'Subdivider&' -->
           <parameter type-id='type-id-147'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -5342,9 +5342,9 @@
           <!-- parameter of type 'Arc**' -->
           <parameter type-id='type-id-148'/>
           <!-- parameter of type 'int' -->
-          <parameter type-id='type-id-10'/>
+          <parameter type-id='type-id-11'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='protected' vtable-offset='2'>
@@ -5357,7 +5357,7 @@
           <!-- parameter of type 'char*' -->
           <parameter type-id='type-id-107'/>
           <!-- int -->
-          <return type-id='type-id-10'/>
+          <return type-id='type-id-11'/>
         </function-decl>
       </member-function>
       <member-function access='private' vtable-offset='3'>
@@ -5370,7 +5370,7 @@
           <!-- parameter of type 'char*' -->
           <parameter type-id='type-id-107'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private' vtable-offset='4'>
@@ -5385,7 +5385,7 @@
           <!-- parameter of type 'char*' -->
           <parameter type-id='type-id-107'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
     </class-decl>
@@ -5399,7 +5399,7 @@
           <!-- implicit parameter of type 'FlistSorter*' -->
           <parameter type-id='type-id-150' is-artificial='yes'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -5408,11 +5408,11 @@
           <!-- implicit parameter of type 'FlistSorter*' -->
           <parameter type-id='type-id-150' is-artificial='yes'/>
           <!-- parameter of type 'REAL*' -->
-          <parameter type-id='type-id-13'/>
+          <parameter type-id='type-id-16'/>
           <!-- parameter of type 'int' -->
-          <parameter type-id='type-id-10'/>
+          <parameter type-id='type-id-11'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private' destructor='yes' vtable-offset='-1'>
@@ -5421,9 +5421,9 @@
           <!-- implicit parameter of type 'FlistSorter*' -->
           <parameter type-id='type-id-150' is-artificial='yes'/>
           <!-- artificial parameter of type 'int' -->
-          <parameter type-id='type-id-10' is-artificial='yes'/>
+          <parameter type-id='type-id-11' is-artificial='yes'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='protected' vtable-offset='2'>
@@ -5436,7 +5436,7 @@
           <!-- parameter of type 'char*' -->
           <parameter type-id='type-id-107'/>
           <!-- int -->
-          <return type-id='type-id-10'/>
+          <return type-id='type-id-11'/>
         </function-decl>
       </member-function>
       <member-function access='protected' vtable-offset='3'>
@@ -5449,7 +5449,7 @@
           <!-- parameter of type 'char*' -->
           <parameter type-id='type-id-107'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='protected' vtable-offset='4'>
@@ -5464,7 +5464,7 @@
           <!-- parameter of type 'char*' -->
           <parameter type-id='type-id-107'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
     </class-decl>
@@ -5472,19 +5472,19 @@
     <class-decl name='Flist' size-in-bits='320' visibility='default' filepath='libnurbs/internals/flist.h' line='42' column='1' id='type-id-151'>
       <data-member access='private' layout-offset-in-bits='0'>
         <!-- REAL* Flist::pts -->
-        <var-decl name='pts' type-id='type-id-13' visibility='default' filepath='libnurbs/internals/flist.h' line='44' column='1'/>
+        <var-decl name='pts' type-id='type-id-16' visibility='default' filepath='libnurbs/internals/flist.h' line='44' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='64'>
         <!-- int Flist::npts -->
-        <var-decl name='npts' type-id='type-id-10' visibility='default' filepath='libnurbs/internals/flist.h' line='45' column='1'/>
+        <var-decl name='npts' type-id='type-id-11' visibility='default' filepath='libnurbs/internals/flist.h' line='45' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='96'>
         <!-- int Flist::start -->
-        <var-decl name='start' type-id='type-id-10' visibility='default' filepath='libnurbs/internals/flist.h' line='46' column='1'/>
+        <var-decl name='start' type-id='type-id-11' visibility='default' filepath='libnurbs/internals/flist.h' line='46' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='128'>
         <!-- int Flist::end -->
-        <var-decl name='end' type-id='type-id-10' visibility='default' filepath='libnurbs/internals/flist.h' line='47' column='1'/>
+        <var-decl name='end' type-id='type-id-11' visibility='default' filepath='libnurbs/internals/flist.h' line='47' column='1'/>
       </data-member>
       <data-member access='protected' layout-offset-in-bits='192'>
         <!-- FlistSorter Flist::sorter -->
@@ -5496,7 +5496,7 @@
           <!-- implicit parameter of type 'Flist*' -->
           <parameter type-id='type-id-152' is-artificial='yes'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private' destructor='yes'>
@@ -5505,9 +5505,9 @@
           <!-- implicit parameter of type 'Flist*' -->
           <parameter type-id='type-id-152' is-artificial='yes'/>
           <!-- artificial parameter of type 'int' -->
-          <parameter type-id='type-id-10' is-artificial='yes'/>
+          <parameter type-id='type-id-11' is-artificial='yes'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -5518,7 +5518,7 @@
           <!-- parameter of type 'typedef REAL' -->
           <parameter type-id='type-id-1'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -5527,7 +5527,7 @@
           <!-- implicit parameter of type 'Flist*' -->
           <parameter type-id='type-id-152' is-artificial='yes'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -5536,9 +5536,9 @@
           <!-- implicit parameter of type 'Flist*' -->
           <parameter type-id='type-id-152' is-artificial='yes'/>
           <!-- artificial parameter of type 'int' -->
-          <parameter type-id='type-id-10' is-artificial='yes'/>
+          <parameter type-id='type-id-11' is-artificial='yes'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -5551,7 +5551,7 @@
           <!-- parameter of type 'typedef REAL' -->
           <parameter type-id='type-id-1'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
     </class-decl>
@@ -5567,11 +5567,11 @@
       </data-member>
       <data-member access='private' layout-offset-in-bits='2560'>
         <!-- int TrimVertexPool::nextvlistslot -->
-        <var-decl name='nextvlistslot' type-id='type-id-10' visibility='default' filepath='libnurbs/internals/trimvertpool.h' line='54' column='1'/>
+        <var-decl name='nextvlistslot' type-id='type-id-11' visibility='default' filepath='libnurbs/internals/trimvertpool.h' line='54' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='2592'>
         <!-- int TrimVertexPool::vlistsize -->
-        <var-decl name='vlistsize' type-id='type-id-10' visibility='default' filepath='libnurbs/internals/trimvertpool.h' line='55' column='1'/>
+        <var-decl name='vlistsize' type-id='type-id-11' visibility='default' filepath='libnurbs/internals/trimvertpool.h' line='55' column='1'/>
       </data-member>
       <member-function access='public' constructor='yes'>
         <!-- TrimVertexPool::TrimVertexPool() -->
@@ -5579,7 +5579,7 @@
           <!-- implicit parameter of type 'TrimVertexPool*' -->
           <parameter type-id='type-id-154' is-artificial='yes'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public' destructor='yes'>
@@ -5588,9 +5588,9 @@
           <!-- implicit parameter of type 'TrimVertexPool*' -->
           <parameter type-id='type-id-154' is-artificial='yes'/>
           <!-- artificial parameter of type 'int' -->
-          <parameter type-id='type-id-10' is-artificial='yes'/>
+          <parameter type-id='type-id-11' is-artificial='yes'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
@@ -5599,7 +5599,7 @@
           <!-- implicit parameter of type 'TrimVertexPool*' -->
           <parameter type-id='type-id-154' is-artificial='yes'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
@@ -5608,7 +5608,7 @@
           <!-- implicit parameter of type 'TrimVertexPool*' -->
           <parameter type-id='type-id-154' is-artificial='yes'/>
           <!-- parameter of type 'int' -->
-          <parameter type-id='type-id-10'/>
+          <parameter type-id='type-id-11'/>
           <!-- TrimVertex* -->
           <return type-id='type-id-119'/>
         </function-decl>
@@ -5630,7 +5630,7 @@
           <!-- implicit parameter of type 'Bin*' -->
           <parameter type-id='type-id-156' is-artificial='yes'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private' destructor='yes'>
@@ -5639,9 +5639,9 @@
           <!-- implicit parameter of type 'Bin*' -->
           <parameter type-id='type-id-156' is-artificial='yes'/>
           <!-- artificial parameter of type 'int' -->
-          <parameter type-id='type-id-10' is-artificial='yes'/>
+          <parameter type-id='type-id-11' is-artificial='yes'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -5677,7 +5677,7 @@
           <!-- implicit parameter of type 'Bin*' -->
           <parameter type-id='type-id-156' is-artificial='yes'/>
           <!-- int -->
-          <return type-id='type-id-10'/>
+          <return type-id='type-id-11'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -5688,7 +5688,7 @@
           <!-- parameter of type 'typedef Arc_ptr' -->
           <parameter type-id='type-id-113'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -5699,7 +5699,7 @@
           <!-- parameter of type 'typedef Arc_ptr' -->
           <parameter type-id='type-id-113'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -5708,7 +5708,7 @@
           <!-- implicit parameter of type 'Bin*' -->
           <parameter type-id='type-id-156' is-artificial='yes'/>
           <!-- int -->
-          <return type-id='type-id-10'/>
+          <return type-id='type-id-11'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -5717,7 +5717,7 @@
           <!-- implicit parameter of type 'Bin*' -->
           <parameter type-id='type-id-156' is-artificial='yes'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -5726,7 +5726,7 @@
           <!-- implicit parameter of type 'Bin*' -->
           <parameter type-id='type-id-156' is-artificial='yes'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -5737,7 +5737,7 @@
           <!-- parameter of type 'const char*' -->
           <parameter type-id='type-id-83'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -5746,7 +5746,7 @@
           <!-- implicit parameter of type 'Bin*' -->
           <parameter type-id='type-id-156' is-artificial='yes'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
     </class-decl>
@@ -5774,7 +5774,7 @@
           <!-- parameter of type 'Pool&' -->
           <parameter type-id='type-id-125'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private' destructor='yes'>
@@ -5783,9 +5783,9 @@
           <!-- implicit parameter of type 'ArcTessellator*' -->
           <parameter type-id='type-id-160' is-artificial='yes'/>
           <!-- artificial parameter of type 'int' -->
-          <parameter type-id='type-id-10' is-artificial='yes'/>
+          <parameter type-id='type-id-11' is-artificial='yes'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -5804,7 +5804,7 @@
           <!-- parameter of type 'typedef REAL' -->
           <parameter type-id='type-id-1'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -5825,7 +5825,7 @@
           <!-- parameter of type 'typedef REAL' -->
           <parameter type-id='type-id-1'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -5844,7 +5844,7 @@
           <!-- parameter of type 'typedef REAL' -->
           <parameter type-id='type-id-1'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -5863,7 +5863,7 @@
           <!-- parameter of type 'typedef REAL' -->
           <parameter type-id='type-id-1'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -5882,7 +5882,7 @@
           <!-- parameter of type 'typedef REAL' -->
           <parameter type-id='type-id-1'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -5901,7 +5901,7 @@
           <!-- parameter of type 'typedef REAL' -->
           <parameter type-id='type-id-1'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -5916,9 +5916,9 @@
           <!-- parameter of type 'typedef REAL' -->
           <parameter type-id='type-id-1'/>
           <!-- parameter of type 'int' -->
-          <parameter type-id='type-id-10'/>
+          <parameter type-id='type-id-11'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -5933,9 +5933,9 @@
           <!-- parameter of type 'typedef REAL' -->
           <parameter type-id='type-id-1'/>
           <!-- parameter of type 'int' -->
-          <parameter type-id='type-id-10'/>
+          <parameter type-id='type-id-11'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private' static='yes'>
@@ -5944,11 +5944,11 @@
           <!-- parameter of type 'BezierArc*' -->
           <parameter type-id='type-id-114'/>
           <!-- parameter of type 'REAL*' -->
-          <parameter type-id='type-id-13'/>
+          <parameter type-id='type-id-16'/>
           <!-- parameter of type 'int' -->
-          <parameter type-id='type-id-10'/>
+          <parameter type-id='type-id-11'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
     </class-decl>
@@ -5962,7 +5962,7 @@
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
         <!-- REAL* Quilt::cpts -->
-        <var-decl name='cpts' type-id='type-id-13' visibility='default' filepath='libnurbs/internals/quilt.h' line='68' column='1'/>
+        <var-decl name='cpts' type-id='type-id-16' visibility='default' filepath='libnurbs/internals/quilt.h' line='68' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
         <!-- Quiltspec Quilt::qspec[2] -->
@@ -5984,7 +5984,7 @@
           <!-- parameter of type 'Mapdesc*' -->
           <parameter type-id='type-id-163'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
@@ -5995,7 +5995,7 @@
           <!-- parameter of type 'Pool&' -->
           <parameter type-id='type-id-125'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
@@ -6008,9 +6008,9 @@
           <!-- parameter of type 'float*' -->
           <parameter type-id='type-id-59'/>
           <!-- parameter of type 'long int' -->
-          <parameter type-id='type-id-12'/>
+          <parameter type-id='type-id-15'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
@@ -6025,9 +6025,9 @@
           <!-- parameter of type 'float*' -->
           <parameter type-id='type-id-59'/>
           <!-- parameter of type 'long int' -->
-          <parameter type-id='type-id-12'/>
+          <parameter type-id='type-id-15'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
@@ -6036,11 +6036,11 @@
           <!-- implicit parameter of type 'Quilt*' -->
           <parameter type-id='type-id-139' is-artificial='yes'/>
           <!-- parameter of type 'REAL*' -->
-          <parameter type-id='type-id-13'/>
+          <parameter type-id='type-id-16'/>
           <!-- parameter of type 'REAL*' -->
-          <parameter type-id='type-id-13'/>
+          <parameter type-id='type-id-16'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
@@ -6049,7 +6049,7 @@
           <!-- implicit parameter of type 'Quilt*' -->
           <parameter type-id='type-id-139' is-artificial='yes'/>
           <!-- int -->
-          <return type-id='type-id-10'/>
+          <return type-id='type-id-11'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
@@ -6060,7 +6060,7 @@
           <!-- parameter of type 'Backend&' -->
           <parameter type-id='type-id-167'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
@@ -6069,13 +6069,13 @@
           <!-- implicit parameter of type 'Quilt*' -->
           <parameter type-id='type-id-139' is-artificial='yes'/>
           <!-- parameter of type 'REAL*' -->
-          <parameter type-id='type-id-13'/>
+          <parameter type-id='type-id-16'/>
           <!-- parameter of type 'REAL*' -->
-          <parameter type-id='type-id-13'/>
+          <parameter type-id='type-id-16'/>
           <!-- parameter of type 'Backend&' -->
           <parameter type-id='type-id-167'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
@@ -6084,7 +6084,7 @@
           <!-- implicit parameter of type 'Quilt*' -->
           <parameter type-id='type-id-139' is-artificial='yes'/>
           <!-- int -->
-          <return type-id='type-id-10'/>
+          <return type-id='type-id-11'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
@@ -6093,15 +6093,15 @@
           <!-- implicit parameter of type 'Quilt*' -->
           <parameter type-id='type-id-139' is-artificial='yes'/>
           <!-- parameter of type 'REAL*' -->
-          <parameter type-id='type-id-13'/>
+          <parameter type-id='type-id-16'/>
           <!-- parameter of type 'REAL*' -->
-          <parameter type-id='type-id-13'/>
+          <parameter type-id='type-id-16'/>
           <!-- parameter of type 'Flist&' -->
           <parameter type-id='type-id-168'/>
           <!-- parameter of type 'Flist&' -->
           <parameter type-id='type-id-168'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
@@ -6110,15 +6110,15 @@
           <!-- implicit parameter of type 'Quilt*' -->
           <parameter type-id='type-id-139' is-artificial='yes'/>
           <!-- parameter of type 'REAL*' -->
-          <parameter type-id='type-id-13'/>
+          <parameter type-id='type-id-16'/>
           <!-- parameter of type 'REAL*' -->
-          <parameter type-id='type-id-13'/>
+          <parameter type-id='type-id-16'/>
           <!-- parameter of type 'int' -->
-          <parameter type-id='type-id-10'/>
+          <parameter type-id='type-id-11'/>
           <!-- parameter of type 'Flist&' -->
           <parameter type-id='type-id-168'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
@@ -6127,13 +6127,13 @@
           <!-- implicit parameter of type 'Quilt*' -->
           <parameter type-id='type-id-139' is-artificial='yes'/>
           <!-- parameter of type 'REAL*' -->
-          <parameter type-id='type-id-13'/>
+          <parameter type-id='type-id-16'/>
           <!-- parameter of type 'REAL*' -->
-          <parameter type-id='type-id-13'/>
+          <parameter type-id='type-id-16'/>
           <!-- parameter of type 'Flist&' -->
           <parameter type-id='type-id-168'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
@@ -6146,9 +6146,9 @@
           <!-- parameter of type 'Flist&' -->
           <parameter type-id='type-id-168'/>
           <!-- parameter of type 'REAL*' -->
-          <parameter type-id='type-id-13'/>
+          <parameter type-id='type-id-16'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
@@ -6161,7 +6161,7 @@
           <!-- parameter of type 'Flist&' -->
           <parameter type-id='type-id-168'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
@@ -6170,7 +6170,7 @@
           <!-- implicit parameter of type 'Quilt*' -->
           <parameter type-id='type-id-139' is-artificial='yes'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
     </class-decl>
@@ -6179,7 +6179,7 @@
       <member-type access='private'>
         <!-- enum Subdivider::dir -->
         <enum-decl name='dir' filepath='libnurbs/internals/subdivider.h' line='105' column='1' id='type-id-169'>
-          <underlying-type type-id='type-id-38'/>
+          <underlying-type type-id='type-id-9'/>
           <enumerator name='down' value='0'/>
           <enumerator name='same' value='1'/>
           <enumerator name='up' value='2'/>
@@ -6232,11 +6232,11 @@
       </data-member>
       <data-member access='private' layout-offset-in-bits='18688'>
         <!-- int Subdivider::s_index -->
-        <var-decl name='s_index' type-id='type-id-10' visibility='default' filepath='libnurbs/internals/subdivider.h' line='125' column='1'/>
+        <var-decl name='s_index' type-id='type-id-11' visibility='default' filepath='libnurbs/internals/subdivider.h' line='125' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='18720'>
         <!-- int Subdivider::t_index -->
-        <var-decl name='t_index' type-id='type-id-10' visibility='default' filepath='libnurbs/internals/subdivider.h' line='126' column='1'/>
+        <var-decl name='t_index' type-id='type-id-11' visibility='default' filepath='libnurbs/internals/subdivider.h' line='126' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='18752'>
         <!-- Quilt* Subdivider::qlist -->
@@ -6264,11 +6264,11 @@
       </data-member>
       <data-member access='private' layout-offset-in-bits='20224'>
         <!-- int Subdivider::showDegenerate -->
-        <var-decl name='showDegenerate' type-id='type-id-10' visibility='default' filepath='libnurbs/internals/subdivider.h' line='133' column='1'/>
+        <var-decl name='showDegenerate' type-id='type-id-11' visibility='default' filepath='libnurbs/internals/subdivider.h' line='133' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='20256'>
         <!-- int Subdivider::isArcTypeBezier -->
-        <var-decl name='isArcTypeBezier' type-id='type-id-10' visibility='default' filepath='libnurbs/internals/subdivider.h' line='134' column='1'/>
+        <var-decl name='isArcTypeBezier' type-id='type-id-11' visibility='default' filepath='libnurbs/internals/subdivider.h' line='134' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='20288'>
         <!-- REAL Subdivider::domain_distance_u_rate -->
@@ -6280,7 +6280,7 @@
       </data-member>
       <data-member access='private' layout-offset-in-bits='20352'>
         <!-- int Subdivider::is_domain_distance_sampling -->
-        <var-decl name='is_domain_distance_sampling' type-id='type-id-10' visibility='default' filepath='libnurbs/internals/subdivider.h' line='190' column='1'/>
+        <var-decl name='is_domain_distance_sampling' type-id='type-id-11' visibility='default' filepath='libnurbs/internals/subdivider.h' line='190' column='1'/>
       </data-member>
       <member-function access='private' constructor='yes'>
         <!-- Subdivider::Subdivider(Renderhints&, Backend&) -->
@@ -6292,7 +6292,7 @@
           <!-- parameter of type 'Backend&' -->
           <parameter type-id='type-id-167'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private' destructor='yes'>
@@ -6301,9 +6301,9 @@
           <!-- implicit parameter of type 'Subdivider*' -->
           <parameter type-id='type-id-173' is-artificial='yes'/>
           <!-- artificial parameter of type 'int' -->
-          <parameter type-id='type-id-10' is-artificial='yes'/>
+          <parameter type-id='type-id-11' is-artificial='yes'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -6312,7 +6312,7 @@
           <!-- implicit parameter of type 'Subdivider*' -->
           <parameter type-id='type-id-173' is-artificial='yes'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -6321,7 +6321,7 @@
           <!-- implicit parameter of type 'Subdivider*' -->
           <parameter type-id='type-id-173' is-artificial='yes'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -6330,7 +6330,7 @@
           <!-- implicit parameter of type 'Subdivider*' -->
           <parameter type-id='type-id-173' is-artificial='yes'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -6339,13 +6339,13 @@
           <!-- implicit parameter of type 'Subdivider*' -->
           <parameter type-id='type-id-173' is-artificial='yes'/>
           <!-- parameter of type 'REAL*' -->
-          <parameter type-id='type-id-13'/>
+          <parameter type-id='type-id-16'/>
           <!-- parameter of type 'Quilt*' -->
           <parameter type-id='type-id-139'/>
           <!-- parameter of type 'long int' -->
-          <parameter type-id='type-id-12'/>
+          <parameter type-id='type-id-15'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -6354,13 +6354,13 @@
           <!-- implicit parameter of type 'Subdivider*' -->
           <parameter type-id='type-id-173' is-artificial='yes'/>
           <!-- parameter of type 'int' -->
-          <parameter type-id='type-id-10'/>
+          <parameter type-id='type-id-11'/>
           <!-- parameter of type 'TrimVertex*' -->
           <parameter type-id='type-id-119'/>
           <!-- parameter of type 'long int' -->
-          <parameter type-id='type-id-12'/>
+          <parameter type-id='type-id-15'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -6369,7 +6369,7 @@
           <!-- implicit parameter of type 'Subdivider*' -->
           <parameter type-id='type-id-173' is-artificial='yes'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -6378,7 +6378,7 @@
           <!-- implicit parameter of type 'Subdivider*' -->
           <parameter type-id='type-id-173' is-artificial='yes'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -6387,7 +6387,7 @@
           <!-- implicit parameter of type 'Subdivider*' -->
           <parameter type-id='type-id-173' is-artificial='yes'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -6398,7 +6398,7 @@
           <!-- parameter of type 'Quilt*' -->
           <parameter type-id='type-id-139'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -6407,7 +6407,7 @@
           <!-- implicit parameter of type 'Subdivider*' -->
           <parameter type-id='type-id-173' is-artificial='yes'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -6416,7 +6416,7 @@
           <!-- implicit parameter of type 'Subdivider*' -->
           <parameter type-id='type-id-173' is-artificial='yes'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -6425,9 +6425,9 @@
           <!-- implicit parameter of type 'Subdivider*' -->
           <parameter type-id='type-id-173' is-artificial='yes'/>
           <!-- parameter of type 'long int' -->
-          <parameter type-id='type-id-12'/>
+          <parameter type-id='type-id-15'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -6440,7 +6440,7 @@
           <!-- parameter of type 'typedef Arc_ptr' -->
           <parameter type-id='type-id-113'/>
           <!-- int -->
-          <return type-id='type-id-10'/>
+          <return type-id='type-id-11'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -6453,7 +6453,7 @@
           <!-- parameter of type 'typedef Arc_ptr' -->
           <parameter type-id='type-id-113'/>
           <!-- int -->
-          <return type-id='type-id-10'/>
+          <return type-id='type-id-11'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -6466,7 +6466,7 @@
           <!-- parameter of type 'typedef Arc_ptr' -->
           <parameter type-id='type-id-113'/>
           <!-- int -->
-          <return type-id='type-id-10'/>
+          <return type-id='type-id-11'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -6479,7 +6479,7 @@
           <!-- parameter of type 'typedef Arc_ptr' -->
           <parameter type-id='type-id-113'/>
           <!-- int -->
-          <return type-id='type-id-10'/>
+          <return type-id='type-id-11'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -6490,7 +6490,7 @@
           <!-- parameter of type 'JumpBuffer*' -->
           <parameter type-id='type-id-67'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -6501,7 +6501,7 @@
           <!-- parameter of type 'typedef REAL' -->
           <parameter type-id='type-id-1'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -6512,7 +6512,7 @@
           <!-- parameter of type 'typedef REAL' -->
           <parameter type-id='type-id-1'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -6521,9 +6521,9 @@
           <!-- implicit parameter of type 'Subdivider*' -->
           <parameter type-id='type-id-173' is-artificial='yes'/>
           <!-- artificial parameter of type 'int' -->
-          <parameter type-id='type-id-10' is-artificial='yes'/>
+          <parameter type-id='type-id-11' is-artificial='yes'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -6540,7 +6540,7 @@
           <!-- parameter of type 'typedef REAL' -->
           <parameter type-id='type-id-1'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -6557,7 +6557,7 @@
           <!-- parameter of type 'typedef REAL' -->
           <parameter type-id='type-id-1'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -6574,7 +6574,7 @@
           <!-- parameter of type 'typedef REAL' -->
           <parameter type-id='type-id-1'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -6591,7 +6591,7 @@
           <!-- parameter of type 'typedef REAL' -->
           <parameter type-id='type-id-1'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -6608,7 +6608,7 @@
           <!-- parameter of type 'typedef REAL' -->
           <parameter type-id='type-id-1'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -6625,7 +6625,7 @@
           <!-- parameter of type 'typedef REAL' -->
           <parameter type-id='type-id-1'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -6642,7 +6642,7 @@
           <!-- parameter of type 'typedef REAL' -->
           <parameter type-id='type-id-1'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -6659,7 +6659,7 @@
           <!-- parameter of type 'typedef REAL' -->
           <parameter type-id='type-id-1'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -6672,7 +6672,7 @@
           <!-- parameter of type 'typedef REAL' -->
           <parameter type-id='type-id-1'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -6685,7 +6685,7 @@
           <!-- parameter of type 'Bin&' -->
           <parameter type-id='type-id-175'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -6696,7 +6696,7 @@
           <!-- parameter of type 'typedef Arc_ptr' -->
           <parameter type-id='type-id-113'/>
           <!-- int -->
-          <return type-id='type-id-10'/>
+          <return type-id='type-id-11'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -6709,7 +6709,7 @@
           <!-- parameter of type 'typedef REAL' -->
           <parameter type-id='type-id-1'/>
           <!-- int -->
-          <return type-id='type-id-10'/>
+          <return type-id='type-id-11'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -6720,9 +6720,9 @@
           <!-- parameter of type 'Curvelist&' -->
           <parameter type-id='type-id-140'/>
           <!-- parameter of type 'int' -->
-          <parameter type-id='type-id-10'/>
+          <parameter type-id='type-id-11'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -6733,7 +6733,7 @@
           <!-- parameter of type 'Bin&' -->
           <parameter type-id='type-id-175'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -6744,11 +6744,11 @@
           <!-- parameter of type 'Bin&' -->
           <parameter type-id='type-id-175'/>
           <!-- parameter of type 'int' -->
-          <parameter type-id='type-id-10'/>
+          <parameter type-id='type-id-11'/>
           <!-- parameter of type 'int' -->
-          <parameter type-id='type-id-10'/>
+          <parameter type-id='type-id-11'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -6759,11 +6759,11 @@
           <!-- parameter of type 'Bin&' -->
           <parameter type-id='type-id-175'/>
           <!-- parameter of type 'int' -->
-          <parameter type-id='type-id-10'/>
+          <parameter type-id='type-id-11'/>
           <!-- parameter of type 'int' -->
-          <parameter type-id='type-id-10'/>
+          <parameter type-id='type-id-11'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -6776,11 +6776,11 @@
           <!-- parameter of type 'Patchlist&' -->
           <parameter type-id='type-id-176'/>
           <!-- parameter of type 'int' -->
-          <parameter type-id='type-id-10'/>
+          <parameter type-id='type-id-11'/>
           <!-- parameter of type 'int' -->
-          <parameter type-id='type-id-10'/>
+          <parameter type-id='type-id-11'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -6793,11 +6793,11 @@
           <!-- parameter of type 'Patchlist&' -->
           <parameter type-id='type-id-176'/>
           <!-- parameter of type 'int' -->
-          <parameter type-id='type-id-10'/>
+          <parameter type-id='type-id-11'/>
           <!-- parameter of type 'int' -->
-          <parameter type-id='type-id-10'/>
+          <parameter type-id='type-id-11'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -6810,7 +6810,7 @@
           <!-- parameter of type 'Patchlist&' -->
           <parameter type-id='type-id-176'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -6821,11 +6821,11 @@
           <!-- parameter of type 'Bin&' -->
           <parameter type-id='type-id-175'/>
           <!-- parameter of type 'int' -->
-          <parameter type-id='type-id-10'/>
+          <parameter type-id='type-id-11'/>
           <!-- parameter of type 'int' -->
-          <parameter type-id='type-id-10'/>
+          <parameter type-id='type-id-11'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -6836,11 +6836,11 @@
           <!-- parameter of type 'Bin&' -->
           <parameter type-id='type-id-175'/>
           <!-- parameter of type 'int' -->
-          <parameter type-id='type-id-10'/>
+          <parameter type-id='type-id-11'/>
           <!-- parameter of type 'int' -->
-          <parameter type-id='type-id-10'/>
+          <parameter type-id='type-id-11'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -6851,7 +6851,7 @@
           <!-- parameter of type 'Bin&' -->
           <parameter type-id='type-id-175'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -6862,7 +6862,7 @@
           <!-- parameter of type 'Bin&' -->
           <parameter type-id='type-id-175'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -6873,7 +6873,7 @@
           <!-- parameter of type 'Bin&' -->
           <parameter type-id='type-id-175'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -6888,11 +6888,11 @@
           <!-- parameter of type 'Bin&' -->
           <parameter type-id='type-id-175'/>
           <!-- parameter of type 'int' -->
-          <parameter type-id='type-id-10'/>
+          <parameter type-id='type-id-11'/>
           <!-- parameter of type 'typedef REAL' -->
           <parameter type-id='type-id-1'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -6911,7 +6911,7 @@
           <!-- parameter of type 'typedef REAL' -->
           <parameter type-id='type-id-1'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -6920,7 +6920,7 @@
           <!-- implicit parameter of type 'Subdivider*' -->
           <parameter type-id='type-id-173' is-artificial='yes'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -6929,7 +6929,7 @@
           <!-- implicit parameter of type 'Subdivider*' -->
           <parameter type-id='type-id-173' is-artificial='yes'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -6938,7 +6938,7 @@
           <!-- implicit parameter of type 'Subdivider*' -->
           <parameter type-id='type-id-173' is-artificial='yes'/>
           <!-- int -->
-          <return type-id='type-id-10'/>
+          <return type-id='type-id-11'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -6947,7 +6947,7 @@
           <!-- implicit parameter of type 'Subdivider*' -->
           <parameter type-id='type-id-173' is-artificial='yes'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -6956,7 +6956,7 @@
           <!-- implicit parameter of type 'Subdivider*' -->
           <parameter type-id='type-id-173' is-artificial='yes'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -6965,7 +6965,7 @@
           <!-- implicit parameter of type 'Subdivider*' -->
           <parameter type-id='type-id-173' is-artificial='yes'/>
           <!-- int -->
-          <return type-id='type-id-10'/>
+          <return type-id='type-id-11'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -6978,7 +6978,7 @@
           <!-- parameter of type 'const REAL*' -->
           <parameter type-id='type-id-177'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -6989,15 +6989,15 @@
           <!-- parameter of type 'Bin&' -->
           <parameter type-id='type-id-175'/>
           <!-- parameter of type 'int' -->
-          <parameter type-id='type-id-10'/>
+          <parameter type-id='type-id-11'/>
           <!-- parameter of type 'const REAL*' -->
           <parameter type-id='type-id-177'/>
           <!-- parameter of type 'int' -->
-          <parameter type-id='type-id-10'/>
+          <parameter type-id='type-id-11'/>
           <!-- parameter of type 'int' -->
-          <parameter type-id='type-id-10'/>
+          <parameter type-id='type-id-11'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -7016,11 +7016,11 @@
           <!-- parameter of type 'Bin&' -->
           <parameter type-id='type-id-175'/>
           <!-- parameter of type 'int' -->
-          <parameter type-id='type-id-10'/>
+          <parameter type-id='type-id-11'/>
           <!-- parameter of type 'typedef REAL' -->
           <parameter type-id='type-id-1'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -7031,7 +7031,7 @@
           <!-- parameter of type 'Bin&' -->
           <parameter type-id='type-id-175'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -7042,7 +7042,7 @@
           <!-- parameter of type 'Bin&' -->
           <parameter type-id='type-id-175'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -7057,9 +7057,9 @@
           <!-- parameter of type 'TrimVertex*' -->
           <parameter type-id='type-id-119'/>
           <!-- parameter of type 'int' -->
-          <parameter type-id='type-id-10'/>
+          <parameter type-id='type-id-11'/>
           <!-- int -->
-          <return type-id='type-id-10'/>
+          <return type-id='type-id-11'/>
         </function-decl>
       </member-function>
       <member-function access='private' static='yes'>
@@ -7078,7 +7078,7 @@
           <!-- parameter of type 'typedef REAL' -->
           <parameter type-id='type-id-1'/>
           <!-- int -->
-          <return type-id='type-id-10'/>
+          <return type-id='type-id-11'/>
         </function-decl>
       </member-function>
       <member-function access='private' static='yes'>
@@ -7091,7 +7091,7 @@
           <!-- parameter of type 'TrimVertex*' -->
           <parameter type-id='type-id-119'/>
           <!-- int -->
-          <return type-id='type-id-10'/>
+          <return type-id='type-id-11'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -7108,7 +7108,7 @@
           <!-- parameter of type 'typedef Arc_ptr' -->
           <parameter type-id='type-id-113'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -7125,7 +7125,7 @@
           <!-- parameter of type 'typedef Arc_ptr' -->
           <parameter type-id='type-id-113'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -7136,13 +7136,13 @@
           <!-- parameter of type 'typedef Arc_ptr' -->
           <parameter type-id='type-id-113'/>
           <!-- parameter of type 'int' -->
-          <parameter type-id='type-id-10'/>
+          <parameter type-id='type-id-11'/>
           <!-- parameter of type 'typedef REAL' -->
           <parameter type-id='type-id-1'/>
           <!-- parameter of type 'int' -->
-          <parameter type-id='type-id-10'/>
+          <parameter type-id='type-id-11'/>
           <!-- int -->
-          <return type-id='type-id-10'/>
+          <return type-id='type-id-11'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -7155,7 +7155,7 @@
           <!-- parameter of type 'typedef Arc_ptr' -->
           <parameter type-id='type-id-113'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -7168,7 +7168,7 @@
           <!-- parameter of type 'typedef Arc_ptr' -->
           <parameter type-id='type-id-113'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -7185,7 +7185,7 @@
           <!-- parameter of type 'typedef Arc_ptr' -->
           <parameter type-id='type-id-113'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -7198,7 +7198,7 @@
           <!-- parameter of type 'typedef Arc_ptr' -->
           <parameter type-id='type-id-113'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -7223,11 +7223,11 @@
       </data-member>
       <data-member access='private' layout-offset-in-bits='64'>
         <!-- int Patchlist::notInBbox -->
-        <var-decl name='notInBbox' type-id='type-id-10' visibility='default' filepath='libnurbs/internals/patchlist.h' line='64' column='1'/>
+        <var-decl name='notInBbox' type-id='type-id-11' visibility='default' filepath='libnurbs/internals/patchlist.h' line='64' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='96'>
         <!-- int Patchlist::needsSampling -->
-        <var-decl name='needsSampling' type-id='type-id-10' visibility='default' filepath='libnurbs/internals/patchlist.h' line='65' column='1'/>
+        <var-decl name='needsSampling' type-id='type-id-11' visibility='default' filepath='libnurbs/internals/patchlist.h' line='65' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='128'>
         <!-- Pspec Patchlist::pspec[2] -->
@@ -7241,11 +7241,11 @@
           <!-- parameter of type 'Quilt*' -->
           <parameter type-id='type-id-139'/>
           <!-- parameter of type 'REAL*' -->
-          <parameter type-id='type-id-13'/>
+          <parameter type-id='type-id-16'/>
           <!-- parameter of type 'REAL*' -->
-          <parameter type-id='type-id-13'/>
+          <parameter type-id='type-id-16'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public' constructor='yes'>
@@ -7256,11 +7256,11 @@
           <!-- parameter of type 'Patchlist&' -->
           <parameter type-id='type-id-176'/>
           <!-- parameter of type 'int' -->
-          <parameter type-id='type-id-10'/>
+          <parameter type-id='type-id-11'/>
           <!-- parameter of type 'typedef REAL' -->
           <parameter type-id='type-id-1'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public' destructor='yes'>
@@ -7269,9 +7269,9 @@
           <!-- implicit parameter of type 'Patchlist*' -->
           <parameter type-id='type-id-181' is-artificial='yes'/>
           <!-- artificial parameter of type 'int' -->
-          <parameter type-id='type-id-10' is-artificial='yes'/>
+          <parameter type-id='type-id-11' is-artificial='yes'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
@@ -7280,7 +7280,7 @@
           <!-- implicit parameter of type 'Patchlist*' -->
           <parameter type-id='type-id-181' is-artificial='yes'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
@@ -7289,7 +7289,7 @@
           <!-- implicit parameter of type 'Patchlist*' -->
           <parameter type-id='type-id-181' is-artificial='yes'/>
           <!-- int -->
-          <return type-id='type-id-10'/>
+          <return type-id='type-id-11'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
@@ -7298,7 +7298,7 @@
           <!-- implicit parameter of type 'Patchlist*' -->
           <parameter type-id='type-id-181' is-artificial='yes'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
@@ -7307,7 +7307,7 @@
           <!-- implicit parameter of type 'Patchlist*' -->
           <parameter type-id='type-id-181' is-artificial='yes'/>
           <!-- int -->
-          <return type-id='type-id-10'/>
+          <return type-id='type-id-11'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
@@ -7316,7 +7316,7 @@
           <!-- implicit parameter of type 'Patchlist*' -->
           <parameter type-id='type-id-181' is-artificial='yes'/>
           <!-- int -->
-          <return type-id='type-id-10'/>
+          <return type-id='type-id-11'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
@@ -7325,9 +7325,9 @@
           <!-- implicit parameter of type 'Patchlist*' -->
           <parameter type-id='type-id-181' is-artificial='yes'/>
           <!-- parameter of type 'int' -->
-          <parameter type-id='type-id-10'/>
+          <parameter type-id='type-id-11'/>
           <!-- int -->
-          <return type-id='type-id-10'/>
+          <return type-id='type-id-11'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
@@ -7336,7 +7336,7 @@
           <!-- implicit parameter of type 'Patchlist*' -->
           <parameter type-id='type-id-181' is-artificial='yes'/>
           <!-- parameter of type 'int' -->
-          <parameter type-id='type-id-10'/>
+          <parameter type-id='type-id-11'/>
           <!-- typedef REAL -->
           <return type-id='type-id-1'/>
         </function-decl>
@@ -7347,9 +7347,9 @@
           <!-- implicit parameter of type 'Patchlist*' -->
           <parameter type-id='type-id-181' is-artificial='yes'/>
           <!-- parameter of type 'REAL*' -->
-          <parameter type-id='type-id-13'/>
+          <parameter type-id='type-id-16'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
@@ -7358,7 +7358,7 @@
           <!-- implicit parameter of type 'Patchlist*' -->
           <parameter type-id='type-id-181' is-artificial='yes'/>
           <!-- int -->
-          <return type-id='type-id-10'/>
+          <return type-id='type-id-11'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
@@ -7367,7 +7367,7 @@
           <!-- implicit parameter of type 'Patchlist*' -->
           <parameter type-id='type-id-181' is-artificial='yes'/>
           <!-- int -->
-          <return type-id='type-id-10'/>
+          <return type-id='type-id-11'/>
         </function-decl>
       </member-function>
     </class-decl>
@@ -7395,15 +7395,15 @@
       </data-member>
       <data-member access='private' layout-offset-in-bits='5408'>
         <!-- int Slicer::isolines -->
-        <var-decl name='isolines' type-id='type-id-10' visibility='default' filepath='libnurbs/internals/slicer.h' line='75' column='1'/>
+        <var-decl name='isolines' type-id='type-id-11' visibility='default' filepath='libnurbs/internals/slicer.h' line='75' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='5440'>
         <!-- int Slicer::ulinear -->
-        <var-decl name='ulinear' type-id='type-id-10' visibility='default' filepath='libnurbs/internals/slicer.h' line='81' column='1'/>
+        <var-decl name='ulinear' type-id='type-id-11' visibility='default' filepath='libnurbs/internals/slicer.h' line='81' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='5472'>
         <!-- int Slicer::vlinear -->
-        <var-decl name='vlinear' type-id='type-id-10' visibility='default' filepath='libnurbs/internals/slicer.h' line='82' column='1'/>
+        <var-decl name='vlinear' type-id='type-id-11' visibility='default' filepath='libnurbs/internals/slicer.h' line='82' column='1'/>
       </data-member>
       <member-function access='private' constructor='yes'>
         <!-- Slicer::Slicer(int, void**, Backend&) -->
@@ -7411,13 +7411,13 @@
           <!-- implicit parameter of type 'Slicer*' -->
           <parameter type-id='type-id-184' is-artificial='yes'/>
           <!-- artificial parameter of type 'int' -->
-          <parameter type-id='type-id-10' is-artificial='yes'/>
+          <parameter type-id='type-id-11' is-artificial='yes'/>
           <!-- artificial parameter of type 'void**' -->
           <parameter type-id='type-id-185' is-artificial='yes'/>
           <!-- parameter of type 'Backend&' -->
           <parameter type-id='type-id-167'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private' destructor='yes'>
@@ -7426,11 +7426,11 @@
           <!-- implicit parameter of type 'Slicer*' -->
           <parameter type-id='type-id-184' is-artificial='yes'/>
           <!-- artificial parameter of type 'int' -->
-          <parameter type-id='type-id-10' is-artificial='yes'/>
+          <parameter type-id='type-id-11' is-artificial='yes'/>
           <!-- artificial parameter of type 'void**' -->
           <parameter type-id='type-id-185' is-artificial='yes'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -7441,7 +7441,7 @@
           <!-- parameter of type 'typedef Arc_ptr' -->
           <parameter type-id='type-id-113'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -7452,7 +7452,7 @@
           <!-- parameter of type 'typedef Arc_ptr' -->
           <parameter type-id='type-id-113'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -7463,7 +7463,7 @@
           <!-- parameter of type 'typedef Arc_ptr' -->
           <parameter type-id='type-id-113'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -7474,7 +7474,7 @@
           <!-- parameter of type 'primStream*' -->
           <parameter type-id='type-id-186'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -7487,7 +7487,7 @@
           <!-- parameter of type 'gridWrap*' -->
           <parameter type-id='type-id-188'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -7498,7 +7498,7 @@
           <!-- parameter of type 'typedef Arc_ptr' -->
           <parameter type-id='type-id-113'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -7511,7 +7511,7 @@
           <!-- parameter of type 'typedef REAL' -->
           <parameter type-id='type-id-1'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -7520,9 +7520,9 @@
           <!-- implicit parameter of type 'Slicer*' -->
           <parameter type-id='type-id-184' is-artificial='yes'/>
           <!-- parameter of type 'int' -->
-          <parameter type-id='type-id-10'/>
+          <parameter type-id='type-id-11'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -7531,9 +7531,9 @@
           <!-- implicit parameter of type 'Slicer*' -->
           <parameter type-id='type-id-184' is-artificial='yes'/>
           <!-- parameter of type 'int' -->
-          <parameter type-id='type-id-10'/>
+          <parameter type-id='type-id-11'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -7542,9 +7542,9 @@
           <!-- implicit parameter of type 'Slicer*' -->
           <parameter type-id='type-id-184' is-artificial='yes'/>
           <!-- parameter of type 'int' -->
-          <parameter type-id='type-id-10'/>
+          <parameter type-id='type-id-11'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -7553,7 +7553,7 @@
           <!-- implicit parameter of type 'Slicer*' -->
           <parameter type-id='type-id-184' is-artificial='yes'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -7562,7 +7562,7 @@
           <!-- implicit parameter of type 'Slicer*' -->
           <parameter type-id='type-id-184' is-artificial='yes'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -7571,9 +7571,9 @@
           <!-- implicit parameter of type 'Slicer*' -->
           <parameter type-id='type-id-184' is-artificial='yes'/>
           <!-- parameter of type 'long int' -->
-          <parameter type-id='type-id-12'/>
+          <parameter type-id='type-id-15'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
     </class-decl>
@@ -7589,15 +7589,15 @@
       </data-member>
       <data-member access='private' layout-offset-in-bits='128'>
         <!-- int Backend::wireframetris -->
-        <var-decl name='wireframetris' type-id='type-id-10' visibility='default' filepath='libnurbs/internals/backend.h' line='105' column='1'/>
+        <var-decl name='wireframetris' type-id='type-id-11' visibility='default' filepath='libnurbs/internals/backend.h' line='105' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='160'>
         <!-- int Backend::wireframequads -->
-        <var-decl name='wireframequads' type-id='type-id-10' visibility='default' filepath='libnurbs/internals/backend.h' line='106' column='1'/>
+        <var-decl name='wireframequads' type-id='type-id-11' visibility='default' filepath='libnurbs/internals/backend.h' line='106' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='192'>
         <!-- int Backend::npts -->
-        <var-decl name='npts' type-id='type-id-10' visibility='default' filepath='libnurbs/internals/backend.h' line='107' column='1'/>
+        <var-decl name='npts' type-id='type-id-11' visibility='default' filepath='libnurbs/internals/backend.h' line='107' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='224'>
         <!-- REAL Backend::mesh[3][4] -->
@@ -7605,7 +7605,7 @@
       </data-member>
       <data-member access='private' layout-offset-in-bits='608'>
         <!-- int Backend::meshindex -->
-        <var-decl name='meshindex' type-id='type-id-10' visibility='default' filepath='libnurbs/internals/backend.h' line='109' column='1'/>
+        <var-decl name='meshindex' type-id='type-id-11' visibility='default' filepath='libnurbs/internals/backend.h' line='109' column='1'/>
       </data-member>
       <member-function access='public' constructor='yes'>
         <!-- Backend::Backend(BasicCurveEvaluator&, BasicSurfaceEvaluator&) -->
@@ -7617,7 +7617,7 @@
           <!-- parameter of type 'BasicSurfaceEvaluator&' -->
           <parameter type-id='type-id-81'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
@@ -7626,13 +7626,13 @@
           <!-- implicit parameter of type 'Backend*' -->
           <parameter type-id='type-id-192' is-artificial='yes'/>
           <!-- parameter of type 'int' -->
-          <parameter type-id='type-id-10'/>
+          <parameter type-id='type-id-11'/>
           <!-- parameter of type 'int' -->
-          <parameter type-id='type-id-10'/>
+          <parameter type-id='type-id-11'/>
           <!-- parameter of type 'long int' -->
-          <parameter type-id='type-id-12'/>
+          <parameter type-id='type-id-15'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
@@ -7649,7 +7649,7 @@
           <!-- parameter of type 'typedef REAL' -->
           <parameter type-id='type-id-1'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
@@ -7658,17 +7658,17 @@
           <!-- implicit parameter of type 'Backend*' -->
           <parameter type-id='type-id-192' is-artificial='yes'/>
           <!-- parameter of type 'long int' -->
-          <parameter type-id='type-id-12'/>
+          <parameter type-id='type-id-15'/>
           <!-- parameter of type 'REAL*' -->
-          <parameter type-id='type-id-13'/>
+          <parameter type-id='type-id-16'/>
           <!-- parameter of type 'long int' -->
-          <parameter type-id='type-id-12'/>
+          <parameter type-id='type-id-15'/>
           <!-- parameter of type 'long int' -->
-          <parameter type-id='type-id-12'/>
+          <parameter type-id='type-id-15'/>
           <!-- parameter of type 'int' -->
-          <parameter type-id='type-id-10'/>
+          <parameter type-id='type-id-11'/>
           <!-- parameter of type 'int' -->
-          <parameter type-id='type-id-10'/>
+          <parameter type-id='type-id-11'/>
           <!-- parameter of type 'typedef REAL' -->
           <parameter type-id='type-id-1'/>
           <!-- parameter of type 'typedef REAL' -->
@@ -7678,7 +7678,7 @@
           <!-- parameter of type 'typedef REAL' -->
           <parameter type-id='type-id-1'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
@@ -7687,13 +7687,13 @@
           <!-- implicit parameter of type 'Backend*' -->
           <parameter type-id='type-id-192' is-artificial='yes'/>
           <!-- parameter of type 'long int' -->
-          <parameter type-id='type-id-12'/>
+          <parameter type-id='type-id-15'/>
           <!-- parameter of type 'REAL*' -->
-          <parameter type-id='type-id-13'/>
+          <parameter type-id='type-id-16'/>
           <!-- parameter of type 'REAL*' -->
-          <parameter type-id='type-id-13'/>
+          <parameter type-id='type-id-16'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
@@ -7706,15 +7706,15 @@
           <!-- parameter of type 'typedef REAL' -->
           <parameter type-id='type-id-1'/>
           <!-- parameter of type 'long int' -->
-          <parameter type-id='type-id-12'/>
+          <parameter type-id='type-id-15'/>
           <!-- parameter of type 'typedef REAL' -->
           <parameter type-id='type-id-1'/>
           <!-- parameter of type 'typedef REAL' -->
           <parameter type-id='type-id-1'/>
           <!-- parameter of type 'long int' -->
-          <parameter type-id='type-id-12'/>
+          <parameter type-id='type-id-15'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
@@ -7723,15 +7723,15 @@
           <!-- implicit parameter of type 'Backend*' -->
           <parameter type-id='type-id-192' is-artificial='yes'/>
           <!-- parameter of type 'long int' -->
-          <parameter type-id='type-id-12'/>
+          <parameter type-id='type-id-15'/>
           <!-- parameter of type 'long int' -->
-          <parameter type-id='type-id-12'/>
+          <parameter type-id='type-id-15'/>
           <!-- parameter of type 'long int' -->
-          <parameter type-id='type-id-12'/>
+          <parameter type-id='type-id-15'/>
           <!-- parameter of type 'long int' -->
-          <parameter type-id='type-id-12'/>
+          <parameter type-id='type-id-15'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
@@ -7742,7 +7742,7 @@
           <!-- parameter of type 'const char*' -->
           <parameter type-id='type-id-83'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
@@ -7751,7 +7751,7 @@
           <!-- implicit parameter of type 'Backend*' -->
           <parameter type-id='type-id-192' is-artificial='yes'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
@@ -7760,7 +7760,7 @@
           <!-- implicit parameter of type 'Backend*' -->
           <parameter type-id='type-id-192' is-artificial='yes'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
@@ -7771,7 +7771,7 @@
           <!-- parameter of type 'GridTrimVertex*' -->
           <parameter type-id='type-id-193'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
@@ -7782,7 +7782,7 @@
           <!-- parameter of type 'TrimVertex*' -->
           <parameter type-id='type-id-119'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
@@ -7793,7 +7793,7 @@
           <!-- parameter of type 'GridVertex*' -->
           <parameter type-id='type-id-194'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
@@ -7806,7 +7806,7 @@
           <!-- parameter of type 'typedef REAL' -->
           <parameter type-id='type-id-1'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
@@ -7817,7 +7817,7 @@
           <!-- parameter of type 'TrimVertex*' -->
           <parameter type-id='type-id-119'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
@@ -7828,7 +7828,7 @@
           <!-- parameter of type 'GridVertex*' -->
           <parameter type-id='type-id-194'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
@@ -7837,7 +7837,7 @@
           <!-- implicit parameter of type 'Backend*' -->
           <parameter type-id='type-id-192' is-artificial='yes'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
@@ -7846,7 +7846,7 @@
           <!-- implicit parameter of type 'Backend*' -->
           <parameter type-id='type-id-192' is-artificial='yes'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
@@ -7855,7 +7855,7 @@
           <!-- implicit parameter of type 'Backend*' -->
           <parameter type-id='type-id-192' is-artificial='yes'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
@@ -7870,7 +7870,7 @@
           <!-- parameter of type 'TrimVertex*' -->
           <parameter type-id='type-id-119'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
@@ -7879,7 +7879,7 @@
           <!-- implicit parameter of type 'Backend*' -->
           <parameter type-id='type-id-192' is-artificial='yes'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
@@ -7888,7 +7888,7 @@
           <!-- implicit parameter of type 'Backend*' -->
           <parameter type-id='type-id-192' is-artificial='yes'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
@@ -7897,7 +7897,7 @@
           <!-- implicit parameter of type 'Backend*' -->
           <parameter type-id='type-id-192' is-artificial='yes'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
@@ -7906,7 +7906,7 @@
           <!-- implicit parameter of type 'Backend*' -->
           <parameter type-id='type-id-192' is-artificial='yes'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
@@ -7915,19 +7915,19 @@
           <!-- implicit parameter of type 'Backend*' -->
           <parameter type-id='type-id-192' is-artificial='yes'/>
           <!-- parameter of type 'int' -->
-          <parameter type-id='type-id-10'/>
+          <parameter type-id='type-id-11'/>
           <!-- parameter of type 'typedef REAL' -->
           <parameter type-id='type-id-1'/>
           <!-- parameter of type 'REAL*' -->
-          <parameter type-id='type-id-13'/>
+          <parameter type-id='type-id-16'/>
           <!-- parameter of type 'int' -->
-          <parameter type-id='type-id-10'/>
+          <parameter type-id='type-id-11'/>
           <!-- parameter of type 'typedef REAL' -->
           <parameter type-id='type-id-1'/>
           <!-- parameter of type 'REAL*' -->
-          <parameter type-id='type-id-13'/>
+          <parameter type-id='type-id-16'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
@@ -7936,19 +7936,19 @@
           <!-- implicit parameter of type 'Backend*' -->
           <parameter type-id='type-id-192' is-artificial='yes'/>
           <!-- parameter of type 'int' -->
-          <parameter type-id='type-id-10'/>
+          <parameter type-id='type-id-11'/>
           <!-- parameter of type 'typedef REAL' -->
           <parameter type-id='type-id-1'/>
           <!-- parameter of type 'REAL*' -->
-          <parameter type-id='type-id-13'/>
+          <parameter type-id='type-id-16'/>
           <!-- parameter of type 'int' -->
-          <parameter type-id='type-id-10'/>
+          <parameter type-id='type-id-11'/>
           <!-- parameter of type 'typedef REAL' -->
           <parameter type-id='type-id-1'/>
           <!-- parameter of type 'REAL*' -->
-          <parameter type-id='type-id-13'/>
+          <parameter type-id='type-id-16'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
@@ -7959,7 +7959,7 @@
           <!-- parameter of type 'TrimVertex*' -->
           <parameter type-id='type-id-119'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
@@ -7970,7 +7970,7 @@
           <!-- parameter of type 'TrimVertex*' -->
           <parameter type-id='type-id-119'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
@@ -7981,7 +7981,7 @@
           <!-- parameter of type 'TrimVertex*' -->
           <parameter type-id='type-id-119'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
@@ -7992,7 +7992,7 @@
           <!-- parameter of type 'typedef REAL' -->
           <parameter type-id='type-id-1'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
@@ -8003,7 +8003,7 @@
           <!-- parameter of type 'typedef REAL' -->
           <parameter type-id='type-id-1'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
@@ -8012,7 +8012,7 @@
           <!-- implicit parameter of type 'Backend*' -->
           <parameter type-id='type-id-192' is-artificial='yes'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
@@ -8025,7 +8025,7 @@
           <!-- parameter of type 'typedef REAL' -->
           <parameter type-id='type-id-1'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
@@ -8034,19 +8034,19 @@
           <!-- implicit parameter of type 'Backend*' -->
           <parameter type-id='type-id-192' is-artificial='yes'/>
           <!-- parameter of type 'long int' -->
-          <parameter type-id='type-id-12'/>
+          <parameter type-id='type-id-15'/>
           <!-- parameter of type 'REAL*' -->
-          <parameter type-id='type-id-13'/>
+          <parameter type-id='type-id-16'/>
           <!-- parameter of type 'long int' -->
-          <parameter type-id='type-id-12'/>
+          <parameter type-id='type-id-15'/>
           <!-- parameter of type 'int' -->
-          <parameter type-id='type-id-10'/>
+          <parameter type-id='type-id-11'/>
           <!-- parameter of type 'typedef REAL' -->
           <parameter type-id='type-id-1'/>
           <!-- parameter of type 'typedef REAL' -->
           <parameter type-id='type-id-1'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
@@ -8059,9 +8059,9 @@
           <!-- parameter of type 'typedef REAL' -->
           <parameter type-id='type-id-1'/>
           <!-- parameter of type 'long int' -->
-          <parameter type-id='type-id-12'/>
+          <parameter type-id='type-id-15'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
@@ -8070,11 +8070,11 @@
           <!-- implicit parameter of type 'Backend*' -->
           <parameter type-id='type-id-192' is-artificial='yes'/>
           <!-- parameter of type 'long int' -->
-          <parameter type-id='type-id-12'/>
+          <parameter type-id='type-id-15'/>
           <!-- parameter of type 'long int' -->
-          <parameter type-id='type-id-12'/>
+          <parameter type-id='type-id-15'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
@@ -8085,7 +8085,7 @@
           <!-- parameter of type 'typedef REAL' -->
           <parameter type-id='type-id-1'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
@@ -8094,7 +8094,7 @@
           <!-- implicit parameter of type 'Backend*' -->
           <parameter type-id='type-id-192' is-artificial='yes'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
@@ -8103,7 +8103,7 @@
           <!-- implicit parameter of type 'Backend*' -->
           <parameter type-id='type-id-192' is-artificial='yes'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
@@ -8112,7 +8112,7 @@
           <!-- implicit parameter of type 'Backend*' -->
           <parameter type-id='type-id-192' is-artificial='yes'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
     </class-decl>
@@ -8128,7 +8128,7 @@
           <!-- parameter of type 'Subdivider&' -->
           <parameter type-id='type-id-147'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private' vtable-offset='2'>
@@ -8141,7 +8141,7 @@
           <!-- parameter of type 'char*' -->
           <parameter type-id='type-id-107'/>
           <!-- int -->
-          <return type-id='type-id-10'/>
+          <return type-id='type-id-11'/>
         </function-decl>
       </member-function>
     </class-decl>
@@ -8157,7 +8157,7 @@
           <!-- parameter of type 'Subdivider&' -->
           <parameter type-id='type-id-147'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private' vtable-offset='2'>
@@ -8170,7 +8170,7 @@
           <!-- parameter of type 'char*' -->
           <parameter type-id='type-id-107'/>
           <!-- int -->
-          <return type-id='type-id-10'/>
+          <return type-id='type-id-11'/>
         </function-decl>
       </member-function>
     </class-decl>
@@ -8258,7 +8258,7 @@
           <!-- implicit parameter of type 'GridVertex*' -->
           <parameter type-id='type-id-194' is-artificial='yes'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public' constructor='yes'>
@@ -8267,11 +8267,11 @@
           <!-- implicit parameter of type 'GridVertex*' -->
           <parameter type-id='type-id-194' is-artificial='yes'/>
           <!-- parameter of type 'long int' -->
-          <parameter type-id='type-id-12'/>
+          <parameter type-id='type-id-15'/>
           <!-- parameter of type 'long int' -->
-          <parameter type-id='type-id-12'/>
+          <parameter type-id='type-id-15'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
@@ -8280,11 +8280,11 @@
           <!-- implicit parameter of type 'GridVertex*' -->
           <parameter type-id='type-id-194' is-artificial='yes'/>
           <!-- parameter of type 'long int' -->
-          <parameter type-id='type-id-12'/>
+          <parameter type-id='type-id-15'/>
           <!-- parameter of type 'long int' -->
-          <parameter type-id='type-id-12'/>
+          <parameter type-id='type-id-15'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
@@ -8293,7 +8293,7 @@
           <!-- implicit parameter of type 'GridVertex*' -->
           <parameter type-id='type-id-194' is-artificial='yes'/>
           <!-- long int -->
-          <return type-id='type-id-12'/>
+          <return type-id='type-id-15'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
@@ -8302,7 +8302,7 @@
           <!-- implicit parameter of type 'GridVertex*' -->
           <parameter type-id='type-id-194' is-artificial='yes'/>
           <!-- long int -->
-          <return type-id='type-id-12'/>
+          <return type-id='type-id-15'/>
         </function-decl>
       </member-function>
     </class-decl>
@@ -8332,7 +8332,7 @@
           <!-- implicit parameter of type 'GridTrimVertex*' -->
           <parameter type-id='type-id-193' is-artificial='yes'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -8341,11 +8341,11 @@
           <!-- implicit parameter of type 'GridTrimVertex*' -->
           <parameter type-id='type-id-193' is-artificial='yes'/>
           <!-- parameter of type 'long int' -->
-          <parameter type-id='type-id-12'/>
+          <parameter type-id='type-id-15'/>
           <!-- parameter of type 'long int' -->
-          <parameter type-id='type-id-12'/>
+          <parameter type-id='type-id-15'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -8358,7 +8358,7 @@
           <!-- parameter of type 'typedef REAL' -->
           <parameter type-id='type-id-1'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -8369,7 +8369,7 @@
           <!-- parameter of type 'TrimVertex*' -->
           <parameter type-id='type-id-119'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -8378,7 +8378,7 @@
           <!-- implicit parameter of type 'GridTrimVertex*' -->
           <parameter type-id='type-id-193' is-artificial='yes'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -8387,7 +8387,7 @@
           <!-- implicit parameter of type 'GridTrimVertex*' -->
           <parameter type-id='type-id-193' is-artificial='yes'/>
           <!-- int -->
-          <return type-id='type-id-10'/>
+          <return type-id='type-id-11'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -8396,7 +8396,7 @@
           <!-- implicit parameter of type 'GridTrimVertex*' -->
           <parameter type-id='type-id-193' is-artificial='yes'/>
           <!-- int -->
-          <return type-id='type-id-10'/>
+          <return type-id='type-id-11'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -8405,7 +8405,7 @@
           <!-- implicit parameter of type 'GridTrimVertex*' -->
           <parameter type-id='type-id-193' is-artificial='yes'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
     </class-decl>
@@ -8414,7 +8414,7 @@
     <!-- BasicCurveEvaluator& -->
     <qualified-type-def type-id='type-id-80' id='type-id-189'/>
     <!-- BasicCurveEvaluator& -->
-    <reference-type-def kind='lvalue' type-id='type-id-7' size-in-bits='64' id='type-id-80'/>
+    <reference-type-def kind='lvalue' type-id='type-id-13' size-in-bits='64' id='type-id-80'/>
     <!-- BasicSurfaceEvaluator& -->
     <qualified-type-def type-id='type-id-81' id='type-id-190'/>
     <!-- BasicSurfaceEvaluator& -->
@@ -8449,11 +8449,11 @@
           <!-- parameter of type 'typedef Arc_ptr' -->
           <parameter type-id='type-id-113'/>
           <!-- parameter of type 'long int' -->
-          <parameter type-id='type-id-12'/>
+          <parameter type-id='type-id-15'/>
           <!-- parameter of type 'long int' -->
-          <parameter type-id='type-id-12'/>
+          <parameter type-id='type-id-15'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -8480,7 +8480,7 @@
           <!-- implicit parameter of type 'Jarcloc*' -->
           <parameter type-id='type-id-205' is-artificial='yes'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
     </class-decl>
@@ -8492,15 +8492,15 @@
       </data-member>
       <data-member access='private' layout-offset-in-bits='64'>
         <!-- long int Trimline::numverts -->
-        <var-decl name='numverts' type-id='type-id-12' visibility='default' filepath='libnurbs/internals/trimline.h' line='49' column='1'/>
+        <var-decl name='numverts' type-id='type-id-15' visibility='default' filepath='libnurbs/internals/trimline.h' line='49' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='128'>
         <!-- long int Trimline::i -->
-        <var-decl name='i' type-id='type-id-12' visibility='default' filepath='libnurbs/internals/trimline.h' line='50' column='1'/>
+        <var-decl name='i' type-id='type-id-15' visibility='default' filepath='libnurbs/internals/trimline.h' line='50' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='192'>
         <!-- long int Trimline::size -->
-        <var-decl name='size' type-id='type-id-12' visibility='default' filepath='libnurbs/internals/trimline.h' line='51' column='1'/>
+        <var-decl name='size' type-id='type-id-15' visibility='default' filepath='libnurbs/internals/trimline.h' line='51' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='256'>
         <!-- Jarcloc Trimline::jarcl -->
@@ -8528,7 +8528,7 @@
           <!-- implicit parameter of type 'Trimline*' -->
           <parameter type-id='type-id-207' is-artificial='yes'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -8537,9 +8537,9 @@
           <!-- implicit parameter of type 'Trimline*' -->
           <parameter type-id='type-id-207' is-artificial='yes'/>
           <!-- parameter of type 'long int' -->
-          <parameter type-id='type-id-12'/>
+          <parameter type-id='type-id-15'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -8548,7 +8548,7 @@
           <!-- implicit parameter of type 'Trimline*' -->
           <parameter type-id='type-id-207' is-artificial='yes'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -8559,7 +8559,7 @@
           <!-- parameter of type 'TrimVertex*' -->
           <parameter type-id='type-id-119'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private' static='yes'>
@@ -8574,7 +8574,7 @@
           <!-- parameter of type 'typedef REAL' -->
           <parameter type-id='type-id-1'/>
           <!-- long int -->
-          <return type-id='type-id-12'/>
+          <return type-id='type-id-15'/>
         </function-decl>
       </member-function>
       <member-function access='private' constructor='yes'>
@@ -8583,7 +8583,7 @@
           <!-- implicit parameter of type 'Trimline*' -->
           <parameter type-id='type-id-207' is-artificial='yes'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private' destructor='yes'>
@@ -8592,9 +8592,9 @@
           <!-- implicit parameter of type 'Trimline*' -->
           <parameter type-id='type-id-207' is-artificial='yes'/>
           <!-- artificial parameter of type 'int' -->
-          <parameter type-id='type-id-10' is-artificial='yes'/>
+          <parameter type-id='type-id-11' is-artificial='yes'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -8605,7 +8605,7 @@
           <!-- parameter of type 'TrimVertex*' -->
           <parameter type-id='type-id-119'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -8614,13 +8614,13 @@
           <!-- implicit parameter of type 'Trimline*' -->
           <parameter type-id='type-id-207' is-artificial='yes'/>
           <!-- parameter of type 'long int' -->
-          <parameter type-id='type-id-12'/>
+          <parameter type-id='type-id-15'/>
           <!-- parameter of type 'typedef Arc_ptr' -->
           <parameter type-id='type-id-113'/>
           <!-- parameter of type 'long int' -->
-          <parameter type-id='type-id-12'/>
+          <parameter type-id='type-id-15'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -8629,7 +8629,7 @@
           <!-- implicit parameter of type 'Trimline*' -->
           <parameter type-id='type-id-207' is-artificial='yes'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -8638,7 +8638,7 @@
           <!-- implicit parameter of type 'Trimline*' -->
           <parameter type-id='type-id-207' is-artificial='yes'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -8651,7 +8651,7 @@
           <!-- parameter of type 'Backend&' -->
           <parameter type-id='type-id-167'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -8664,7 +8664,7 @@
           <!-- parameter of type 'Backend&' -->
           <parameter type-id='type-id-167'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -8675,7 +8675,7 @@
           <!-- parameter of type 'typedef Arc_ptr' -->
           <parameter type-id='type-id-113'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -8686,7 +8686,7 @@
           <!-- parameter of type 'typedef Arc_ptr' -->
           <parameter type-id='type-id-113'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -8730,15 +8730,15 @@
     <class-decl name='Uarray' size-in-bits='192' visibility='default' filepath='libnurbs/internals/uarray.h' line='44' column='1' id='type-id-208'>
       <data-member access='private' layout-offset-in-bits='0'>
         <!-- long int Uarray::size -->
-        <var-decl name='size' type-id='type-id-12' visibility='default' filepath='libnurbs/internals/uarray.h' line='46' column='1'/>
+        <var-decl name='size' type-id='type-id-15' visibility='default' filepath='libnurbs/internals/uarray.h' line='46' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='64'>
         <!-- long int Uarray::ulines -->
-        <var-decl name='ulines' type-id='type-id-12' visibility='default' filepath='libnurbs/internals/uarray.h' line='47' column='1'/>
+        <var-decl name='ulines' type-id='type-id-15' visibility='default' filepath='libnurbs/internals/uarray.h' line='47' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='128'>
         <!-- REAL* Uarray::uarray -->
-        <var-decl name='uarray' type-id='type-id-13' visibility='default' filepath='libnurbs/internals/uarray.h' line='52' column='1'/>
+        <var-decl name='uarray' type-id='type-id-16' visibility='default' filepath='libnurbs/internals/uarray.h' line='52' column='1'/>
       </data-member>
       <member-function access='private' constructor='yes'>
         <!-- Uarray::Uarray() -->
@@ -8746,7 +8746,7 @@
           <!-- implicit parameter of type 'Uarray*' -->
           <parameter type-id='type-id-209' is-artificial='yes'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private' destructor='yes'>
@@ -8755,9 +8755,9 @@
           <!-- implicit parameter of type 'Uarray*' -->
           <parameter type-id='type-id-209' is-artificial='yes'/>
           <!-- artificial parameter of type 'int' -->
-          <parameter type-id='type-id-10' is-artificial='yes'/>
+          <parameter type-id='type-id-11' is-artificial='yes'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -8772,7 +8772,7 @@
           <!-- parameter of type 'typedef Arc_ptr' -->
           <parameter type-id='type-id-113'/>
           <!-- long int -->
-          <return type-id='type-id-12'/>
+          <return type-id='type-id-15'/>
         </function-decl>
       </member-function>
     </class-decl>
@@ -8808,7 +8808,7 @@
           <!-- implicit parameter of type 'TrimRegion*' -->
           <parameter type-id='type-id-212' is-artificial='yes'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -8819,7 +8819,7 @@
           <!-- parameter of type 'typedef REAL' -->
           <parameter type-id='type-id-1'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -8834,7 +8834,7 @@
           <!-- parameter of type 'typedef REAL' -->
           <parameter type-id='type-id-1'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -8845,7 +8845,7 @@
           <!-- parameter of type 'typedef REAL' -->
           <parameter type-id='type-id-1'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -8854,11 +8854,11 @@
           <!-- implicit parameter of type 'TrimRegion*' -->
           <parameter type-id='type-id-212' is-artificial='yes'/>
           <!-- parameter of type 'long int' -->
-          <parameter type-id='type-id-12'/>
+          <parameter type-id='type-id-15'/>
           <!-- parameter of type 'typedef Arc_ptr' -->
           <parameter type-id='type-id-113'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -8869,7 +8869,7 @@
           <!-- parameter of type 'typedef Arc_ptr' -->
           <parameter type-id='type-id-113'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -8880,7 +8880,7 @@
           <!-- parameter of type 'Backend&' -->
           <parameter type-id='type-id-167'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -8893,7 +8893,7 @@
           <!-- parameter of type 'TrimVertex*' -->
           <parameter type-id='type-id-119'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -8902,7 +8902,7 @@
           <!-- implicit parameter of type 'TrimRegion*' -->
           <parameter type-id='type-id-212' is-artificial='yes'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -8911,7 +8911,7 @@
           <!-- implicit parameter of type 'TrimRegion*' -->
           <parameter type-id='type-id-212' is-artificial='yes'/>
           <!-- int -->
-          <return type-id='type-id-10'/>
+          <return type-id='type-id-11'/>
         </function-decl>
       </member-function>
     </class-decl>
@@ -8919,7 +8919,7 @@
     <class-decl name='Gridline' size-in-bits='320' is-struct='yes' visibility='default' filepath='libnurbs/internals/gridline.h' line='39' column='1' id='type-id-211'>
       <data-member access='public' layout-offset-in-bits='0'>
         <!-- long int Gridline::v -->
-        <var-decl name='v' type-id='type-id-12' visibility='default' filepath='libnurbs/internals/gridline.h' line='40' column='1'/>
+        <var-decl name='v' type-id='type-id-15' visibility='default' filepath='libnurbs/internals/gridline.h' line='40' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
         <!-- REAL Gridline::vval -->
@@ -8927,15 +8927,15 @@
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
         <!-- long int Gridline::vindex -->
-        <var-decl name='vindex' type-id='type-id-12' visibility='default' filepath='libnurbs/internals/gridline.h' line='42' column='1'/>
+        <var-decl name='vindex' type-id='type-id-15' visibility='default' filepath='libnurbs/internals/gridline.h' line='42' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='192'>
         <!-- long int Gridline::ustart -->
-        <var-decl name='ustart' type-id='type-id-12' visibility='default' filepath='libnurbs/internals/gridline.h' line='43' column='1'/>
+        <var-decl name='ustart' type-id='type-id-15' visibility='default' filepath='libnurbs/internals/gridline.h' line='43' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='256'>
         <!-- long int Gridline::uend -->
-        <var-decl name='uend' type-id='type-id-12' visibility='default' filepath='libnurbs/internals/gridline.h' line='44' column='1'/>
+        <var-decl name='uend' type-id='type-id-15' visibility='default' filepath='libnurbs/internals/gridline.h' line='44' column='1'/>
       </data-member>
     </class-decl>
     <!-- class CoveAndTiler -->
@@ -8956,13 +8956,13 @@
           <!-- implicit parameter of type 'CoveAndTiler*' -->
           <parameter type-id='type-id-213' is-artificial='yes'/>
           <!-- artificial parameter of type 'int' -->
-          <parameter type-id='type-id-10' is-artificial='yes'/>
+          <parameter type-id='type-id-11' is-artificial='yes'/>
           <!-- artificial parameter of type 'void**' -->
           <parameter type-id='type-id-185' is-artificial='yes'/>
           <!-- parameter of type 'Backend&' -->
           <parameter type-id='type-id-167'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private' destructor='yes'>
@@ -8971,11 +8971,11 @@
           <!-- implicit parameter of type 'CoveAndTiler*' -->
           <parameter type-id='type-id-213' is-artificial='yes'/>
           <!-- artificial parameter of type 'int' -->
-          <parameter type-id='type-id-10' is-artificial='yes'/>
+          <parameter type-id='type-id-11' is-artificial='yes'/>
           <!-- artificial parameter of type 'void**' -->
           <parameter type-id='type-id-185' is-artificial='yes'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -8984,7 +8984,7 @@
           <!-- implicit parameter of type 'CoveAndTiler*' -->
           <parameter type-id='type-id-213' is-artificial='yes'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -8993,13 +8993,13 @@
           <!-- implicit parameter of type 'CoveAndTiler*' -->
           <parameter type-id='type-id-213' is-artificial='yes'/>
           <!-- parameter of type 'long int' -->
-          <parameter type-id='type-id-12'/>
+          <parameter type-id='type-id-15'/>
           <!-- parameter of type 'long int' -->
-          <parameter type-id='type-id-12'/>
+          <parameter type-id='type-id-15'/>
           <!-- parameter of type 'long int' -->
-          <parameter type-id='type-id-12'/>
+          <parameter type-id='type-id-15'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -9008,7 +9008,7 @@
           <!-- implicit parameter of type 'CoveAndTiler*' -->
           <parameter type-id='type-id-213' is-artificial='yes'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -9017,7 +9017,7 @@
           <!-- implicit parameter of type 'CoveAndTiler*' -->
           <parameter type-id='type-id-213' is-artificial='yes'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -9026,7 +9026,7 @@
           <!-- implicit parameter of type 'CoveAndTiler*' -->
           <parameter type-id='type-id-213' is-artificial='yes'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -9035,7 +9035,7 @@
           <!-- implicit parameter of type 'CoveAndTiler*' -->
           <parameter type-id='type-id-213' is-artificial='yes'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -9046,7 +9046,7 @@
           <!-- parameter of type 'TrimVertex*' -->
           <parameter type-id='type-id-119'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -9057,7 +9057,7 @@
           <!-- parameter of type 'TrimVertex*' -->
           <parameter type-id='type-id-119'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -9068,7 +9068,7 @@
           <!-- parameter of type 'TrimVertex*' -->
           <parameter type-id='type-id-119'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -9079,7 +9079,7 @@
           <!-- parameter of type 'TrimVertex*' -->
           <parameter type-id='type-id-119'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -9088,7 +9088,7 @@
           <!-- implicit parameter of type 'CoveAndTiler*' -->
           <parameter type-id='type-id-213' is-artificial='yes'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -9097,7 +9097,7 @@
           <!-- implicit parameter of type 'CoveAndTiler*' -->
           <parameter type-id='type-id-213' is-artificial='yes'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -9106,7 +9106,7 @@
           <!-- implicit parameter of type 'CoveAndTiler*' -->
           <parameter type-id='type-id-213' is-artificial='yes'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -9115,7 +9115,7 @@
           <!-- implicit parameter of type 'CoveAndTiler*' -->
           <parameter type-id='type-id-213' is-artificial='yes'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -9126,7 +9126,7 @@
           <!-- parameter of type 'GridTrimVertex&' -->
           <parameter type-id='type-id-214'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -9137,7 +9137,7 @@
           <!-- parameter of type 'GridVertex&' -->
           <parameter type-id='type-id-215'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -9148,7 +9148,7 @@
           <!-- parameter of type 'TrimVertex*' -->
           <parameter type-id='type-id-119'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
     </class-decl>
@@ -9191,12 +9191,12 @@
       <subrange length='5' type-id='type-id-3' id='type-id-220'/>
     </array-type-def>
     <!-- float[4] -->
-    <array-type-def dimensions='1' type-id='type-id-30' size-in-bits='128' id='type-id-222'>
+    <array-type-def dimensions='1' type-id='type-id-33' size-in-bits='128' id='type-id-222'>
       <!-- <anonymous range>[4] -->
       <subrange length='4' type-id='type-id-3' id='type-id-62'/>
     </array-type-def>
     <!-- int[2] -->
-    <array-type-def dimensions='1' type-id='type-id-10' size-in-bits='64' id='type-id-223'>
+    <array-type-def dimensions='1' type-id='type-id-11' size-in-bits='64' id='type-id-223'>
       <!-- <anonymous range>[2] -->
       <subrange length='2' type-id='type-id-3' id='type-id-88'/>
     </array-type-def>
@@ -9212,19 +9212,19 @@
       </data-member>
       <data-member access='private' layout-offset-in-bits='128'>
         <!-- int Curve::stride -->
-        <var-decl name='stride' type-id='type-id-10' visibility='default' filepath='libnurbs/internals/curve.h' line='54' column='1'/>
+        <var-decl name='stride' type-id='type-id-11' visibility='default' filepath='libnurbs/internals/curve.h' line='54' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='160'>
         <!-- int Curve::order -->
-        <var-decl name='order' type-id='type-id-10' visibility='default' filepath='libnurbs/internals/curve.h' line='55' column='1'/>
+        <var-decl name='order' type-id='type-id-11' visibility='default' filepath='libnurbs/internals/curve.h' line='55' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='192'>
         <!-- int Curve::cullval -->
-        <var-decl name='cullval' type-id='type-id-10' visibility='default' filepath='libnurbs/internals/curve.h' line='56' column='1'/>
+        <var-decl name='cullval' type-id='type-id-11' visibility='default' filepath='libnurbs/internals/curve.h' line='56' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='224'>
         <!-- int Curve::needsSampling -->
-        <var-decl name='needsSampling' type-id='type-id-10' visibility='default' filepath='libnurbs/internals/curve.h' line='57' column='1'/>
+        <var-decl name='needsSampling' type-id='type-id-11' visibility='default' filepath='libnurbs/internals/curve.h' line='57' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='256'>
         <!-- REAL Curve::cpts[120] -->
@@ -9260,7 +9260,7 @@
           <!-- parameter of type 'Curve*' -->
           <parameter type-id='type-id-136'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private' constructor='yes'>
@@ -9275,7 +9275,7 @@
           <!-- parameter of type 'Curve*' -->
           <parameter type-id='type-id-136'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -9284,7 +9284,7 @@
           <!-- implicit parameter of type 'Curve*' -->
           <parameter type-id='type-id-136' is-artificial='yes'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -9295,7 +9295,7 @@
           <!-- parameter of type 'typedef REAL' -->
           <parameter type-id='type-id-1'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -9304,7 +9304,7 @@
           <!-- implicit parameter of type 'Curve*' -->
           <parameter type-id='type-id-136' is-artificial='yes'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -9313,7 +9313,7 @@
           <!-- implicit parameter of type 'Curve*' -->
           <parameter type-id='type-id-136' is-artificial='yes'/>
           <!-- int -->
-          <return type-id='type-id-10'/>
+          <return type-id='type-id-11'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -9322,7 +9322,7 @@
           <!-- implicit parameter of type 'Curve*' -->
           <parameter type-id='type-id-136' is-artificial='yes'/>
           <!-- int -->
-          <return type-id='type-id-10'/>
+          <return type-id='type-id-11'/>
         </function-decl>
       </member-function>
     </class-decl>
@@ -9370,27 +9370,27 @@
       </data-member>
       <data-member access='private' layout-offset-in-bits='448'>
         <!-- long int Mapdesc::type -->
-        <var-decl name='type' type-id='type-id-12' visibility='default' filepath='libnurbs/internals/mapdesc.h' line='115' column='1'/>
+        <var-decl name='type' type-id='type-id-15' visibility='default' filepath='libnurbs/internals/mapdesc.h' line='115' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='512'>
         <!-- int Mapdesc::isrational -->
-        <var-decl name='isrational' type-id='type-id-10' visibility='default' filepath='libnurbs/internals/mapdesc.h' line='116' column='1'/>
+        <var-decl name='isrational' type-id='type-id-11' visibility='default' filepath='libnurbs/internals/mapdesc.h' line='116' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='544'>
         <!-- int Mapdesc::ncoords -->
-        <var-decl name='ncoords' type-id='type-id-10' visibility='default' filepath='libnurbs/internals/mapdesc.h' line='117' column='1'/>
+        <var-decl name='ncoords' type-id='type-id-11' visibility='default' filepath='libnurbs/internals/mapdesc.h' line='117' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='576'>
         <!-- int Mapdesc::hcoords -->
-        <var-decl name='hcoords' type-id='type-id-10' visibility='default' filepath='libnurbs/internals/mapdesc.h' line='118' column='1'/>
+        <var-decl name='hcoords' type-id='type-id-11' visibility='default' filepath='libnurbs/internals/mapdesc.h' line='118' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='608'>
         <!-- int Mapdesc::inhcoords -->
-        <var-decl name='inhcoords' type-id='type-id-10' visibility='default' filepath='libnurbs/internals/mapdesc.h' line='119' column='1'/>
+        <var-decl name='inhcoords' type-id='type-id-11' visibility='default' filepath='libnurbs/internals/mapdesc.h' line='119' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='640'>
         <!-- int Mapdesc::mask -->
-        <var-decl name='mask' type-id='type-id-10' visibility='default' filepath='libnurbs/internals/mapdesc.h' line='120' column='1'/>
+        <var-decl name='mask' type-id='type-id-11' visibility='default' filepath='libnurbs/internals/mapdesc.h' line='120' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='672'>
         <!-- Maxmatrix Mapdesc::bmat -->
@@ -9438,15 +9438,15 @@
           <!-- implicit parameter of type 'Mapdesc*' -->
           <parameter type-id='type-id-163' is-artificial='yes'/>
           <!-- parameter of type 'long int' -->
-          <parameter type-id='type-id-12'/>
+          <parameter type-id='type-id-15'/>
           <!-- parameter of type 'int' -->
-          <parameter type-id='type-id-10'/>
+          <parameter type-id='type-id-11'/>
           <!-- parameter of type 'int' -->
-          <parameter type-id='type-id-10'/>
+          <parameter type-id='type-id-11'/>
           <!-- parameter of type 'Backend&' -->
           <parameter type-id='type-id-167'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
@@ -9455,9 +9455,9 @@
           <!-- implicit parameter of type 'Mapdesc*' -->
           <parameter type-id='type-id-163' is-artificial='yes'/>
           <!-- parameter of type 'long int' -->
-          <parameter type-id='type-id-12'/>
+          <parameter type-id='type-id-15'/>
           <!-- int -->
-          <return type-id='type-id-10'/>
+          <return type-id='type-id-11'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
@@ -9466,7 +9466,7 @@
           <!-- implicit parameter of type 'Mapdesc*' -->
           <parameter type-id='type-id-163' is-artificial='yes'/>
           <!-- parameter of type 'long int' -->
-          <parameter type-id='type-id-12'/>
+          <parameter type-id='type-id-15'/>
           <!-- typedef REAL -->
           <return type-id='type-id-1'/>
         </function-decl>
@@ -9477,11 +9477,11 @@
           <!-- implicit parameter of type 'Mapdesc*' -->
           <parameter type-id='type-id-163' is-artificial='yes'/>
           <!-- parameter of type 'long int' -->
-          <parameter type-id='type-id-12'/>
+          <parameter type-id='type-id-15'/>
           <!-- parameter of type 'typedef REAL' -->
           <parameter type-id='type-id-1'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
@@ -9490,7 +9490,7 @@
           <!-- implicit parameter of type 'Mapdesc*' -->
           <parameter type-id='type-id-163' is-artificial='yes'/>
           <!-- int -->
-          <return type-id='type-id-10'/>
+          <return type-id='type-id-11'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
@@ -9499,7 +9499,7 @@
           <!-- implicit parameter of type 'Mapdesc*' -->
           <parameter type-id='type-id-163' is-artificial='yes'/>
           <!-- int -->
-          <return type-id='type-id-10'/>
+          <return type-id='type-id-11'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
@@ -9508,7 +9508,7 @@
           <!-- implicit parameter of type 'Mapdesc*' -->
           <parameter type-id='type-id-163' is-artificial='yes'/>
           <!-- int -->
-          <return type-id='type-id-10'/>
+          <return type-id='type-id-11'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
@@ -9517,7 +9517,7 @@
           <!-- implicit parameter of type 'Mapdesc*' -->
           <parameter type-id='type-id-163' is-artificial='yes'/>
           <!-- int -->
-          <return type-id='type-id-10'/>
+          <return type-id='type-id-11'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
@@ -9526,7 +9526,7 @@
           <!-- implicit parameter of type 'Mapdesc*' -->
           <parameter type-id='type-id-163' is-artificial='yes'/>
           <!-- int -->
-          <return type-id='type-id-10'/>
+          <return type-id='type-id-11'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
@@ -9535,7 +9535,7 @@
           <!-- implicit parameter of type 'Mapdesc*' -->
           <parameter type-id='type-id-163' is-artificial='yes'/>
           <!-- int -->
-          <return type-id='type-id-10'/>
+          <return type-id='type-id-11'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
@@ -9544,7 +9544,7 @@
           <!-- implicit parameter of type 'Mapdesc*' -->
           <parameter type-id='type-id-163' is-artificial='yes'/>
           <!-- int -->
-          <return type-id='type-id-10'/>
+          <return type-id='type-id-11'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
@@ -9553,7 +9553,7 @@
           <!-- implicit parameter of type 'Mapdesc*' -->
           <parameter type-id='type-id-163' is-artificial='yes'/>
           <!-- int -->
-          <return type-id='type-id-10'/>
+          <return type-id='type-id-11'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
@@ -9562,7 +9562,7 @@
           <!-- implicit parameter of type 'Mapdesc*' -->
           <parameter type-id='type-id-163' is-artificial='yes'/>
           <!-- int -->
-          <return type-id='type-id-10'/>
+          <return type-id='type-id-11'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
@@ -9571,7 +9571,7 @@
           <!-- implicit parameter of type 'Mapdesc*' -->
           <parameter type-id='type-id-163' is-artificial='yes'/>
           <!-- int -->
-          <return type-id='type-id-10'/>
+          <return type-id='type-id-11'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
@@ -9580,7 +9580,7 @@
           <!-- implicit parameter of type 'Mapdesc*' -->
           <parameter type-id='type-id-163' is-artificial='yes'/>
           <!-- int -->
-          <return type-id='type-id-10'/>
+          <return type-id='type-id-11'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
@@ -9589,7 +9589,7 @@
           <!-- implicit parameter of type 'Mapdesc*' -->
           <parameter type-id='type-id-163' is-artificial='yes'/>
           <!-- long int -->
-          <return type-id='type-id-12'/>
+          <return type-id='type-id-15'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
@@ -9598,17 +9598,17 @@
           <!-- implicit parameter of type 'Mapdesc*' -->
           <parameter type-id='type-id-163' is-artificial='yes'/>
           <!-- parameter of type 'REAL*' -->
-          <parameter type-id='type-id-13'/>
+          <parameter type-id='type-id-16'/>
           <!-- parameter of type 'REAL*' -->
-          <parameter type-id='type-id-13'/>
+          <parameter type-id='type-id-16'/>
           <!-- parameter of type 'typedef REAL' -->
           <parameter type-id='type-id-1'/>
           <!-- parameter of type 'int' -->
-          <parameter type-id='type-id-10'/>
+          <parameter type-id='type-id-11'/>
           <!-- parameter of type 'int' -->
-          <parameter type-id='type-id-10'/>
+          <parameter type-id='type-id-11'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
@@ -9617,13 +9617,13 @@
           <!-- implicit parameter of type 'Mapdesc*' -->
           <parameter type-id='type-id-163' is-artificial='yes'/>
           <!-- parameter of type 'REAL*' -->
-          <parameter type-id='type-id-13'/>
+          <parameter type-id='type-id-16'/>
           <!-- parameter of type 'int' -->
-          <parameter type-id='type-id-10'/>
+          <parameter type-id='type-id-11'/>
           <!-- parameter of type 'int' -->
-          <parameter type-id='type-id-10'/>
+          <parameter type-id='type-id-11'/>
           <!-- int -->
-          <return type-id='type-id-10'/>
+          <return type-id='type-id-11'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
@@ -9632,17 +9632,17 @@
           <!-- implicit parameter of type 'Mapdesc*' -->
           <parameter type-id='type-id-163' is-artificial='yes'/>
           <!-- parameter of type 'REAL*' -->
-          <parameter type-id='type-id-13'/>
+          <parameter type-id='type-id-16'/>
           <!-- parameter of type 'int' -->
-          <parameter type-id='type-id-10'/>
+          <parameter type-id='type-id-11'/>
           <!-- parameter of type 'int' -->
-          <parameter type-id='type-id-10'/>
+          <parameter type-id='type-id-11'/>
           <!-- parameter of type 'REAL*' -->
-          <parameter type-id='type-id-13'/>
+          <parameter type-id='type-id-16'/>
           <!-- parameter of type 'int' -->
-          <parameter type-id='type-id-10'/>
+          <parameter type-id='type-id-11'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
@@ -9651,17 +9651,17 @@
           <!-- implicit parameter of type 'Mapdesc*' -->
           <parameter type-id='type-id-163' is-artificial='yes'/>
           <!-- parameter of type 'REAL*' -->
-          <parameter type-id='type-id-13'/>
+          <parameter type-id='type-id-16'/>
           <!-- parameter of type 'int' -->
-          <parameter type-id='type-id-10'/>
+          <parameter type-id='type-id-11'/>
           <!-- parameter of type 'int' -->
-          <parameter type-id='type-id-10'/>
+          <parameter type-id='type-id-11'/>
           <!-- parameter of type 'REAL*' -->
-          <parameter type-id='type-id-13'/>
+          <parameter type-id='type-id-16'/>
           <!-- parameter of type 'int' -->
-          <parameter type-id='type-id-10'/>
+          <parameter type-id='type-id-11'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
@@ -9670,17 +9670,17 @@
           <!-- implicit parameter of type 'Mapdesc*' -->
           <parameter type-id='type-id-163' is-artificial='yes'/>
           <!-- parameter of type 'REAL*' -->
-          <parameter type-id='type-id-13'/>
+          <parameter type-id='type-id-16'/>
           <!-- parameter of type 'int' -->
-          <parameter type-id='type-id-10'/>
+          <parameter type-id='type-id-11'/>
           <!-- parameter of type 'int' -->
-          <parameter type-id='type-id-10'/>
+          <parameter type-id='type-id-11'/>
           <!-- parameter of type 'REAL*' -->
-          <parameter type-id='type-id-13'/>
+          <parameter type-id='type-id-16'/>
           <!-- parameter of type 'int' -->
-          <parameter type-id='type-id-10'/>
+          <parameter type-id='type-id-11'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
@@ -9691,17 +9691,17 @@
           <!-- parameter of type 'REAL[5]*' -->
           <parameter type-id='type-id-228'/>
           <!-- parameter of type 'REAL*' -->
-          <parameter type-id='type-id-13'/>
+          <parameter type-id='type-id-16'/>
           <!-- parameter of type 'int' -->
-          <parameter type-id='type-id-10'/>
+          <parameter type-id='type-id-11'/>
           <!-- parameter of type 'int' -->
-          <parameter type-id='type-id-10'/>
+          <parameter type-id='type-id-11'/>
           <!-- parameter of type 'REAL*' -->
-          <parameter type-id='type-id-13'/>
+          <parameter type-id='type-id-16'/>
           <!-- parameter of type 'int' -->
-          <parameter type-id='type-id-10'/>
+          <parameter type-id='type-id-11'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
@@ -9710,13 +9710,13 @@
           <!-- implicit parameter of type 'Mapdesc*' -->
           <parameter type-id='type-id-163' is-artificial='yes'/>
           <!-- parameter of type 'REAL*' -->
-          <parameter type-id='type-id-13'/>
+          <parameter type-id='type-id-16'/>
           <!-- parameter of type 'int' -->
-          <parameter type-id='type-id-10'/>
+          <parameter type-id='type-id-11'/>
           <!-- parameter of type 'int' -->
-          <parameter type-id='type-id-10'/>
+          <parameter type-id='type-id-11'/>
           <!-- parameter of type 'int' -->
-          <parameter type-id='type-id-10'/>
+          <parameter type-id='type-id-11'/>
           <!-- parameter of type 'typedef REAL' -->
           <parameter type-id='type-id-1'/>
           <!-- typedef REAL -->
@@ -9729,17 +9729,17 @@
           <!-- implicit parameter of type 'Mapdesc*' -->
           <parameter type-id='type-id-163' is-artificial='yes'/>
           <!-- parameter of type 'REAL*' -->
-          <parameter type-id='type-id-13'/>
+          <parameter type-id='type-id-16'/>
           <!-- parameter of type 'int' -->
-          <parameter type-id='type-id-10'/>
+          <parameter type-id='type-id-11'/>
           <!-- parameter of type 'REAL*' -->
-          <parameter type-id='type-id-13'/>
+          <parameter type-id='type-id-16'/>
           <!-- parameter of type 'int' -->
-          <parameter type-id='type-id-10'/>
+          <parameter type-id='type-id-11'/>
           <!-- parameter of type 'int' -->
-          <parameter type-id='type-id-10'/>
+          <parameter type-id='type-id-11'/>
           <!-- int -->
-          <return type-id='type-id-10'/>
+          <return type-id='type-id-11'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
@@ -9748,11 +9748,11 @@
           <!-- implicit parameter of type 'Mapdesc*' -->
           <parameter type-id='type-id-163' is-artificial='yes'/>
           <!-- parameter of type 'REAL*' -->
-          <parameter type-id='type-id-13'/>
+          <parameter type-id='type-id-16'/>
           <!-- parameter of type 'int' -->
-          <parameter type-id='type-id-10'/>
+          <parameter type-id='type-id-11'/>
           <!-- parameter of type 'int' -->
-          <parameter type-id='type-id-10'/>
+          <parameter type-id='type-id-11'/>
           <!-- typedef REAL -->
           <return type-id='type-id-1'/>
         </function-decl>
@@ -9763,11 +9763,11 @@
           <!-- implicit parameter of type 'Mapdesc*' -->
           <parameter type-id='type-id-163' is-artificial='yes'/>
           <!-- parameter of type 'REAL*' -->
-          <parameter type-id='type-id-13'/>
+          <parameter type-id='type-id-16'/>
           <!-- parameter of type 'int' -->
-          <parameter type-id='type-id-10'/>
+          <parameter type-id='type-id-11'/>
           <!-- parameter of type 'int' -->
-          <parameter type-id='type-id-10'/>
+          <parameter type-id='type-id-11'/>
           <!-- typedef REAL -->
           <return type-id='type-id-1'/>
         </function-decl>
@@ -9778,21 +9778,21 @@
           <!-- implicit parameter of type 'Mapdesc*' -->
           <parameter type-id='type-id-163' is-artificial='yes'/>
           <!-- parameter of type 'REAL*' -->
-          <parameter type-id='type-id-13'/>
+          <parameter type-id='type-id-16'/>
           <!-- parameter of type 'REAL*' -->
-          <parameter type-id='type-id-13'/>
+          <parameter type-id='type-id-16'/>
           <!-- parameter of type 'typedef REAL' -->
           <parameter type-id='type-id-1'/>
           <!-- parameter of type 'int' -->
-          <parameter type-id='type-id-10'/>
+          <parameter type-id='type-id-11'/>
           <!-- parameter of type 'int' -->
-          <parameter type-id='type-id-10'/>
+          <parameter type-id='type-id-11'/>
           <!-- parameter of type 'int' -->
-          <parameter type-id='type-id-10'/>
+          <parameter type-id='type-id-11'/>
           <!-- parameter of type 'int' -->
-          <parameter type-id='type-id-10'/>
+          <parameter type-id='type-id-11'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
@@ -9801,17 +9801,17 @@
           <!-- implicit parameter of type 'Mapdesc*' -->
           <parameter type-id='type-id-163' is-artificial='yes'/>
           <!-- parameter of type 'REAL*' -->
-          <parameter type-id='type-id-13'/>
+          <parameter type-id='type-id-16'/>
           <!-- parameter of type 'int' -->
-          <parameter type-id='type-id-10'/>
+          <parameter type-id='type-id-11'/>
           <!-- parameter of type 'int' -->
-          <parameter type-id='type-id-10'/>
+          <parameter type-id='type-id-11'/>
           <!-- parameter of type 'int' -->
-          <parameter type-id='type-id-10'/>
+          <parameter type-id='type-id-11'/>
           <!-- parameter of type 'int' -->
-          <parameter type-id='type-id-10'/>
+          <parameter type-id='type-id-11'/>
           <!-- int -->
-          <return type-id='type-id-10'/>
+          <return type-id='type-id-11'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
@@ -9820,23 +9820,23 @@
           <!-- implicit parameter of type 'Mapdesc*' -->
           <parameter type-id='type-id-163' is-artificial='yes'/>
           <!-- parameter of type 'REAL*' -->
-          <parameter type-id='type-id-13'/>
+          <parameter type-id='type-id-16'/>
           <!-- parameter of type 'int' -->
-          <parameter type-id='type-id-10'/>
+          <parameter type-id='type-id-11'/>
           <!-- parameter of type 'int' -->
-          <parameter type-id='type-id-10'/>
+          <parameter type-id='type-id-11'/>
           <!-- parameter of type 'int' -->
-          <parameter type-id='type-id-10'/>
+          <parameter type-id='type-id-11'/>
           <!-- parameter of type 'int' -->
-          <parameter type-id='type-id-10'/>
+          <parameter type-id='type-id-11'/>
           <!-- parameter of type 'REAL*' -->
-          <parameter type-id='type-id-13'/>
+          <parameter type-id='type-id-16'/>
           <!-- parameter of type 'int' -->
-          <parameter type-id='type-id-10'/>
+          <parameter type-id='type-id-11'/>
           <!-- parameter of type 'int' -->
-          <parameter type-id='type-id-10'/>
+          <parameter type-id='type-id-11'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
@@ -9845,23 +9845,23 @@
           <!-- implicit parameter of type 'Mapdesc*' -->
           <parameter type-id='type-id-163' is-artificial='yes'/>
           <!-- parameter of type 'REAL*' -->
-          <parameter type-id='type-id-13'/>
+          <parameter type-id='type-id-16'/>
           <!-- parameter of type 'int' -->
-          <parameter type-id='type-id-10'/>
+          <parameter type-id='type-id-11'/>
           <!-- parameter of type 'int' -->
-          <parameter type-id='type-id-10'/>
+          <parameter type-id='type-id-11'/>
           <!-- parameter of type 'int' -->
-          <parameter type-id='type-id-10'/>
+          <parameter type-id='type-id-11'/>
           <!-- parameter of type 'int' -->
-          <parameter type-id='type-id-10'/>
+          <parameter type-id='type-id-11'/>
           <!-- parameter of type 'REAL*' -->
-          <parameter type-id='type-id-13'/>
+          <parameter type-id='type-id-16'/>
           <!-- parameter of type 'int' -->
-          <parameter type-id='type-id-10'/>
+          <parameter type-id='type-id-11'/>
           <!-- parameter of type 'int' -->
-          <parameter type-id='type-id-10'/>
+          <parameter type-id='type-id-11'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
@@ -9870,23 +9870,23 @@
           <!-- implicit parameter of type 'Mapdesc*' -->
           <parameter type-id='type-id-163' is-artificial='yes'/>
           <!-- parameter of type 'REAL*' -->
-          <parameter type-id='type-id-13'/>
+          <parameter type-id='type-id-16'/>
           <!-- parameter of type 'int' -->
-          <parameter type-id='type-id-10'/>
+          <parameter type-id='type-id-11'/>
           <!-- parameter of type 'int' -->
-          <parameter type-id='type-id-10'/>
+          <parameter type-id='type-id-11'/>
           <!-- parameter of type 'int' -->
-          <parameter type-id='type-id-10'/>
+          <parameter type-id='type-id-11'/>
           <!-- parameter of type 'int' -->
-          <parameter type-id='type-id-10'/>
+          <parameter type-id='type-id-11'/>
           <!-- parameter of type 'REAL*' -->
-          <parameter type-id='type-id-13'/>
+          <parameter type-id='type-id-16'/>
           <!-- parameter of type 'int' -->
-          <parameter type-id='type-id-10'/>
+          <parameter type-id='type-id-11'/>
           <!-- parameter of type 'int' -->
-          <parameter type-id='type-id-10'/>
+          <parameter type-id='type-id-11'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
@@ -9897,23 +9897,23 @@
           <!-- parameter of type 'REAL[5]*' -->
           <parameter type-id='type-id-228'/>
           <!-- parameter of type 'REAL*' -->
-          <parameter type-id='type-id-13'/>
+          <parameter type-id='type-id-16'/>
           <!-- parameter of type 'int' -->
-          <parameter type-id='type-id-10'/>
+          <parameter type-id='type-id-11'/>
           <!-- parameter of type 'int' -->
-          <parameter type-id='type-id-10'/>
+          <parameter type-id='type-id-11'/>
           <!-- parameter of type 'int' -->
-          <parameter type-id='type-id-10'/>
+          <parameter type-id='type-id-11'/>
           <!-- parameter of type 'int' -->
-          <parameter type-id='type-id-10'/>
+          <parameter type-id='type-id-11'/>
           <!-- parameter of type 'REAL*' -->
-          <parameter type-id='type-id-13'/>
+          <parameter type-id='type-id-16'/>
           <!-- parameter of type 'int' -->
-          <parameter type-id='type-id-10'/>
+          <parameter type-id='type-id-11'/>
           <!-- parameter of type 'int' -->
-          <parameter type-id='type-id-10'/>
+          <parameter type-id='type-id-11'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
@@ -9922,27 +9922,27 @@
           <!-- implicit parameter of type 'Mapdesc*' -->
           <parameter type-id='type-id-163' is-artificial='yes'/>
           <!-- parameter of type 'REAL*' -->
-          <parameter type-id='type-id-13'/>
+          <parameter type-id='type-id-16'/>
           <!-- parameter of type 'REAL*' -->
-          <parameter type-id='type-id-13'/>
+          <parameter type-id='type-id-16'/>
           <!-- parameter of type 'int' -->
-          <parameter type-id='type-id-10'/>
+          <parameter type-id='type-id-11'/>
           <!-- parameter of type 'int' -->
-          <parameter type-id='type-id-10'/>
+          <parameter type-id='type-id-11'/>
           <!-- parameter of type 'int' -->
-          <parameter type-id='type-id-10'/>
+          <parameter type-id='type-id-11'/>
           <!-- parameter of type 'int' -->
-          <parameter type-id='type-id-10'/>
+          <parameter type-id='type-id-11'/>
           <!-- parameter of type 'int' -->
-          <parameter type-id='type-id-10'/>
+          <parameter type-id='type-id-11'/>
           <!-- parameter of type 'int' -->
-          <parameter type-id='type-id-10'/>
+          <parameter type-id='type-id-11'/>
           <!-- parameter of type 'typedef REAL' -->
           <parameter type-id='type-id-1'/>
           <!-- parameter of type 'typedef REAL' -->
           <parameter type-id='type-id-1'/>
           <!-- parameter of type 'int' -->
-          <parameter type-id='type-id-10'/>
+          <parameter type-id='type-id-11'/>
           <!-- typedef REAL -->
           <return type-id='type-id-1'/>
         </function-decl>
@@ -9953,23 +9953,23 @@
           <!-- implicit parameter of type 'Mapdesc*' -->
           <parameter type-id='type-id-163' is-artificial='yes'/>
           <!-- parameter of type 'REAL*' -->
-          <parameter type-id='type-id-13'/>
+          <parameter type-id='type-id-16'/>
           <!-- parameter of type 'int' -->
-          <parameter type-id='type-id-10'/>
+          <parameter type-id='type-id-11'/>
           <!-- parameter of type 'int' -->
-          <parameter type-id='type-id-10'/>
+          <parameter type-id='type-id-11'/>
           <!-- parameter of type 'REAL*' -->
-          <parameter type-id='type-id-13'/>
+          <parameter type-id='type-id-16'/>
           <!-- parameter of type 'int' -->
-          <parameter type-id='type-id-10'/>
+          <parameter type-id='type-id-11'/>
           <!-- parameter of type 'int' -->
-          <parameter type-id='type-id-10'/>
+          <parameter type-id='type-id-11'/>
           <!-- parameter of type 'int' -->
-          <parameter type-id='type-id-10'/>
+          <parameter type-id='type-id-11'/>
           <!-- parameter of type 'int' -->
-          <parameter type-id='type-id-10'/>
+          <parameter type-id='type-id-11'/>
           <!-- int -->
-          <return type-id='type-id-10'/>
+          <return type-id='type-id-11'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
@@ -9980,7 +9980,7 @@
           <!-- parameter of type 'REAL[5]*' -->
           <parameter type-id='type-id-228'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
@@ -9989,19 +9989,19 @@
           <!-- implicit parameter of type 'Mapdesc*' -->
           <parameter type-id='type-id-163' is-artificial='yes'/>
           <!-- parameter of type 'REAL*' -->
-          <parameter type-id='type-id-13'/>
+          <parameter type-id='type-id-16'/>
           <!-- parameter of type 'int' -->
-          <parameter type-id='type-id-10'/>
+          <parameter type-id='type-id-11'/>
           <!-- parameter of type 'int' -->
-          <parameter type-id='type-id-10'/>
+          <parameter type-id='type-id-11'/>
           <!-- parameter of type 'int' -->
-          <parameter type-id='type-id-10'/>
+          <parameter type-id='type-id-11'/>
           <!-- parameter of type 'int' -->
-          <parameter type-id='type-id-10'/>
+          <parameter type-id='type-id-11'/>
           <!-- parameter of type 'REAL[5]*' -->
           <parameter type-id='type-id-228'/>
           <!-- int -->
-          <return type-id='type-id-10'/>
+          <return type-id='type-id-11'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
@@ -10010,17 +10010,17 @@
           <!-- implicit parameter of type 'Mapdesc*' -->
           <parameter type-id='type-id-163' is-artificial='yes'/>
           <!-- parameter of type 'REAL*' -->
-          <parameter type-id='type-id-13'/>
+          <parameter type-id='type-id-16'/>
           <!-- parameter of type 'int' -->
-          <parameter type-id='type-id-10'/>
+          <parameter type-id='type-id-11'/>
           <!-- parameter of type 'int' -->
-          <parameter type-id='type-id-10'/>
+          <parameter type-id='type-id-11'/>
           <!-- parameter of type 'int' -->
-          <parameter type-id='type-id-10'/>
+          <parameter type-id='type-id-11'/>
           <!-- parameter of type 'int' -->
-          <parameter type-id='type-id-10'/>
+          <parameter type-id='type-id-11'/>
           <!-- int -->
-          <return type-id='type-id-10'/>
+          <return type-id='type-id-11'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
@@ -10031,7 +10031,7 @@
           <!-- parameter of type 'REAL[5]*' -->
           <parameter type-id='type-id-228'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
@@ -10042,7 +10042,7 @@
           <!-- parameter of type 'float*' -->
           <parameter type-id='type-id-59'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
@@ -10053,11 +10053,11 @@
           <!-- parameter of type 'float*' -->
           <parameter type-id='type-id-59'/>
           <!-- parameter of type 'long int' -->
-          <parameter type-id='type-id-12'/>
+          <parameter type-id='type-id-15'/>
           <!-- parameter of type 'long int' -->
-          <parameter type-id='type-id-12'/>
+          <parameter type-id='type-id-15'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
@@ -10068,11 +10068,11 @@
           <!-- parameter of type 'float*' -->
           <parameter type-id='type-id-59'/>
           <!-- parameter of type 'long int' -->
-          <parameter type-id='type-id-12'/>
+          <parameter type-id='type-id-15'/>
           <!-- parameter of type 'long int' -->
-          <parameter type-id='type-id-12'/>
+          <parameter type-id='type-id-15'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
@@ -10083,11 +10083,11 @@
           <!-- parameter of type 'float*' -->
           <parameter type-id='type-id-59'/>
           <!-- parameter of type 'long int' -->
-          <parameter type-id='type-id-12'/>
+          <parameter type-id='type-id-15'/>
           <!-- parameter of type 'long int' -->
-          <parameter type-id='type-id-12'/>
+          <parameter type-id='type-id-15'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
@@ -10096,7 +10096,7 @@
           <!-- implicit parameter of type 'Mapdesc*' -->
           <parameter type-id='type-id-163' is-artificial='yes'/>
           <!-- int -->
-          <return type-id='type-id-10'/>
+          <return type-id='type-id-11'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
@@ -10105,7 +10105,7 @@
           <!-- implicit parameter of type 'Mapdesc*' -->
           <parameter type-id='type-id-163' is-artificial='yes'/>
           <!-- int -->
-          <return type-id='type-id-10'/>
+          <return type-id='type-id-11'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -10116,17 +10116,17 @@
           <!-- parameter of type 'REAL[5]*' -->
           <parameter type-id='type-id-228'/>
           <!-- parameter of type 'REAL*' -->
-          <parameter type-id='type-id-13'/>
+          <parameter type-id='type-id-16'/>
           <!-- parameter of type 'int' -->
-          <parameter type-id='type-id-10'/>
+          <parameter type-id='type-id-11'/>
           <!-- parameter of type 'int' -->
-          <parameter type-id='type-id-10'/>
+          <parameter type-id='type-id-11'/>
           <!-- parameter of type 'int' -->
-          <parameter type-id='type-id-10'/>
+          <parameter type-id='type-id-11'/>
           <!-- parameter of type 'int' -->
-          <parameter type-id='type-id-10'/>
+          <parameter type-id='type-id-11'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -10135,11 +10135,11 @@
           <!-- implicit parameter of type 'Mapdesc*' -->
           <parameter type-id='type-id-163' is-artificial='yes'/>
           <!-- parameter of type 'int' -->
-          <parameter type-id='type-id-10'/>
+          <parameter type-id='type-id-11'/>
           <!-- parameter of type 'REAL*' -->
-          <parameter type-id='type-id-13'/>
+          <parameter type-id='type-id-16'/>
           <!-- parameter of type 'int' -->
-          <parameter type-id='type-id-10'/>
+          <parameter type-id='type-id-11'/>
           <!-- typedef REAL -->
           <return type-id='type-id-1'/>
         </function-decl>
@@ -10150,15 +10150,15 @@
           <!-- parameter of type 'REAL[5]*' -->
           <parameter type-id='type-id-228'/>
           <!-- parameter of type 'long int' -->
-          <parameter type-id='type-id-12'/>
+          <parameter type-id='type-id-15'/>
           <!-- parameter of type 'float*' -->
           <parameter type-id='type-id-59'/>
           <!-- parameter of type 'long int' -->
-          <parameter type-id='type-id-12'/>
+          <parameter type-id='type-id-15'/>
           <!-- parameter of type 'long int' -->
-          <parameter type-id='type-id-12'/>
+          <parameter type-id='type-id-15'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private' static='yes'>
@@ -10171,7 +10171,7 @@
           <!-- parameter of type 'float[4]*' -->
           <parameter type-id='type-id-229'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private' static='yes'>
@@ -10184,7 +10184,7 @@
           <!-- parameter of type 'float[4]*' -->
           <parameter type-id='type-id-229'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -10193,11 +10193,11 @@
           <!-- implicit parameter of type 'Mapdesc*' -->
           <parameter type-id='type-id-163' is-artificial='yes'/>
           <!-- parameter of type 'REAL*' -->
-          <parameter type-id='type-id-13'/>
+          <parameter type-id='type-id-16'/>
           <!-- parameter of type 'REAL*' -->
-          <parameter type-id='type-id-13'/>
+          <parameter type-id='type-id-16'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -10206,17 +10206,17 @@
           <!-- implicit parameter of type 'Mapdesc*' -->
           <parameter type-id='type-id-163' is-artificial='yes'/>
           <!-- parameter of type 'REAL*' -->
-          <parameter type-id='type-id-13'/>
+          <parameter type-id='type-id-16'/>
           <!-- parameter of type 'REAL*' -->
-          <parameter type-id='type-id-13'/>
+          <parameter type-id='type-id-16'/>
           <!-- parameter of type 'REAL*' -->
-          <parameter type-id='type-id-13'/>
+          <parameter type-id='type-id-16'/>
           <!-- parameter of type 'typedef REAL' -->
           <parameter type-id='type-id-1'/>
           <!-- parameter of type 'typedef REAL' -->
           <parameter type-id='type-id-1'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -10225,11 +10225,11 @@
           <!-- implicit parameter of type 'Mapdesc*' -->
           <parameter type-id='type-id-163' is-artificial='yes'/>
           <!-- parameter of type 'REAL*' -->
-          <parameter type-id='type-id-13'/>
+          <parameter type-id='type-id-16'/>
           <!-- parameter of type 'REAL*' -->
-          <parameter type-id='type-id-13'/>
+          <parameter type-id='type-id-16'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -10238,11 +10238,11 @@
           <!-- implicit parameter of type 'Mapdesc*' -->
           <parameter type-id='type-id-163' is-artificial='yes'/>
           <!-- parameter of type 'REAL*' -->
-          <parameter type-id='type-id-13'/>
+          <parameter type-id='type-id-16'/>
           <!-- parameter of type 'REAL*' -->
-          <parameter type-id='type-id-13'/>
+          <parameter type-id='type-id-16'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -10253,11 +10253,11 @@
           <!-- parameter of type 'REAL[5]*' -->
           <parameter type-id='type-id-228'/>
           <!-- parameter of type 'REAL*' -->
-          <parameter type-id='type-id-13'/>
+          <parameter type-id='type-id-16'/>
           <!-- parameter of type 'REAL*' -->
-          <parameter type-id='type-id-13'/>
+          <parameter type-id='type-id-16'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -10268,11 +10268,11 @@
           <!-- parameter of type 'REAL[5]*' -->
           <parameter type-id='type-id-228'/>
           <!-- parameter of type 'REAL*' -->
-          <parameter type-id='type-id-13'/>
+          <parameter type-id='type-id-16'/>
           <!-- parameter of type 'REAL*' -->
-          <parameter type-id='type-id-13'/>
+          <parameter type-id='type-id-16'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -10281,7 +10281,7 @@
           <!-- implicit parameter of type 'Mapdesc*' -->
           <parameter type-id='type-id-163' is-artificial='yes'/>
           <!-- parameter of type 'REAL*' -->
-          <parameter type-id='type-id-13'/>
+          <parameter type-id='type-id-16'/>
           <!-- unsigned int -->
           <return type-id='type-id-230'/>
         </function-decl>
@@ -10291,15 +10291,15 @@
     <class-decl name='Knotvector' size-in-bits='256' is-struct='yes' visibility='default' filepath='libnurbs/internals/knotvector.h' line='41' column='1' id='type-id-231'>
       <data-member access='public' layout-offset-in-bits='0'>
         <!-- long int Knotvector::order -->
-        <var-decl name='order' type-id='type-id-12' visibility='default' filepath='libnurbs/internals/knotvector.h' line='48' column='1'/>
+        <var-decl name='order' type-id='type-id-15' visibility='default' filepath='libnurbs/internals/knotvector.h' line='48' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
         <!-- long int Knotvector::knotcount -->
-        <var-decl name='knotcount' type-id='type-id-12' visibility='default' filepath='libnurbs/internals/knotvector.h' line='49' column='1'/>
+        <var-decl name='knotcount' type-id='type-id-15' visibility='default' filepath='libnurbs/internals/knotvector.h' line='49' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
         <!-- long int Knotvector::stride -->
-        <var-decl name='stride' type-id='type-id-12' visibility='default' filepath='libnurbs/internals/knotvector.h' line='50' column='1'/>
+        <var-decl name='stride' type-id='type-id-15' visibility='default' filepath='libnurbs/internals/knotvector.h' line='50' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='192'>
         <!-- Knot* Knotvector::knotlist -->
@@ -10311,7 +10311,7 @@
           <!-- implicit parameter of type 'Knotvector*' -->
           <parameter type-id='type-id-82' is-artificial='yes'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public' destructor='yes'>
@@ -10320,9 +10320,9 @@
           <!-- implicit parameter of type 'Knotvector*' -->
           <parameter type-id='type-id-82' is-artificial='yes'/>
           <!-- artificial parameter of type 'int' -->
-          <parameter type-id='type-id-10' is-artificial='yes'/>
+          <parameter type-id='type-id-11' is-artificial='yes'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
@@ -10331,15 +10331,15 @@
           <!-- implicit parameter of type 'Knotvector*' -->
           <parameter type-id='type-id-82' is-artificial='yes'/>
           <!-- parameter of type 'long int' -->
-          <parameter type-id='type-id-12'/>
+          <parameter type-id='type-id-15'/>
           <!-- parameter of type 'long int' -->
-          <parameter type-id='type-id-12'/>
+          <parameter type-id='type-id-15'/>
           <!-- parameter of type 'long int' -->
-          <parameter type-id='type-id-12'/>
+          <parameter type-id='type-id-15'/>
           <!-- parameter of type 'float*' -->
           <parameter type-id='type-id-59'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
@@ -10348,7 +10348,7 @@
           <!-- implicit parameter of type 'Knotvector*' -->
           <parameter type-id='type-id-82' is-artificial='yes'/>
           <!-- int -->
-          <return type-id='type-id-10'/>
+          <return type-id='type-id-11'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
@@ -10359,7 +10359,7 @@
           <!-- parameter of type 'const char*' -->
           <parameter type-id='type-id-83'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
     </class-decl>
@@ -10367,23 +10367,23 @@
     <class-decl name='Quiltspec' size-in-bits='320' is-struct='yes' visibility='default' filepath='libnurbs/internals/quilt.h' line='51' column='1' id='type-id-216'>
       <data-member access='public' layout-offset-in-bits='0'>
         <!-- int Quiltspec::stride -->
-        <var-decl name='stride' type-id='type-id-10' visibility='default' filepath='libnurbs/internals/quilt.h' line='52' column='1'/>
+        <var-decl name='stride' type-id='type-id-11' visibility='default' filepath='libnurbs/internals/quilt.h' line='52' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='32'>
         <!-- int Quiltspec::width -->
-        <var-decl name='width' type-id='type-id-10' visibility='default' filepath='libnurbs/internals/quilt.h' line='53' column='1'/>
+        <var-decl name='width' type-id='type-id-11' visibility='default' filepath='libnurbs/internals/quilt.h' line='53' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
         <!-- int Quiltspec::offset -->
-        <var-decl name='offset' type-id='type-id-10' visibility='default' filepath='libnurbs/internals/quilt.h' line='54' column='1'/>
+        <var-decl name='offset' type-id='type-id-11' visibility='default' filepath='libnurbs/internals/quilt.h' line='54' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='96'>
         <!-- int Quiltspec::order -->
-        <var-decl name='order' type-id='type-id-10' visibility='default' filepath='libnurbs/internals/quilt.h' line='55' column='1'/>
+        <var-decl name='order' type-id='type-id-11' visibility='default' filepath='libnurbs/internals/quilt.h' line='55' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
         <!-- int Quiltspec::index -->
-        <var-decl name='index' type-id='type-id-10' visibility='default' filepath='libnurbs/internals/quilt.h' line='56' column='1'/>
+        <var-decl name='index' type-id='type-id-11' visibility='default' filepath='libnurbs/internals/quilt.h' line='56' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='160'>
         <!-- int Quiltspec::bdry[2] -->
@@ -10423,7 +10423,7 @@
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='libnurbs/internals/curvelist.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-T0fsxk/Mesa-8.0.5/src/glu/sgi' language='LANG_C_plus_plus'>
     <!-- float[3] -->
-    <array-type-def dimensions='1' type-id='type-id-30' size-in-bits='96' id='type-id-137'>
+    <array-type-def dimensions='1' type-id='type-id-33' size-in-bits='96' id='type-id-137'>
       <!-- <anonymous range>[3] -->
       <subrange length='3' type-id='type-id-3' id='type-id-91'/>
     </array-type-def>
@@ -10441,7 +10441,7 @@
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
         <!-- void* Dlnode::arg -->
-        <var-decl name='arg' type-id='type-id-22' visibility='default' filepath='libnurbs/internals/displaylist.h' line='51' column='1'/>
+        <var-decl name='arg' type-id='type-id-25' visibility='default' filepath='libnurbs/internals/displaylist.h' line='51' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='192'>
         <!-- PFVS Dlnode::cleanup -->
@@ -10459,11 +10459,11 @@
           <!-- parameter of type 'typedef PFVS' -->
           <parameter type-id='type-id-236'/>
           <!-- parameter of type 'void*' -->
-          <parameter type-id='type-id-22'/>
+          <parameter type-id='type-id-25'/>
           <!-- parameter of type 'typedef PFVS' -->
           <parameter type-id='type-id-236'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
     </class-decl>
@@ -10477,7 +10477,7 @@
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
         <!-- long int __delta -->
-        <var-decl name='__delta' type-id='type-id-12' visibility='default' filepath='libnurbs/internals/displaylist.h' line='46' column='1'/>
+        <var-decl name='__delta' type-id='type-id-15' visibility='default' filepath='libnurbs/internals/displaylist.h' line='46' column='1'/>
       </data-member>
     </class-decl>
     <!-- class DisplayList -->
@@ -10506,7 +10506,7 @@
           <!-- parameter of type 'NurbsTessellator*' -->
           <parameter type-id='type-id-79'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private' destructor='yes'>
@@ -10515,9 +10515,9 @@
           <!-- implicit parameter of type 'DisplayList*' -->
           <parameter type-id='type-id-78' is-artificial='yes'/>
           <!-- artificial parameter of type 'int' -->
-          <parameter type-id='type-id-10' is-artificial='yes'/>
+          <parameter type-id='type-id-11' is-artificial='yes'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -10526,7 +10526,7 @@
           <!-- implicit parameter of type 'DisplayList*' -->
           <parameter type-id='type-id-78' is-artificial='yes'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -10537,11 +10537,11 @@
           <!-- parameter of type 'typedef PFVS' -->
           <parameter type-id='type-id-236'/>
           <!-- parameter of type 'void*' -->
-          <parameter type-id='type-id-22'/>
+          <parameter type-id='type-id-25'/>
           <!-- parameter of type 'typedef PFVS' -->
           <parameter type-id='type-id-236'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -10550,7 +10550,7 @@
           <!-- implicit parameter of type 'DisplayList*' -->
           <parameter type-id='type-id-78' is-artificial='yes'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
     </class-decl>
@@ -10569,9 +10569,9 @@
       <!-- implicit parameter of type 'NurbsTessellator*' -->
       <parameter type-id='type-id-79' is-artificial='yes'/>
       <!-- parameter of type 'void*' -->
-      <parameter type-id='type-id-22'/>
+      <parameter type-id='type-id-25'/>
       <!-- void -->
-      <return type-id='type-id-11'/>
+      <return type-id='type-id-12'/>
     </function-type>
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='libnurbs/internals/flist.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-T0fsxk/Mesa-8.0.5/src/glu/sgi' language='LANG_C_plus_plus'>
@@ -10600,7 +10600,7 @@
           </data-member>
           <data-member access='public' layout-offset-in-bits='192'>
             <!-- long int Hull::Side::index -->
-            <var-decl name='index' type-id='type-id-12' visibility='default' filepath='libnurbs/internals/hull.h' line='59' column='1'/>
+            <var-decl name='index' type-id='type-id-15' visibility='default' filepath='libnurbs/internals/hull.h' line='59' column='1'/>
           </data-member>
         </class-decl>
       </member-type>
@@ -10626,11 +10626,11 @@
           <!-- implicit parameter of type 'Hull*' -->
           <parameter type-id='type-id-246' is-artificial='yes'/>
           <!-- artificial parameter of type 'int' -->
-          <parameter type-id='type-id-10' is-artificial='yes'/>
+          <parameter type-id='type-id-11' is-artificial='yes'/>
           <!-- artificial parameter of type 'void**' -->
           <parameter type-id='type-id-185' is-artificial='yes'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private' destructor='yes'>
@@ -10639,11 +10639,11 @@
           <!-- implicit parameter of type 'Hull*' -->
           <parameter type-id='type-id-246' is-artificial='yes'/>
           <!-- artificial parameter of type 'int' -->
-          <parameter type-id='type-id-10' is-artificial='yes'/>
+          <parameter type-id='type-id-11' is-artificial='yes'/>
           <!-- artificial parameter of type 'void**' -->
           <parameter type-id='type-id-185' is-artificial='yes'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -10652,7 +10652,7 @@
           <!-- implicit parameter of type 'Hull*' -->
           <parameter type-id='type-id-246' is-artificial='yes'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -10718,7 +10718,7 @@
           <!-- parameter of type 'Backend&' -->
           <parameter type-id='type-id-167'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -10727,13 +10727,13 @@
           <!-- implicit parameter of type 'Maplist*' -->
           <parameter type-id='type-id-248' is-artificial='yes'/>
           <!-- parameter of type 'long int' -->
-          <parameter type-id='type-id-12'/>
+          <parameter type-id='type-id-15'/>
           <!-- parameter of type 'int' -->
-          <parameter type-id='type-id-10'/>
+          <parameter type-id='type-id-11'/>
           <!-- parameter of type 'int' -->
-          <parameter type-id='type-id-10'/>
+          <parameter type-id='type-id-11'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -10742,9 +10742,9 @@
           <!-- implicit parameter of type 'Maplist*' -->
           <parameter type-id='type-id-248' is-artificial='yes'/>
           <!-- parameter of type 'long int' -->
-          <parameter type-id='type-id-12'/>
+          <parameter type-id='type-id-15'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -10753,9 +10753,9 @@
           <!-- implicit parameter of type 'Maplist*' -->
           <parameter type-id='type-id-248' is-artificial='yes'/>
           <!-- parameter of type 'long int' -->
-          <parameter type-id='type-id-12'/>
+          <parameter type-id='type-id-15'/>
           <!-- int -->
-          <return type-id='type-id-10'/>
+          <return type-id='type-id-11'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -10764,7 +10764,7 @@
           <!-- implicit parameter of type 'Maplist*' -->
           <parameter type-id='type-id-248' is-artificial='yes'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -10773,7 +10773,7 @@
           <!-- implicit parameter of type 'Maplist*' -->
           <parameter type-id='type-id-248' is-artificial='yes'/>
           <!-- parameter of type 'long int' -->
-          <parameter type-id='type-id-12'/>
+          <parameter type-id='type-id-15'/>
           <!-- Mapdesc* -->
           <return type-id='type-id-163'/>
         </function-decl>
@@ -10784,7 +10784,7 @@
           <!-- implicit parameter of type 'Maplist*' -->
           <parameter type-id='type-id-248' is-artificial='yes'/>
           <!-- parameter of type 'long int' -->
-          <parameter type-id='type-id-12'/>
+          <parameter type-id='type-id-15'/>
           <!-- Mapdesc* -->
           <return type-id='type-id-163'/>
         </function-decl>
@@ -10795,13 +10795,13 @@
           <!-- implicit parameter of type 'Maplist*' -->
           <parameter type-id='type-id-248' is-artificial='yes'/>
           <!-- parameter of type 'long int' -->
-          <parameter type-id='type-id-12'/>
+          <parameter type-id='type-id-15'/>
           <!-- parameter of type 'int' -->
-          <parameter type-id='type-id-10'/>
+          <parameter type-id='type-id-11'/>
           <!-- parameter of type 'int' -->
-          <parameter type-id='type-id-10'/>
+          <parameter type-id='type-id-11'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -10812,7 +10812,7 @@
           <!-- parameter of type 'Mapdesc*' -->
           <parameter type-id='type-id-163'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -10821,7 +10821,7 @@
           <!-- implicit parameter of type 'Maplist*' -->
           <parameter type-id='type-id-248' is-artificial='yes'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
     </class-decl>
@@ -10868,11 +10868,11 @@
       </data-member>
       <data-member access='private' layout-offset-in-bits='5056'>
         <!-- int Mesher::itop -->
-        <var-decl name='itop' type-id='type-id-10' visibility='default' filepath='libnurbs/internals/mesher.h' line='62' column='1'/>
+        <var-decl name='itop' type-id='type-id-11' visibility='default' filepath='libnurbs/internals/mesher.h' line='62' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='5088'>
         <!-- int Mesher::lastedge -->
-        <var-decl name='lastedge' type-id='type-id-10' visibility='default' filepath='libnurbs/internals/mesher.h' line='63' column='1'/>
+        <var-decl name='lastedge' type-id='type-id-11' visibility='default' filepath='libnurbs/internals/mesher.h' line='63' column='1'/>
       </data-member>
       <member-function access='private' constructor='yes'>
         <!-- Mesher::Mesher(int, void**, Backend&) -->
@@ -10880,13 +10880,13 @@
           <!-- implicit parameter of type 'Mesher*' -->
           <parameter type-id='type-id-252' is-artificial='yes'/>
           <!-- artificial parameter of type 'int' -->
-          <parameter type-id='type-id-10' is-artificial='yes'/>
+          <parameter type-id='type-id-11' is-artificial='yes'/>
           <!-- artificial parameter of type 'void**' -->
           <parameter type-id='type-id-185' is-artificial='yes'/>
           <!-- parameter of type 'Backend&' -->
           <parameter type-id='type-id-167'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private' destructor='yes'>
@@ -10895,11 +10895,11 @@
           <!-- implicit parameter of type 'Mesher*' -->
           <parameter type-id='type-id-252' is-artificial='yes'/>
           <!-- artificial parameter of type 'int' -->
-          <parameter type-id='type-id-10' is-artificial='yes'/>
+          <parameter type-id='type-id-11' is-artificial='yes'/>
           <!-- artificial parameter of type 'void**' -->
           <parameter type-id='type-id-185' is-artificial='yes'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -10910,7 +10910,7 @@
           <!-- parameter of type 'unsigned int' -->
           <parameter type-id='type-id-230'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -10919,7 +10919,7 @@
           <!-- implicit parameter of type 'Mesher*' -->
           <parameter type-id='type-id-252' is-artificial='yes'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -10928,7 +10928,7 @@
           <!-- implicit parameter of type 'Mesher*' -->
           <parameter type-id='type-id-252' is-artificial='yes'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -10937,7 +10937,7 @@
           <!-- implicit parameter of type 'Mesher*' -->
           <parameter type-id='type-id-252' is-artificial='yes'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -10946,7 +10946,7 @@
           <!-- implicit parameter of type 'Mesher*' -->
           <parameter type-id='type-id-252' is-artificial='yes'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -10955,9 +10955,9 @@
           <!-- implicit parameter of type 'Mesher*' -->
           <parameter type-id='type-id-252' is-artificial='yes'/>
           <!-- parameter of type 'int' -->
-          <parameter type-id='type-id-10'/>
+          <parameter type-id='type-id-11'/>
           <!-- int -->
-          <return type-id='type-id-10'/>
+          <return type-id='type-id-11'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -10966,9 +10966,9 @@
           <!-- implicit parameter of type 'Mesher*' -->
           <parameter type-id='type-id-252' is-artificial='yes'/>
           <!-- parameter of type 'int' -->
-          <parameter type-id='type-id-10'/>
+          <parameter type-id='type-id-11'/>
           <!-- int -->
-          <return type-id='type-id-10'/>
+          <return type-id='type-id-11'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -10977,7 +10977,7 @@
           <!-- implicit parameter of type 'Mesher*' -->
           <parameter type-id='type-id-252' is-artificial='yes'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -10988,7 +10988,7 @@
           <!-- parameter of type 'GridTrimVertex*' -->
           <parameter type-id='type-id-193'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -10997,9 +10997,9 @@
           <!-- implicit parameter of type 'Mesher*' -->
           <parameter type-id='type-id-252' is-artificial='yes'/>
           <!-- parameter of type 'long int' -->
-          <parameter type-id='type-id-12'/>
+          <parameter type-id='type-id-15'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -11008,11 +11008,11 @@
           <!-- implicit parameter of type 'Mesher*' -->
           <parameter type-id='type-id-252' is-artificial='yes'/>
           <!-- parameter of type 'int' -->
-          <parameter type-id='type-id-10'/>
+          <parameter type-id='type-id-11'/>
           <!-- parameter of type 'int' -->
-          <parameter type-id='type-id-10'/>
+          <parameter type-id='type-id-11'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -11021,11 +11021,11 @@
           <!-- implicit parameter of type 'Mesher*' -->
           <parameter type-id='type-id-252' is-artificial='yes'/>
           <!-- parameter of type 'int' -->
-          <parameter type-id='type-id-10'/>
+          <parameter type-id='type-id-11'/>
           <!-- parameter of type 'int' -->
-          <parameter type-id='type-id-10'/>
+          <parameter type-id='type-id-11'/>
           <!-- int -->
-          <return type-id='type-id-10'/>
+          <return type-id='type-id-11'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -11034,11 +11034,11 @@
           <!-- implicit parameter of type 'Mesher*' -->
           <parameter type-id='type-id-252' is-artificial='yes'/>
           <!-- parameter of type 'int' -->
-          <parameter type-id='type-id-10'/>
+          <parameter type-id='type-id-11'/>
           <!-- parameter of type 'int' -->
-          <parameter type-id='type-id-10'/>
+          <parameter type-id='type-id-11'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -11047,9 +11047,9 @@
           <!-- implicit parameter of type 'Mesher*' -->
           <parameter type-id='type-id-252' is-artificial='yes'/>
           <!-- parameter of type 'int' -->
-          <parameter type-id='type-id-10'/>
+          <parameter type-id='type-id-11'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -11058,7 +11058,7 @@
           <!-- implicit parameter of type 'Mesher*' -->
           <parameter type-id='type-id-252' is-artificial='yes'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -11067,7 +11067,7 @@
           <!-- implicit parameter of type 'Mesher*' -->
           <parameter type-id='type-id-252' is-artificial='yes'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -11076,7 +11076,7 @@
           <!-- implicit parameter of type 'Mesher*' -->
           <parameter type-id='type-id-252' is-artificial='yes'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -11087,7 +11087,7 @@
           <!-- parameter of type 'GridTrimVertex*' -->
           <parameter type-id='type-id-193'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -11098,7 +11098,7 @@
           <!-- parameter of type 'GridTrimVertex*' -->
           <parameter type-id='type-id-193'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
     </class-decl>
@@ -11107,7 +11107,7 @@
     <!-- Mesher* -->
     <pointer-type-def type-id='type-id-183' size-in-bits='64' id='type-id-252'/>
     <!-- const float -->
-    <qualified-type-def type-id='type-id-30' const='yes' id='type-id-250'/>
+    <qualified-type-def type-id='type-id-33' const='yes' id='type-id-250'/>
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='libnurbs/internals/monoTriangulationBackend.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-T0fsxk/Mesa-8.0.5/src/glu/sgi' language='LANG_C_plus_plus'>
     <!-- Real[2] -->
@@ -11116,9 +11116,9 @@
       <subrange length='2' type-id='type-id-3' id='type-id-88'/>
     </array-type-def>
     <!-- typedef float Real -->
-    <typedef-decl name='Real' type-id='type-id-30' filepath='libnurbs/nurbtess/definitions.h' line='36' column='1' id='type-id-253'/>
+    <typedef-decl name='Real' type-id='type-id-33' filepath='libnurbs/nurbtess/definitions.h' line='36' column='1' id='type-id-253'/>
     <!-- typedef int Int -->
-    <typedef-decl name='Int' type-id='type-id-10' filepath='libnurbs/nurbtess/definitions.h' line='37' column='1' id='type-id-255'/>
+    <typedef-decl name='Int' type-id='type-id-11' filepath='libnurbs/nurbtess/definitions.h' line='37' column='1' id='type-id-255'/>
     <!-- class vertexArray -->
     <class-decl name='vertexArray' size-in-bits='128' visibility='default' filepath='libnurbs/nurbtess/monoTriangulation.h' line='77' column='1' id='type-id-256'>
       <data-member access='private' layout-offset-in-bits='0'>
@@ -11141,7 +11141,7 @@
           <!-- parameter of type 'typedef Int' -->
           <parameter type-id='type-id-255'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private' constructor='yes'>
@@ -11154,7 +11154,7 @@
           <!-- parameter of type 'typedef Int' -->
           <parameter type-id='type-id-255'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private' destructor='yes'>
@@ -11163,9 +11163,9 @@
           <!-- implicit parameter of type 'vertexArray*' -->
           <parameter type-id='type-id-258' is-artificial='yes'/>
           <!-- artificial parameter of type 'int' -->
-          <parameter type-id='type-id-10' is-artificial='yes'/>
+          <parameter type-id='type-id-11' is-artificial='yes'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -11176,7 +11176,7 @@
           <!-- parameter of type 'Real*' -->
           <parameter type-id='type-id-260'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -11313,7 +11313,7 @@
           <!-- implicit parameter of type 'vertexArray*' -->
           <parameter type-id='type-id-258' is-artificial='yes'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
     </class-decl>
@@ -11345,7 +11345,7 @@
           <!-- parameter of type 'typedef Int' -->
           <parameter type-id='type-id-255'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private' destructor='yes'>
@@ -11354,9 +11354,9 @@
           <!-- implicit parameter of type 'reflexChain*' -->
           <parameter type-id='type-id-263' is-artificial='yes'/>
           <!-- artificial parameter of type 'int' -->
-          <parameter type-id='type-id-10' is-artificial='yes'/>
+          <parameter type-id='type-id-11' is-artificial='yes'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -11369,7 +11369,7 @@
           <!-- parameter of type 'typedef Real' -->
           <parameter type-id='type-id-253'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -11380,7 +11380,7 @@
           <!-- parameter of type 'Real*' -->
           <parameter type-id='type-id-260'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -11393,7 +11393,7 @@
           <!-- parameter of type 'primStream*' -->
           <parameter type-id='type-id-186'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -11406,7 +11406,7 @@
           <!-- parameter of type 'primStream*' -->
           <parameter type-id='type-id-186'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -11419,7 +11419,7 @@
           <!-- parameter of type 'Backend*' -->
           <parameter type-id='type-id-192'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -11432,7 +11432,7 @@
           <!-- parameter of type 'Backend*' -->
           <parameter type-id='type-id-192'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -11441,7 +11441,7 @@
           <!-- implicit parameter of type 'reflexChain*' -->
           <parameter type-id='type-id-263' is-artificial='yes'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
     </class-decl>
@@ -11491,7 +11491,7 @@
           <!-- parameter of type 'typedef Int' -->
           <parameter type-id='type-id-255'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private' destructor='yes'>
@@ -11500,9 +11500,9 @@
           <!-- implicit parameter of type 'primStream*' -->
           <parameter type-id='type-id-186' is-artificial='yes'/>
           <!-- artificial parameter of type 'int' -->
-          <parameter type-id='type-id-10' is-artificial='yes'/>
+          <parameter type-id='type-id-11' is-artificial='yes'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -11551,7 +11551,7 @@
           <!-- implicit parameter of type 'primStream*' -->
           <parameter type-id='type-id-186' is-artificial='yes'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -11564,7 +11564,7 @@
           <!-- parameter of type 'typedef Real' -->
           <parameter type-id='type-id-253'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -11575,7 +11575,7 @@
           <!-- parameter of type 'Real*' -->
           <parameter type-id='type-id-260'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -11586,7 +11586,7 @@
           <!-- parameter of type 'typedef Int' -->
           <parameter type-id='type-id-255'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -11610,7 +11610,7 @@
           <!-- parameter of type 'Real*' -->
           <parameter type-id='type-id-260'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -11619,7 +11619,7 @@
           <!-- implicit parameter of type 'primStream*' -->
           <parameter type-id='type-id-186' is-artificial='yes'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -11628,7 +11628,7 @@
           <!-- implicit parameter of type 'primStream*' -->
           <parameter type-id='type-id-186' is-artificial='yes'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
     </class-decl>
@@ -11662,7 +11662,7 @@
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
         <!-- int O_pwlcurve::npts -->
-        <var-decl name='npts' type-id='type-id-10' visibility='default' filepath='libnurbs/internals/reader.h' line='86' column='1'/>
+        <var-decl name='npts' type-id='type-id-11' visibility='default' filepath='libnurbs/internals/reader.h' line='86' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
         <!-- O_pwlcurve* O_pwlcurve::next -->
@@ -11670,11 +11670,11 @@
       </data-member>
       <data-member access='public' layout-offset-in-bits='192'>
         <!-- int O_pwlcurve::used -->
-        <var-decl name='used' type-id='type-id-10' visibility='default' filepath='libnurbs/internals/reader.h' line='88' column='1'/>
+        <var-decl name='used' type-id='type-id-11' visibility='default' filepath='libnurbs/internals/reader.h' line='88' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='224'>
         <!-- int O_pwlcurve::save -->
-        <var-decl name='save' type-id='type-id-10' visibility='default' filepath='libnurbs/internals/reader.h' line='89' column='1'/>
+        <var-decl name='save' type-id='type-id-11' visibility='default' filepath='libnurbs/internals/reader.h' line='89' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='256'>
         <!-- O_curve* O_pwlcurve::owner -->
@@ -11686,17 +11686,17 @@
           <!-- implicit parameter of type 'O_pwlcurve*' -->
           <parameter type-id='type-id-84' is-artificial='yes'/>
           <!-- parameter of type 'long int' -->
-          <parameter type-id='type-id-12'/>
+          <parameter type-id='type-id-15'/>
           <!-- parameter of type 'long int' -->
-          <parameter type-id='type-id-12'/>
+          <parameter type-id='type-id-15'/>
           <!-- parameter of type 'float*' -->
           <parameter type-id='type-id-59'/>
           <!-- parameter of type 'long int' -->
-          <parameter type-id='type-id-12'/>
+          <parameter type-id='type-id-15'/>
           <!-- parameter of type 'TrimVertex*' -->
           <parameter type-id='type-id-119'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
     </class-decl>
@@ -11706,11 +11706,11 @@
       <base-class access='public' layout-offset-in-bits='0' type-id='type-id-111'/>
       <data-member access='public' layout-offset-in-bits='0'>
         <!-- long int Property::type -->
-        <var-decl name='type' type-id='type-id-12' visibility='default' filepath='libnurbs/internals/reader.h' line='121' column='1'/>
+        <var-decl name='type' type-id='type-id-15' visibility='default' filepath='libnurbs/internals/reader.h' line='121' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
         <!-- long int Property::tag -->
-        <var-decl name='tag' type-id='type-id-12' visibility='default' filepath='libnurbs/internals/reader.h' line='122' column='1'/>
+        <var-decl name='tag' type-id='type-id-15' visibility='default' filepath='libnurbs/internals/reader.h' line='122' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
         <!-- REAL Property::value -->
@@ -11718,7 +11718,7 @@
       </data-member>
       <data-member access='public' layout-offset-in-bits='160'>
         <!-- int Property::save -->
-        <var-decl name='save' type-id='type-id-10' visibility='default' filepath='libnurbs/internals/reader.h' line='124' column='1'/>
+        <var-decl name='save' type-id='type-id-11' visibility='default' filepath='libnurbs/internals/reader.h' line='124' column='1'/>
       </data-member>
       <member-function access='public' constructor='yes'>
         <!-- Property::Property(long int, long int, float) -->
@@ -11726,13 +11726,13 @@
           <!-- implicit parameter of type 'Property*' -->
           <parameter type-id='type-id-87' is-artificial='yes'/>
           <!-- parameter of type 'long int' -->
-          <parameter type-id='type-id-12'/>
+          <parameter type-id='type-id-15'/>
           <!-- parameter of type 'long int' -->
-          <parameter type-id='type-id-12'/>
+          <parameter type-id='type-id-15'/>
           <!-- parameter of type 'float' -->
-          <parameter type-id='type-id-30'/>
+          <parameter type-id='type-id-33'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public' constructor='yes'>
@@ -11741,11 +11741,11 @@
           <!-- implicit parameter of type 'Property*' -->
           <parameter type-id='type-id-87' is-artificial='yes'/>
           <!-- parameter of type 'long int' -->
-          <parameter type-id='type-id-12'/>
+          <parameter type-id='type-id-15'/>
           <!-- parameter of type 'float' -->
-          <parameter type-id='type-id-30'/>
+          <parameter type-id='type-id-33'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
     </class-decl>
@@ -11759,7 +11759,7 @@
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
         <!-- long int O_nurbssurface::type -->
-        <var-decl name='type' type-id='type-id-12' visibility='default' filepath='libnurbs/internals/reader.h' line='103' column='1'/>
+        <var-decl name='type' type-id='type-id-15' visibility='default' filepath='libnurbs/internals/reader.h' line='103' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
         <!-- O_surface* O_nurbssurface::owner -->
@@ -11771,11 +11771,11 @@
       </data-member>
       <data-member access='public' layout-offset-in-bits='256'>
         <!-- int O_nurbssurface::save -->
-        <var-decl name='save' type-id='type-id-10' visibility='default' filepath='libnurbs/internals/reader.h' line='106' column='1'/>
+        <var-decl name='save' type-id='type-id-11' visibility='default' filepath='libnurbs/internals/reader.h' line='106' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='288'>
         <!-- int O_nurbssurface::used -->
-        <var-decl name='used' type-id='type-id-10' visibility='default' filepath='libnurbs/internals/reader.h' line='107' column='1'/>
+        <var-decl name='used' type-id='type-id-11' visibility='default' filepath='libnurbs/internals/reader.h' line='107' column='1'/>
       </data-member>
       <member-function access='public' constructor='yes'>
         <!-- O_nurbssurface::O_nurbssurface(long int) -->
@@ -11783,9 +11783,9 @@
           <!-- implicit parameter of type 'O_nurbssurface*' -->
           <parameter type-id='type-id-86' is-artificial='yes'/>
           <!-- parameter of type 'long int' -->
-          <parameter type-id='type-id-12'/>
+          <parameter type-id='type-id-15'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
     </class-decl>
@@ -11803,11 +11803,11 @@
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
         <!-- int O_surface::save -->
-        <var-decl name='save' type-id='type-id-10' visibility='default' filepath='libnurbs/internals/reader.h' line='115' column='1'/>
+        <var-decl name='save' type-id='type-id-11' visibility='default' filepath='libnurbs/internals/reader.h' line='115' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='192'>
         <!-- long int O_surface::nuid -->
-        <var-decl name='nuid' type-id='type-id-12' visibility='default' filepath='libnurbs/internals/reader.h' line='116' column='1'/>
+        <var-decl name='nuid' type-id='type-id-15' visibility='default' filepath='libnurbs/internals/reader.h' line='116' column='1'/>
       </data-member>
       <member-function access='public' constructor='yes'>
         <!-- O_surface::O_surface() -->
@@ -11815,7 +11815,7 @@
           <!-- implicit parameter of type 'O_surface*' -->
           <parameter type-id='type-id-75' is-artificial='yes'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
     </class-decl>
@@ -11833,7 +11833,7 @@
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
         <!-- int O_trim::save -->
-        <var-decl name='save' type-id='type-id-10' visibility='default' filepath='libnurbs/internals/reader.h' line='97' column='1'/>
+        <var-decl name='save' type-id='type-id-11' visibility='default' filepath='libnurbs/internals/reader.h' line='97' column='1'/>
       </data-member>
       <member-function access='public' constructor='yes'>
         <!-- O_trim::O_trim() -->
@@ -11841,7 +11841,7 @@
           <!-- implicit parameter of type 'O_trim*' -->
           <parameter type-id='type-id-76' is-artificial='yes'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
     </class-decl>
@@ -11880,15 +11880,15 @@
       </data-member>
       <data-member access='public' layout-offset-in-bits='256'>
         <!-- int O_curve::used -->
-        <var-decl name='used' type-id='type-id-10' visibility='default' filepath='libnurbs/internals/reader.h' line='63' column='1'/>
+        <var-decl name='used' type-id='type-id-11' visibility='default' filepath='libnurbs/internals/reader.h' line='63' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='288'>
         <!-- int O_curve::save -->
-        <var-decl name='save' type-id='type-id-10' visibility='default' filepath='libnurbs/internals/reader.h' line='64' column='1'/>
+        <var-decl name='save' type-id='type-id-11' visibility='default' filepath='libnurbs/internals/reader.h' line='64' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='320'>
         <!-- long int O_curve::nuid -->
-        <var-decl name='nuid' type-id='type-id-12' visibility='default' filepath='libnurbs/internals/reader.h' line='65' column='1'/>
+        <var-decl name='nuid' type-id='type-id-15' visibility='default' filepath='libnurbs/internals/reader.h' line='65' column='1'/>
       </data-member>
       <member-function access='public' constructor='yes'>
         <!-- O_curve::O_curve() -->
@@ -11896,7 +11896,7 @@
           <!-- implicit parameter of type 'O_curve*' -->
           <parameter type-id='type-id-77' is-artificial='yes'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
     </class-decl>
@@ -11910,7 +11910,7 @@
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
         <!-- long int O_nurbscurve::type -->
-        <var-decl name='type' type-id='type-id-12' visibility='default' filepath='libnurbs/internals/reader.h' line='72' column='1'/>
+        <var-decl name='type' type-id='type-id-15' visibility='default' filepath='libnurbs/internals/reader.h' line='72' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
         <!-- REAL O_nurbscurve::tesselation -->
@@ -11918,7 +11918,7 @@
       </data-member>
       <data-member access='public' layout-offset-in-bits='160'>
         <!-- int O_nurbscurve::method -->
-        <var-decl name='method' type-id='type-id-10' visibility='default' filepath='libnurbs/internals/reader.h' line='74' column='1'/>
+        <var-decl name='method' type-id='type-id-11' visibility='default' filepath='libnurbs/internals/reader.h' line='74' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='192'>
         <!-- O_nurbscurve* O_nurbscurve::next -->
@@ -11926,11 +11926,11 @@
       </data-member>
       <data-member access='public' layout-offset-in-bits='256'>
         <!-- int O_nurbscurve::used -->
-        <var-decl name='used' type-id='type-id-10' visibility='default' filepath='libnurbs/internals/reader.h' line='76' column='1'/>
+        <var-decl name='used' type-id='type-id-11' visibility='default' filepath='libnurbs/internals/reader.h' line='76' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='288'>
         <!-- int O_nurbscurve::save -->
-        <var-decl name='save' type-id='type-id-10' visibility='default' filepath='libnurbs/internals/reader.h' line='77' column='1'/>
+        <var-decl name='save' type-id='type-id-11' visibility='default' filepath='libnurbs/internals/reader.h' line='77' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='320'>
         <!-- O_curve* O_nurbscurve::owner -->
@@ -11942,15 +11942,15 @@
           <!-- implicit parameter of type 'O_nurbscurve*' -->
           <parameter type-id='type-id-85' is-artificial='yes'/>
           <!-- parameter of type 'long int' -->
-          <parameter type-id='type-id-12'/>
+          <parameter type-id='type-id-15'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
     </class-decl>
     <!-- enum Curvetype -->
     <enum-decl name='Curvetype' filepath='libnurbs/internals/reader.h' line='42' column='1' id='type-id-274'>
-      <underlying-type type-id='type-id-38'/>
+      <underlying-type type-id='type-id-9'/>
       <enumerator name='ct_nurbscurve' value='0'/>
       <enumerator name='ct_pwlcurve' value='1'/>
       <enumerator name='ct_none' value='2'/>
@@ -12020,7 +12020,7 @@
       </data-member>
       <data-member access='public' layout-offset-in-bits='224'>
         <!-- int Pspec::needsSubdivision -->
-        <var-decl name='needsSubdivision' type-id='type-id-10' visibility='default' filepath='libnurbs/internals/patch.h' line='51' column='1'/>
+        <var-decl name='needsSubdivision' type-id='type-id-11' visibility='default' filepath='libnurbs/internals/patch.h' line='51' column='1'/>
       </data-member>
     </class-decl>
     <!-- class Patch -->
@@ -12035,15 +12035,15 @@
       </data-member>
       <data-member access='private' layout-offset-in-bits='128'>
         <!-- int Patch::cullval -->
-        <var-decl name='cullval' type-id='type-id-10' visibility='default' filepath='libnurbs/internals/patch.h' line='84' column='1'/>
+        <var-decl name='cullval' type-id='type-id-11' visibility='default' filepath='libnurbs/internals/patch.h' line='84' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='160'>
         <!-- int Patch::notInBbox -->
-        <var-decl name='notInBbox' type-id='type-id-10' visibility='default' filepath='libnurbs/internals/patch.h' line='85' column='1'/>
+        <var-decl name='notInBbox' type-id='type-id-11' visibility='default' filepath='libnurbs/internals/patch.h' line='85' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='192'>
         <!-- int Patch::needsSampling -->
-        <var-decl name='needsSampling' type-id='type-id-10' visibility='default' filepath='libnurbs/internals/patch.h' line='86' column='1'/>
+        <var-decl name='needsSampling' type-id='type-id-11' visibility='default' filepath='libnurbs/internals/patch.h' line='86' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='224'>
         <!-- REAL Patch::cpts[2880] -->
@@ -12073,13 +12073,13 @@
           <!-- parameter of type 'Quilt*' -->
           <parameter type-id='type-id-139'/>
           <!-- parameter of type 'REAL*' -->
-          <parameter type-id='type-id-13'/>
+          <parameter type-id='type-id-16'/>
           <!-- parameter of type 'REAL*' -->
-          <parameter type-id='type-id-13'/>
+          <parameter type-id='type-id-16'/>
           <!-- parameter of type 'Patch*' -->
           <parameter type-id='type-id-179'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private' constructor='yes'>
@@ -12090,13 +12090,13 @@
           <!-- parameter of type 'Patch&' -->
           <parameter type-id='type-id-283'/>
           <!-- parameter of type 'int' -->
-          <parameter type-id='type-id-10'/>
+          <parameter type-id='type-id-11'/>
           <!-- parameter of type 'typedef REAL' -->
           <parameter type-id='type-id-1'/>
           <!-- parameter of type 'Patch*' -->
           <parameter type-id='type-id-179'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -12105,7 +12105,7 @@
           <!-- implicit parameter of type 'Patch*' -->
           <parameter type-id='type-id-179' is-artificial='yes'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -12114,7 +12114,7 @@
           <!-- implicit parameter of type 'Patch*' -->
           <parameter type-id='type-id-179' is-artificial='yes'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -12123,7 +12123,7 @@
           <!-- implicit parameter of type 'Patch*' -->
           <parameter type-id='type-id-179' is-artificial='yes'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -12132,7 +12132,7 @@
           <!-- implicit parameter of type 'Patch*' -->
           <parameter type-id='type-id-179' is-artificial='yes'/>
           <!-- int -->
-          <return type-id='type-id-10'/>
+          <return type-id='type-id-11'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -12141,9 +12141,9 @@
           <!-- implicit parameter of type 'Patch*' -->
           <parameter type-id='type-id-179' is-artificial='yes'/>
           <!-- parameter of type 'int' -->
-          <parameter type-id='type-id-10'/>
+          <parameter type-id='type-id-11'/>
           <!-- int -->
-          <return type-id='type-id-10'/>
+          <return type-id='type-id-11'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -12152,7 +12152,7 @@
           <!-- implicit parameter of type 'Patch*' -->
           <parameter type-id='type-id-179' is-artificial='yes'/>
           <!-- int -->
-          <return type-id='type-id-10'/>
+          <return type-id='type-id-11'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -12161,7 +12161,7 @@
           <!-- implicit parameter of type 'Patch*' -->
           <parameter type-id='type-id-179' is-artificial='yes'/>
           <!-- int -->
-          <return type-id='type-id-10'/>
+          <return type-id='type-id-11'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -12170,7 +12170,7 @@
           <!-- implicit parameter of type 'Patch*' -->
           <parameter type-id='type-id-179' is-artificial='yes'/>
           <!-- int -->
-          <return type-id='type-id-10'/>
+          <return type-id='type-id-11'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -12179,7 +12179,7 @@
           <!-- implicit parameter of type 'Patch*' -->
           <parameter type-id='type-id-179' is-artificial='yes'/>
           <!-- int -->
-          <return type-id='type-id-10'/>
+          <return type-id='type-id-11'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -12188,7 +12188,7 @@
           <!-- implicit parameter of type 'Patch*' -->
           <parameter type-id='type-id-179' is-artificial='yes'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
     </class-decl>
@@ -12198,11 +12198,11 @@
       <base-class access='public' layout-offset-in-bits='0' type-id='type-id-281'/>
       <data-member access='public' layout-offset-in-bits='256'>
         <!-- int Patchspec::order -->
-        <var-decl name='order' type-id='type-id-10' visibility='default' filepath='libnurbs/internals/patch.h' line='55' column='1'/>
+        <var-decl name='order' type-id='type-id-11' visibility='default' filepath='libnurbs/internals/patch.h' line='55' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='288'>
         <!-- int Patchspec::stride -->
-        <var-decl name='stride' type-id='type-id-10' visibility='default' filepath='libnurbs/internals/patch.h' line='56' column='1'/>
+        <var-decl name='stride' type-id='type-id-11' visibility='default' filepath='libnurbs/internals/patch.h' line='56' column='1'/>
       </data-member>
       <member-function access='public'>
         <!-- void Patchspec::clamp(REAL) -->
@@ -12212,7 +12212,7 @@
           <!-- parameter of type 'typedef REAL' -->
           <parameter type-id='type-id-1'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
@@ -12223,7 +12223,7 @@
           <!-- parameter of type 'typedef REAL' -->
           <parameter type-id='type-id-1'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
@@ -12232,7 +12232,7 @@
           <!-- implicit parameter of type 'Patchspec*' -->
           <parameter type-id='type-id-284' is-artificial='yes'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
     </class-decl>
@@ -12287,7 +12287,7 @@
           <!-- parameter of type 'typedef Int' -->
           <parameter type-id='type-id-255'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private' destructor='yes'>
@@ -12296,9 +12296,9 @@
           <!-- implicit parameter of type 'rectBlock*' -->
           <parameter type-id='type-id-286' is-artificial='yes'/>
           <!-- artificial parameter of type 'int' -->
-          <parameter type-id='type-id-10' is-artificial='yes'/>
+          <parameter type-id='type-id-11' is-artificial='yes'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -12352,7 +12352,7 @@
           <!-- implicit parameter of type 'rectBlock*' -->
           <parameter type-id='type-id-286' is-artificial='yes'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -12365,7 +12365,7 @@
           <!-- parameter of type 'Real*' -->
           <parameter type-id='type-id-260'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
     </class-decl>
@@ -12425,7 +12425,7 @@
           <!-- parameter of type 'typedef Real' -->
           <parameter type-id='type-id-253'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private' constructor='yes'>
@@ -12442,7 +12442,7 @@
           <!-- parameter of type 'Real*' -->
           <parameter type-id='type-id-260'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private' destructor='yes'>
@@ -12451,9 +12451,9 @@
           <!-- implicit parameter of type 'gridWrap*' -->
           <parameter type-id='type-id-188' is-artificial='yes'/>
           <!-- artificial parameter of type 'int' -->
-          <parameter type-id='type-id-10' is-artificial='yes'/>
+          <parameter type-id='type-id-11' is-artificial='yes'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -12462,7 +12462,7 @@
           <!-- implicit parameter of type 'gridWrap*' -->
           <parameter type-id='type-id-188' is-artificial='yes'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -12575,7 +12575,7 @@
           <!-- parameter of type 'primStream*' -->
           <parameter type-id='type-id-186'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -12584,7 +12584,7 @@
           <!-- implicit parameter of type 'gridWrap*' -->
           <parameter type-id='type-id-188' is-artificial='yes'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -12619,7 +12619,7 @@
           <!-- parameter of type 'typedef Int' -->
           <parameter type-id='type-id-255'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private' destructor='yes'>
@@ -12628,9 +12628,9 @@
           <!-- implicit parameter of type 'rectBlockArray*' -->
           <parameter type-id='type-id-187' is-artificial='yes'/>
           <!-- artificial parameter of type 'int' -->
-          <parameter type-id='type-id-10' is-artificial='yes'/>
+          <parameter type-id='type-id-11' is-artificial='yes'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -12661,7 +12661,7 @@
           <!-- parameter of type 'rectBlock*' -->
           <parameter type-id='type-id-286'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -12679,7 +12679,7 @@
           <!-- implicit parameter of type 'rectBlockArray*' -->
           <parameter type-id='type-id-187' is-artificial='yes'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -12692,7 +12692,7 @@
           <!-- parameter of type 'Real*' -->
           <parameter type-id='type-id-260'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
     </class-decl>
@@ -12738,7 +12738,7 @@
           <!-- parameter of type 'Int*' -->
           <parameter type-id='type-id-266'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private' destructor='yes'>
@@ -12747,9 +12747,9 @@
           <!-- implicit parameter of type 'gridBoundaryChain*' -->
           <parameter type-id='type-id-287' is-artificial='yes'/>
           <!-- artificial parameter of type 'int' -->
-          <parameter type-id='type-id-10' is-artificial='yes'/>
+          <parameter type-id='type-id-11' is-artificial='yes'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -12857,7 +12857,7 @@
           <!-- parameter of type 'primStream*' -->
           <parameter type-id='type-id-186'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -12870,7 +12870,7 @@
           <!-- parameter of type 'primStream*' -->
           <parameter type-id='type-id-186'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -12894,7 +12894,7 @@
           <!-- implicit parameter of type 'gridBoundaryChain*' -->
           <parameter type-id='type-id-287' is-artificial='yes'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -12903,7 +12903,7 @@
           <!-- implicit parameter of type 'gridBoundaryChain*' -->
           <parameter type-id='type-id-287' is-artificial='yes'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
     </class-decl>
@@ -12925,7 +12925,7 @@
     <class-decl name='Knotspec' size-in-bits='1152' is-struct='yes' visibility='default' filepath='libnurbs/internals/tobezier.cc' line='54' column='1' id='type-id-292'>
       <data-member access='public' layout-offset-in-bits='0'>
         <!-- long int Knotspec::order -->
-        <var-decl name='order' type-id='type-id-12' visibility='default' filepath='libnurbs/internals/tobezier.cc' line='55' column='1'/>
+        <var-decl name='order' type-id='type-id-15' visibility='default' filepath='libnurbs/internals/tobezier.cc' line='55' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
         <!-- Knot_ptr Knotspec::inkbegin -->
@@ -12973,35 +12973,35 @@
       </data-member>
       <data-member access='public' layout-offset-in-bits='768'>
         <!-- int Knotspec::ncoords -->
-        <var-decl name='ncoords' type-id='type-id-10' visibility='default' filepath='libnurbs/internals/tobezier.cc' line='67' column='1'/>
+        <var-decl name='ncoords' type-id='type-id-11' visibility='default' filepath='libnurbs/internals/tobezier.cc' line='67' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='800'>
         <!-- int Knotspec::prestride -->
-        <var-decl name='prestride' type-id='type-id-10' visibility='default' filepath='libnurbs/internals/tobezier.cc' line='68' column='1'/>
+        <var-decl name='prestride' type-id='type-id-11' visibility='default' filepath='libnurbs/internals/tobezier.cc' line='68' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='832'>
         <!-- int Knotspec::poststride -->
-        <var-decl name='poststride' type-id='type-id-10' visibility='default' filepath='libnurbs/internals/tobezier.cc' line='69' column='1'/>
+        <var-decl name='poststride' type-id='type-id-11' visibility='default' filepath='libnurbs/internals/tobezier.cc' line='69' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='864'>
         <!-- int Knotspec::preoffset -->
-        <var-decl name='preoffset' type-id='type-id-10' visibility='default' filepath='libnurbs/internals/tobezier.cc' line='70' column='1'/>
+        <var-decl name='preoffset' type-id='type-id-11' visibility='default' filepath='libnurbs/internals/tobezier.cc' line='70' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='896'>
         <!-- int Knotspec::postoffset -->
-        <var-decl name='postoffset' type-id='type-id-10' visibility='default' filepath='libnurbs/internals/tobezier.cc' line='71' column='1'/>
+        <var-decl name='postoffset' type-id='type-id-11' visibility='default' filepath='libnurbs/internals/tobezier.cc' line='71' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='928'>
         <!-- int Knotspec::prewidth -->
-        <var-decl name='prewidth' type-id='type-id-10' visibility='default' filepath='libnurbs/internals/tobezier.cc' line='72' column='1'/>
+        <var-decl name='prewidth' type-id='type-id-11' visibility='default' filepath='libnurbs/internals/tobezier.cc' line='72' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='960'>
         <!-- int Knotspec::postwidth -->
-        <var-decl name='postwidth' type-id='type-id-10' visibility='default' filepath='libnurbs/internals/tobezier.cc' line='73' column='1'/>
+        <var-decl name='postwidth' type-id='type-id-11' visibility='default' filepath='libnurbs/internals/tobezier.cc' line='73' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='992'>
         <!-- int Knotspec::istransformed -->
-        <var-decl name='istransformed' type-id='type-id-10' visibility='default' filepath='libnurbs/internals/tobezier.cc' line='74' column='1'/>
+        <var-decl name='istransformed' type-id='type-id-11' visibility='default' filepath='libnurbs/internals/tobezier.cc' line='74' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1024'>
         <!-- Knotspec* Knotspec::next -->
@@ -13017,7 +13017,7 @@
           <!-- implicit parameter of type 'Knotspec*' -->
           <parameter type-id='type-id-295' is-artificial='yes'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public' destructor='yes'>
@@ -13026,9 +13026,9 @@
           <!-- implicit parameter of type 'Knotspec*' -->
           <parameter type-id='type-id-295' is-artificial='yes'/>
           <!-- artificial parameter of type 'int' -->
-          <parameter type-id='type-id-10' is-artificial='yes'/>
+          <parameter type-id='type-id-11' is-artificial='yes'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
@@ -13037,7 +13037,7 @@
           <!-- implicit parameter of type 'Knotspec*' -->
           <parameter type-id='type-id-295' is-artificial='yes'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
@@ -13046,9 +13046,9 @@
           <!-- implicit parameter of type 'Knotspec*' -->
           <parameter type-id='type-id-295' is-artificial='yes'/>
           <!-- parameter of type 'REAL*' -->
-          <parameter type-id='type-id-13'/>
+          <parameter type-id='type-id-16'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
@@ -13057,7 +13057,7 @@
           <!-- implicit parameter of type 'Knotspec*' -->
           <parameter type-id='type-id-295' is-artificial='yes'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
@@ -13066,7 +13066,7 @@
           <!-- implicit parameter of type 'Knotspec*' -->
           <parameter type-id='type-id-295' is-artificial='yes'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
@@ -13077,9 +13077,9 @@
           <!-- parameter of type 'float*' -->
           <parameter type-id='type-id-59'/>
           <!-- parameter of type 'REAL*' -->
-          <parameter type-id='type-id-13'/>
+          <parameter type-id='type-id-16'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
@@ -13088,7 +13088,7 @@
           <!-- implicit parameter of type 'Knotspec*' -->
           <parameter type-id='type-id-295' is-artificial='yes'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
@@ -13097,7 +13097,7 @@
           <!-- implicit parameter of type 'Knotspec*' -->
           <parameter type-id='type-id-295' is-artificial='yes'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
@@ -13106,9 +13106,9 @@
           <!-- implicit parameter of type 'Knotspec*' -->
           <parameter type-id='type-id-295' is-artificial='yes'/>
           <!-- parameter of type 'REAL*' -->
-          <parameter type-id='type-id-13'/>
+          <parameter type-id='type-id-16'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
@@ -13117,9 +13117,9 @@
           <!-- implicit parameter of type 'Knotspec*' -->
           <parameter type-id='type-id-295' is-artificial='yes'/>
           <!-- parameter of type 'REAL*' -->
-          <parameter type-id='type-id-13'/>
+          <parameter type-id='type-id-16'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
@@ -13128,11 +13128,11 @@
           <!-- implicit parameter of type 'Knotspec*' -->
           <parameter type-id='type-id-295' is-artificial='yes'/>
           <!-- parameter of type 'REAL*' -->
-          <parameter type-id='type-id-13'/>
+          <parameter type-id='type-id-16'/>
           <!-- parameter of type 'float*' -->
           <parameter type-id='type-id-59'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
@@ -13141,11 +13141,11 @@
           <!-- implicit parameter of type 'Knotspec*' -->
           <parameter type-id='type-id-295' is-artificial='yes'/>
           <!-- parameter of type 'REAL*' -->
-          <parameter type-id='type-id-13'/>
+          <parameter type-id='type-id-16'/>
           <!-- parameter of type 'REAL*' -->
-          <parameter type-id='type-id-13'/>
+          <parameter type-id='type-id-16'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
@@ -13154,22 +13154,22 @@
           <!-- implicit parameter of type 'Knotspec*' -->
           <parameter type-id='type-id-295' is-artificial='yes'/>
           <!-- parameter of type 'REAL*' -->
-          <parameter type-id='type-id-13'/>
+          <parameter type-id='type-id-16'/>
           <!-- parameter of type 'REAL*' -->
-          <parameter type-id='type-id-13'/>
+          <parameter type-id='type-id-16'/>
           <!-- parameter of type 'REAL*' -->
-          <parameter type-id='type-id-13'/>
+          <parameter type-id='type-id-16'/>
           <!-- parameter of type 'typedef Knot' -->
           <parameter type-id='type-id-233'/>
           <!-- parameter of type 'typedef Knot' -->
           <parameter type-id='type-id-233'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
     </class-decl>
     <!-- typedef REAL* Knot_ptr -->
-    <typedef-decl name='Knot_ptr' type-id='type-id-13' filepath='libnurbs/internals/types.h' line='45' column='1' id='type-id-293'/>
+    <typedef-decl name='Knot_ptr' type-id='type-id-16' filepath='libnurbs/internals/types.h' line='45' column='1' id='type-id-293'/>
     <!-- struct Breakpt -->
     <class-decl name='Breakpt' size-in-bits='96' is-struct='yes' visibility='default' filepath='libnurbs/internals/tobezier.cc' line='48' column='1' id='type-id-296'>
       <data-member access='public' layout-offset-in-bits='0'>
@@ -13178,11 +13178,11 @@
       </data-member>
       <data-member access='public' layout-offset-in-bits='32'>
         <!-- int Breakpt::multi -->
-        <var-decl name='multi' type-id='type-id-10' visibility='default' filepath='libnurbs/internals/tobezier.cc' line='50' column='1'/>
+        <var-decl name='multi' type-id='type-id-11' visibility='default' filepath='libnurbs/internals/tobezier.cc' line='50' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
         <!-- int Breakpt::def -->
-        <var-decl name='def' type-id='type-id-10' visibility='default' filepath='libnurbs/internals/tobezier.cc' line='51' column='1'/>
+        <var-decl name='def' type-id='type-id-11' visibility='default' filepath='libnurbs/internals/tobezier.cc' line='51' column='1'/>
       </data-member>
     </class-decl>
     <!-- struct Splinespec -->
@@ -13193,11 +13193,11 @@
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
         <!-- int Splinespec::dim -->
-        <var-decl name='dim' type-id='type-id-10' visibility='default' filepath='libnurbs/internals/tobezier.cc' line='99' column='1'/>
+        <var-decl name='dim' type-id='type-id-11' visibility='default' filepath='libnurbs/internals/tobezier.cc' line='99' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
         <!-- REAL* Splinespec::outcpts -->
-        <var-decl name='outcpts' type-id='type-id-13' visibility='default' filepath='libnurbs/internals/tobezier.cc' line='100' column='1'/>
+        <var-decl name='outcpts' type-id='type-id-16' visibility='default' filepath='libnurbs/internals/tobezier.cc' line='100' column='1'/>
       </data-member>
       <member-function access='public' constructor='yes'>
         <!-- Splinespec::Splinespec(int) -->
@@ -13205,9 +13205,9 @@
           <!-- implicit parameter of type 'Splinespec*' -->
           <parameter type-id='type-id-298' is-artificial='yes'/>
           <!-- parameter of type 'int' -->
-          <parameter type-id='type-id-10'/>
+          <parameter type-id='type-id-11'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public' destructor='yes'>
@@ -13216,9 +13216,9 @@
           <!-- implicit parameter of type 'Splinespec*' -->
           <parameter type-id='type-id-298' is-artificial='yes'/>
           <!-- parameter of type 'int' -->
-          <parameter type-id='type-id-10'/>
+          <parameter type-id='type-id-11'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
@@ -13229,7 +13229,7 @@
           <!-- parameter of type 'Knotvector&' -->
           <parameter type-id='type-id-166'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
@@ -13242,7 +13242,7 @@
           <!-- parameter of type 'Knotvector&' -->
           <parameter type-id='type-id-166'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
@@ -13251,7 +13251,7 @@
           <!-- implicit parameter of type 'Splinespec*' -->
           <parameter type-id='type-id-298' is-artificial='yes'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
@@ -13260,9 +13260,9 @@
           <!-- implicit parameter of type 'Splinespec*' -->
           <parameter type-id='type-id-298' is-artificial='yes'/>
           <!-- parameter of type 'long int' -->
-          <parameter type-id='type-id-12'/>
+          <parameter type-id='type-id-15'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
@@ -13273,7 +13273,7 @@
           <!-- parameter of type 'typedef Quilt_ptr' -->
           <parameter type-id='type-id-299'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
@@ -13284,7 +13284,7 @@
           <!-- parameter of type 'float*' -->
           <parameter type-id='type-id-59'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
@@ -13293,7 +13293,7 @@
           <!-- implicit parameter of type 'Splinespec*' -->
           <parameter type-id='type-id-298' is-artificial='yes'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
     </class-decl>
@@ -13313,7 +13313,7 @@
       <subrange length='1000' type-id='type-id-3' id='type-id-301'/>
     </array-type-def>
     <!-- long int[1000] -->
-    <array-type-def dimensions='1' type-id='type-id-12' size-in-bits='64000' id='type-id-302'>
+    <array-type-def dimensions='1' type-id='type-id-15' size-in-bits='64000' id='type-id-302'>
       <!-- <anonymous range>[1000] -->
       <subrange length='1000' type-id='type-id-3' id='type-id-301'/>
     </array-type-def>
@@ -13321,7 +13321,7 @@
     <class-decl name='Varray' size-in-bits='96192' visibility='default' filepath='libnurbs/internals/varray.h' line='43' column='1' id='type-id-303'>
       <data-member access='private' layout-offset-in-bits='0'>
         <!-- REAL* Varray::varray -->
-        <var-decl name='varray' type-id='type-id-13' visibility='default' filepath='libnurbs/internals/varray.h' line='48' column='1'/>
+        <var-decl name='varray' type-id='type-id-16' visibility='default' filepath='libnurbs/internals/varray.h' line='48' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='64'>
         <!-- REAL Varray::vval[1000] -->
@@ -13333,11 +13333,11 @@
       </data-member>
       <data-member access='private' layout-offset-in-bits='96064'>
         <!-- long int Varray::numquads -->
-        <var-decl name='numquads' type-id='type-id-12' visibility='default' filepath='libnurbs/internals/varray.h' line='51' column='1'/>
+        <var-decl name='numquads' type-id='type-id-15' visibility='default' filepath='libnurbs/internals/varray.h' line='51' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='96128'>
         <!-- long int Varray::size -->
-        <var-decl name='size' type-id='type-id-12' visibility='default' filepath='libnurbs/internals/varray.h' line='54' column='1'/>
+        <var-decl name='size' type-id='type-id-15' visibility='default' filepath='libnurbs/internals/varray.h' line='54' column='1'/>
       </data-member>
       <member-function access='private' constructor='yes'>
         <!-- Varray::Varray() -->
@@ -13345,7 +13345,7 @@
           <!-- implicit parameter of type 'Varray*' -->
           <parameter type-id='type-id-304' is-artificial='yes'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private' destructor='yes'>
@@ -13354,9 +13354,9 @@
           <!-- implicit parameter of type 'Varray*' -->
           <parameter type-id='type-id-304' is-artificial='yes'/>
           <!-- artificial parameter of type 'int' -->
-          <parameter type-id='type-id-10' is-artificial='yes'/>
+          <parameter type-id='type-id-11' is-artificial='yes'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -13371,7 +13371,7 @@
           <!-- parameter of type 'Arc*' -->
           <parameter type-id='type-id-116'/>
           <!-- long int -->
-          <return type-id='type-id-12'/>
+          <return type-id='type-id-15'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -13386,7 +13386,7 @@
           <!-- parameter of type 'typedef REAL' -->
           <parameter type-id='type-id-1'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -13395,9 +13395,9 @@
           <!-- implicit parameter of type 'Varray*' -->
           <parameter type-id='type-id-304' is-artificial='yes'/>
           <!-- parameter of type 'long int' -->
-          <parameter type-id='type-id-12'/>
+          <parameter type-id='type-id-15'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -13408,14 +13408,14 @@
           <!-- parameter of type 'typedef REAL' -->
           <parameter type-id='type-id-1'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
     </class-decl>
     <!-- Varray* -->
     <pointer-type-def type-id='type-id-303' size-in-bits='64' id='type-id-304'/>
     <!-- long int* -->
-    <pointer-type-def type-id='type-id-12' size-in-bits='64' id='type-id-305'/>
+    <pointer-type-def type-id='type-id-15' size-in-bits='64' id='type-id-305'/>
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='libnurbs/nurbtess/directedLine.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-T0fsxk/Mesa-8.0.5/src/glu/sgi' language='LANG_C_plus_plus'>
     <!-- short int -->
@@ -13442,7 +13442,7 @@
           <!-- parameter of type 'typedef Int' -->
           <parameter type-id='type-id-255'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private' constructor='yes'>
@@ -13455,7 +13455,7 @@
           <!-- parameter of type 'Real[2]*' -->
           <parameter type-id='type-id-259'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private' constructor='yes'>
@@ -13468,7 +13468,7 @@
           <!-- parameter of type 'Real*' -->
           <parameter type-id='type-id-260'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private' constructor='yes'>
@@ -13477,7 +13477,7 @@
           <!-- implicit parameter of type 'sampledLine*' -->
           <parameter type-id='type-id-308' is-artificial='yes'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private' destructor='yes'>
@@ -13486,9 +13486,9 @@
           <!-- implicit parameter of type 'sampledLine*' -->
           <parameter type-id='type-id-308' is-artificial='yes'/>
           <!-- artificial parameter of type 'int' -->
-          <parameter type-id='type-id-10' is-artificial='yes'/>
+          <parameter type-id='type-id-11' is-artificial='yes'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -13501,7 +13501,7 @@
           <!-- parameter of type 'Real2*' -->
           <parameter type-id='type-id-262'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -13514,7 +13514,7 @@
           <!-- parameter of type 'Real*' -->
           <parameter type-id='type-id-260'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -13534,7 +13534,7 @@
           <!-- implicit parameter of type 'sampledLine*' -->
           <parameter type-id='type-id-308' is-artificial='yes'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -13565,7 +13565,7 @@
           <!-- parameter of type 'typedef Real' -->
           <parameter type-id='type-id-253'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -13578,7 +13578,7 @@
           <!-- parameter of type 'typedef Real' -->
           <parameter type-id='type-id-253'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -13587,7 +13587,7 @@
           <!-- implicit parameter of type 'sampledLine*' -->
           <parameter type-id='type-id-308' is-artificial='yes'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
     </class-decl>
@@ -13631,7 +13631,7 @@
           <!-- parameter of type 'sampledLine*' -->
           <parameter type-id='type-id-308'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private' constructor='yes'>
@@ -13640,7 +13640,7 @@
           <!-- implicit parameter of type 'directedLine*' -->
           <parameter type-id='type-id-310' is-artificial='yes'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private' destructor='yes'>
@@ -13649,9 +13649,9 @@
           <!-- implicit parameter of type 'directedLine*' -->
           <parameter type-id='type-id-310' is-artificial='yes'/>
           <!-- artificial parameter of type 'int' -->
-          <parameter type-id='type-id-10' is-artificial='yes'/>
+          <parameter type-id='type-id-11' is-artificial='yes'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -13664,7 +13664,7 @@
           <!-- parameter of type 'sampledLine*' -->
           <parameter type-id='type-id-308'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -13758,7 +13758,7 @@
           <!-- parameter of type 'short int' -->
           <parameter type-id='type-id-306'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -13769,7 +13769,7 @@
           <!-- parameter of type 'directedLine*' -->
           <parameter type-id='type-id-310'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -13780,7 +13780,7 @@
           <!-- parameter of type 'directedLine*' -->
           <parameter type-id='type-id-310'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -13791,7 +13791,7 @@
           <!-- parameter of type 'directedLine*' -->
           <parameter type-id='type-id-310'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -13800,7 +13800,7 @@
           <!-- implicit parameter of type 'directedLine*' -->
           <parameter type-id='type-id-310' is-artificial='yes'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -13809,7 +13809,7 @@
           <!-- implicit parameter of type 'directedLine*' -->
           <parameter type-id='type-id-310' is-artificial='yes'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -13818,7 +13818,7 @@
           <!-- implicit parameter of type 'directedLine*' -->
           <parameter type-id='type-id-310' is-artificial='yes'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -13827,7 +13827,7 @@
           <!-- implicit parameter of type 'directedLine*' -->
           <parameter type-id='type-id-310' is-artificial='yes'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -13838,7 +13838,7 @@
           <!-- parameter of type 'directedLine*' -->
           <parameter type-id='type-id-310'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -13961,7 +13961,7 @@
           <!-- implicit parameter of type 'directedLine*' -->
           <parameter type-id='type-id-310' is-artificial='yes'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -13970,7 +13970,7 @@
           <!-- implicit parameter of type 'directedLine*' -->
           <parameter type-id='type-id-310' is-artificial='yes'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -13979,7 +13979,7 @@
           <!-- implicit parameter of type 'directedLine*' -->
           <parameter type-id='type-id-310' is-artificial='yes'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -13990,7 +13990,7 @@
           <!-- parameter of type 'char*' -->
           <parameter type-id='type-id-107'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -14057,7 +14057,7 @@
           <!-- parameter of type 'directedLine*' -->
           <parameter type-id='type-id-310'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -14076,7 +14076,7 @@
           <!-- parameter of type 'directedLine*' -->
           <parameter type-id='type-id-310'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -14098,7 +14098,7 @@
           <!-- implicit parameter of type 'directedLine*' -->
           <parameter type-id='type-id-310' is-artificial='yes'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -14107,7 +14107,7 @@
           <!-- implicit parameter of type 'directedLine*' -->
           <parameter type-id='type-id-310' is-artificial='yes'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -14127,7 +14127,7 @@
           <!-- parameter of type 'directedLine*' -->
           <parameter type-id='type-id-310'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -14160,7 +14160,7 @@
     <!-- directedLine** -->
     <pointer-type-def type-id='type-id-310' size-in-bits='64' id='type-id-312'/>
     <!-- int& -->
-    <reference-type-def kind='lvalue' type-id='type-id-10' size-in-bits='64' id='type-id-311'/>
+    <reference-type-def kind='lvalue' type-id='type-id-11' size-in-bits='64' id='type-id-311'/>
     <!-- sampledLine* -->
     <pointer-type-def type-id='type-id-307' size-in-bits='64' id='type-id-308'/>
     <!-- sampledLine** -->
@@ -14231,7 +14231,7 @@
           <!-- parameter of type 'directedLine*' -->
           <parameter type-id='type-id-310'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private' destructor='yes'>
@@ -14240,9 +14240,9 @@
           <!-- implicit parameter of type 'monoChain*' -->
           <parameter type-id='type-id-316' is-artificial='yes'/>
           <!-- artificial parameter of type 'int' -->
-          <parameter type-id='type-id-10' is-artificial='yes'/>
+          <parameter type-id='type-id-11' is-artificial='yes'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -14253,7 +14253,7 @@
           <!-- parameter of type 'monoChain*' -->
           <parameter type-id='type-id-316'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -14264,7 +14264,7 @@
           <!-- parameter of type 'monoChain*' -->
           <parameter type-id='type-id-316'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -14275,7 +14275,7 @@
           <!-- parameter of type 'monoChain*' -->
           <parameter type-id='type-id-316'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -14320,7 +14320,7 @@
           <!-- implicit parameter of type 'monoChain*' -->
           <parameter type-id='type-id-316' is-artificial='yes'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -14329,7 +14329,7 @@
           <!-- implicit parameter of type 'monoChain*' -->
           <parameter type-id='type-id-316' is-artificial='yes'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -14338,7 +14338,7 @@
           <!-- implicit parameter of type 'monoChain*' -->
           <parameter type-id='type-id-316' is-artificial='yes'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -14349,7 +14349,7 @@
           <!-- parameter of type 'monoChain*' -->
           <parameter type-id='type-id-316'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -14422,7 +14422,7 @@
           <!-- implicit parameter of type 'monoChain*' -->
           <parameter type-id='type-id-316' is-artificial='yes'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -14431,7 +14431,7 @@
           <!-- implicit parameter of type 'monoChain*' -->
           <parameter type-id='type-id-316' is-artificial='yes'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -14440,7 +14440,7 @@
           <!-- implicit parameter of type 'monoChain*' -->
           <parameter type-id='type-id-316' is-artificial='yes'/>
           <!-- void -->
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
     </class-decl>
@@ -14482,16 +14482,16 @@
       <subrange length='1' type-id='type-id-3' id='type-id-325'/>
     </array-type-def>
     <!-- float -->
-    <type-decl name='float' size-in-bits='32' id='type-id-30'/>
+    <type-decl name='float' size-in-bits='32' id='type-id-33'/>
     <!-- long int -->
-    <type-decl name='long int' size-in-bits='64' id='type-id-12'/>
+    <type-decl name='long int' size-in-bits='64' id='type-id-15'/>
     <!-- long int[8] -->
-    <array-type-def dimensions='1' type-id='type-id-12' size-in-bits='512' id='type-id-326'>
+    <array-type-def dimensions='1' type-id='type-id-15' size-in-bits='512' id='type-id-326'>
       <!-- <anonymous range>[8] -->
       <subrange length='8' type-id='type-id-3' id='type-id-327'/>
     </array-type-def>
     <!-- unnamed&#45;enum&#45;underlying&#45;type -->
-    <type-decl name='unnamed-enum-underlying-type' is-anonymous='yes' size-in-bits='32' alignment-in-bits='32' id='type-id-38'/>
+    <type-decl name='unnamed-enum-underlying-type' is-anonymous='yes' size-in-bits='32' alignment-in-bits='32' id='type-id-9'/>
     <!-- unsigned long int -->
     <type-decl name='unsigned long int' size-in-bits='64' id='type-id-3'/>
     <!-- unsigned long int[16] -->
@@ -14517,7 +14517,7 @@
       </data-member>
       <data-member access='public' layout-offset-in-bits='192'>
         <!-- void (typedef GLenum)* GLUtesselator::callError -->
-        <var-decl name='callError' type-id='type-id-16' visibility='default' filepath='libtess/tess.h' line='69' column='1'/>
+        <var-decl name='callError' type-id='type-id-19' visibility='default' filepath='libtess/tess.h' line='69' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='256'>
         <!-- GLdouble GLUtesselator::normal[3] -->
@@ -14537,7 +14537,7 @@
       </data-member>
       <data-member access='public' layout-offset-in-bits='896'>
         <!-- GLenum GLUtesselator::windingRule -->
-        <var-decl name='windingRule' type-id='type-id-25' visibility='default' filepath='libtess/tess.h' line='80' column='1'/>
+        <var-decl name='windingRule' type-id='type-id-28' visibility='default' filepath='libtess/tess.h' line='80' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='928'>
         <!-- GLboolean GLUtesselator::fatalError -->
@@ -14573,7 +14573,7 @@
       </data-member>
       <data-member access='public' layout-offset-in-bits='1344'>
         <!-- void (typedef GLenum)* GLUtesselator::callBegin -->
-        <var-decl name='callBegin' type-id='type-id-16' visibility='default' filepath='libtess/tess.h' line='97' column='1'/>
+        <var-decl name='callBegin' type-id='type-id-19' visibility='default' filepath='libtess/tess.h' line='97' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1408'>
         <!-- void (typedef GLboolean)* GLUtesselator::callEdgeFlag -->
@@ -14581,11 +14581,11 @@
       </data-member>
       <data-member access='public' layout-offset-in-bits='1472'>
         <!-- void (void*)* GLUtesselator::callVertex -->
-        <var-decl name='callVertex' type-id='type-id-20' visibility='default' filepath='libtess/tess.h' line='99' column='1'/>
+        <var-decl name='callVertex' type-id='type-id-23' visibility='default' filepath='libtess/tess.h' line='99' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1536'>
         <!-- void ()* GLUtesselator::callEnd -->
-        <var-decl name='callEnd' type-id='type-id-17' visibility='default' filepath='libtess/tess.h' line='100' column='1'/>
+        <var-decl name='callEnd' type-id='type-id-20' visibility='default' filepath='libtess/tess.h' line='100' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1600'>
         <!-- void (GLUmesh*)* GLUtesselator::callMesh -->
@@ -14597,7 +14597,7 @@
       </data-member>
       <data-member access='public' layout-offset-in-bits='1696'>
         <!-- int GLUtesselator::cacheCount -->
-        <var-decl name='cacheCount' type-id='type-id-10' visibility='default' filepath='libtess/tess.h' line='107' column='1'/>
+        <var-decl name='cacheCount' type-id='type-id-11' visibility='default' filepath='libtess/tess.h' line='107' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1728'>
         <!-- CachedVertex GLUtesselator::cache[100] -->
@@ -14605,7 +14605,7 @@
       </data-member>
       <data-member access='public' layout-offset-in-bits='27328'>
         <!-- void (typedef GLenum, void*)* GLUtesselator::callBeginData -->
-        <var-decl name='callBeginData' type-id='type-id-19' visibility='default' filepath='libtess/tess.h' line='111' column='1'/>
+        <var-decl name='callBeginData' type-id='type-id-22' visibility='default' filepath='libtess/tess.h' line='111' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='27392'>
         <!-- void (typedef GLboolean, void*)* GLUtesselator::callEdgeFlagData -->
@@ -14617,11 +14617,11 @@
       </data-member>
       <data-member access='public' layout-offset-in-bits='27520'>
         <!-- void (void*)* GLUtesselator::callEndData -->
-        <var-decl name='callEndData' type-id='type-id-20' visibility='default' filepath='libtess/tess.h' line='115' column='1'/>
+        <var-decl name='callEndData' type-id='type-id-23' visibility='default' filepath='libtess/tess.h' line='115' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='27584'>
         <!-- void (typedef GLenum, void*)* GLUtesselator::callErrorData -->
-        <var-decl name='callErrorData' type-id='type-id-19' visibility='default' filepath='libtess/tess.h' line='116' column='1'/>
+        <var-decl name='callErrorData' type-id='type-id-22' visibility='default' filepath='libtess/tess.h' line='116' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='27648'>
         <!-- void (GLdouble*, void**, GLfloat*, void**, void*)* GLUtesselator::callCombineData -->
@@ -14633,12 +14633,12 @@
       </data-member>
       <data-member access='public' layout-offset-in-bits='29312'>
         <!-- void* GLUtesselator::polygonData -->
-        <var-decl name='polygonData' type-id='type-id-22' visibility='default' filepath='libtess/tess.h' line='123' column='1'/>
+        <var-decl name='polygonData' type-id='type-id-25' visibility='default' filepath='libtess/tess.h' line='123' column='1'/>
       </data-member>
     </class-decl>
     <!-- enum TessState -->
     <enum-decl name='TessState' filepath='libtess/tess.h' line='47' column='1' id='type-id-332'>
-      <underlying-type type-id='type-id-38'/>
+      <underlying-type type-id='type-id-9'/>
       <enumerator name='T_DORMANT' value='0'/>
       <enumerator name='T_IN_POLYGON' value='1'/>
       <enumerator name='T_IN_CONTOUR' value='2'/>
@@ -14675,7 +14675,7 @@
       </data-member>
       <data-member access='public' layout-offset-in-bits='448'>
         <!-- int GLUhalfEdge::winding -->
-        <var-decl name='winding' type-id='type-id-10' visibility='default' filepath='libtess/mesh.h' line='148' column='1'/>
+        <var-decl name='winding' type-id='type-id-11' visibility='default' filepath='libtess/mesh.h' line='148' column='1'/>
       </data-member>
     </class-decl>
     <!-- typedef GLUhalfEdge GLUhalfEdge -->
@@ -14696,7 +14696,7 @@
       </data-member>
       <data-member access='public' layout-offset-in-bits='192'>
         <!-- void* GLUvertex::data -->
-        <var-decl name='data' type-id='type-id-22' visibility='default' filepath='libtess/mesh.h' line='118' column='1'/>
+        <var-decl name='data' type-id='type-id-25' visibility='default' filepath='libtess/mesh.h' line='118' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='256'>
         <!-- GLdouble GLUvertex::coords[3] -->
@@ -14712,7 +14712,7 @@
       </data-member>
       <data-member access='public' layout-offset-in-bits='576'>
         <!-- long int GLUvertex::pqHandle -->
-        <var-decl name='pqHandle' type-id='type-id-12' visibility='default' filepath='libtess/mesh.h' line='123' column='1'/>
+        <var-decl name='pqHandle' type-id='type-id-15' visibility='default' filepath='libtess/mesh.h' line='123' column='1'/>
       </data-member>
     </class-decl>
     <!-- typedef GLUvertex GLUvertex -->
@@ -14733,7 +14733,7 @@
       </data-member>
       <data-member access='public' layout-offset-in-bits='192'>
         <!-- void* GLUface::data -->
-        <var-decl name='data' type-id='type-id-22' visibility='default' filepath='libtess/mesh.h' line='130' column='1'/>
+        <var-decl name='data' type-id='type-id-25' visibility='default' filepath='libtess/mesh.h' line='130' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='256'>
         <!-- GLUface* GLUface::trail -->
@@ -14764,7 +14764,7 @@
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
         <!-- int ActiveRegion::windingNumber -->
-        <var-decl name='windingNumber' type-id='type-id-10' visibility='default' filepath='libtess/sweep.h' line='62' column='1'/>
+        <var-decl name='windingNumber' type-id='type-id-11' visibility='default' filepath='libtess/sweep.h' line='62' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='160'>
         <!-- GLboolean ActiveRegion::inside -->
@@ -14799,7 +14799,7 @@
       </data-member>
     </class-decl>
     <!-- typedef void* DictListKey -->
-    <typedef-decl name='DictListKey' type-id='type-id-22' filepath='libtess/dict.h' line='60' column='1' id='type-id-356'/>
+    <typedef-decl name='DictListKey' type-id='type-id-25' filepath='libtess/dict.h' line='60' column='1' id='type-id-356'/>
     <!-- typedef DictListNode DictListNode -->
     <typedef-decl name='DictListNode' type-id='type-id-355' filepath='libtess/dict.h' line='62' column='1' id='type-id-357'/>
     <!-- typedef GLUmesh GLUmesh -->
@@ -14831,7 +14831,7 @@
       </data-member>
       <data-member access='public' layout-offset-in-bits='512'>
         <!-- int __jmp_buf_tag::__mask_was_saved -->
-        <var-decl name='__mask_was_saved' type-id='type-id-10' visibility='default' filepath='/usr/include/setjmp.h' line='42' column='1'/>
+        <var-decl name='__mask_was_saved' type-id='type-id-11' visibility='default' filepath='/usr/include/setjmp.h' line='42' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='576'>
         <!-- __sigset_t __jmp_buf_tag::__saved_mask -->
@@ -14848,7 +14848,7 @@
       </data-member>
       <data-member access='public' layout-offset-in-bits='192'>
         <!-- void* DictList::frame -->
-        <var-decl name='frame' type-id='type-id-22' visibility='default' filepath='libtess/dict.h' line='96' column='1'/>
+        <var-decl name='frame' type-id='type-id-25' visibility='default' filepath='libtess/dict.h' line='96' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='256'>
         <!-- int (void*, typedef DictListKey, typedef DictListKey)* DictList::leq -->
@@ -14881,7 +14881,7 @@
       </data-member>
       <data-member access='public' layout-offset-in-bits='320'>
         <!-- int PriorityQSort::initialized -->
-        <var-decl name='initialized' type-id='type-id-10' visibility='default' filepath='libtess/priorityq.h' line='102' column='1'/>
+        <var-decl name='initialized' type-id='type-id-11' visibility='default' filepath='libtess/priorityq.h' line='102' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='384'>
         <!-- int (typedef PQSortKey, typedef PQSortKey)* PriorityQSort::leq -->
@@ -14902,11 +14902,11 @@
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
         <!-- long int PriorityQHeap::size -->
-        <var-decl name='size' type-id='type-id-12' visibility='default' filepath='libtess/priorityq-heap.h' line='89' column='1'/>
+        <var-decl name='size' type-id='type-id-15' visibility='default' filepath='libtess/priorityq-heap.h' line='89' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='192'>
         <!-- long int PriorityQHeap::max -->
-        <var-decl name='max' type-id='type-id-12' visibility='default' filepath='libtess/priorityq-heap.h' line='89' column='1'/>
+        <var-decl name='max' type-id='type-id-15' visibility='default' filepath='libtess/priorityq-heap.h' line='89' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='256'>
         <!-- PQHeapHandle PriorityQHeap::freeList -->
@@ -14914,7 +14914,7 @@
       </data-member>
       <data-member access='public' layout-offset-in-bits='320'>
         <!-- int PriorityQHeap::initialized -->
-        <var-decl name='initialized' type-id='type-id-10' visibility='default' filepath='libtess/priorityq-heap.h' line='91' column='1'/>
+        <var-decl name='initialized' type-id='type-id-11' visibility='default' filepath='libtess/priorityq-heap.h' line='91' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='384'>
         <!-- int (typedef PQHeapKey, typedef PQHeapKey)* PriorityQHeap::leq -->
@@ -14931,7 +14931,7 @@
       </data-member>
     </class-decl>
     <!-- typedef long int PQHeapHandle -->
-    <typedef-decl name='PQHeapHandle' type-id='type-id-12' filepath='libtess/priorityq-heap.h' line='80' column='1' id='type-id-376'/>
+    <typedef-decl name='PQHeapHandle' type-id='type-id-15' filepath='libtess/priorityq-heap.h' line='80' column='1' id='type-id-376'/>
     <!-- typedef __anonymous_struct__1 PQhandleElem -->
     <typedef-decl name='PQhandleElem' type-id='type-id-380' filepath='libtess/priorityq-heap.h' line='84' column='1' id='type-id-381'/>
     <!-- struct {PQHeapKey key; PQHeapHandle node;} -->
@@ -14946,13 +14946,13 @@
       </data-member>
     </class-decl>
     <!-- typedef void* PQHeapKey -->
-    <typedef-decl name='PQHeapKey' type-id='type-id-22' filepath='libtess/priorityq-heap.h' line='79' column='1' id='type-id-382'/>
+    <typedef-decl name='PQHeapKey' type-id='type-id-25' filepath='libtess/priorityq-heap.h' line='79' column='1' id='type-id-382'/>
     <!-- typedef PQHeapKey PQSortKey -->
     <typedef-decl name='PQSortKey' type-id='type-id-382' filepath='libtess/priorityq.h' line='93' column='1' id='type-id-383'/>
     <!-- typedef PQHeapHandle PQSortHandle -->
     <typedef-decl name='PQSortHandle' type-id='type-id-376' filepath='libtess/priorityq.h' line='94' column='1' id='type-id-370'/>
     <!-- typedef float GLfloat -->
-    <typedef-decl name='GLfloat' type-id='type-id-30' filepath='../../../include/GL/gl.h' line='160' column='1' id='type-id-33'/>
+    <typedef-decl name='GLfloat' type-id='type-id-33' filepath='../../../include/GL/gl.h' line='160' column='1' id='type-id-35'/>
     <!-- typedef CachedVertex CachedVertex -->
     <typedef-decl name='CachedVertex' type-id='type-id-384' filepath='libtess/tess.h' line='57' column='1' id='type-id-318'/>
     <!-- struct CachedVertex -->
@@ -14963,7 +14963,7 @@
       </data-member>
       <data-member access='public' layout-offset-in-bits='192'>
         <!-- void* CachedVertex::data -->
-        <var-decl name='data' type-id='type-id-22' visibility='default' filepath='libtess/tess.h' line='56' column='1'/>
+        <var-decl name='data' type-id='type-id-25' visibility='default' filepath='libtess/tess.h' line='56' column='1'/>
       </data-member>
     </class-decl>
     <!-- typedef __jmp_buf_tag[1] jmp_buf -->
@@ -14996,7 +14996,7 @@
     <!-- GLUvertex* -->
     <pointer-type-def type-id='type-id-349' size-in-bits='64' id='type-id-337'/>
     <!-- GLfloat* -->
-    <pointer-type-def type-id='type-id-33' size-in-bits='64' id='type-id-47'/>
+    <pointer-type-def type-id='type-id-35' size-in-bits='64' id='type-id-47'/>
     <!-- PQSortKey* -->
     <pointer-type-def type-id='type-id-383' size-in-bits='64' id='type-id-368'/>
     <!-- PQSortKey** -->
@@ -15026,36 +15026,36 @@
     <!-- void (typedef GLboolean, void*)* -->
     <pointer-type-def type-id='type-id-394' size-in-bits='64' id='type-id-342'/>
     <!-- void (typedef GLenum)* -->
-    <pointer-type-def type-id='type-id-395' size-in-bits='64' id='type-id-16'/>
+    <pointer-type-def type-id='type-id-395' size-in-bits='64' id='type-id-19'/>
     <!-- void (typedef GLenum, void*)* -->
-    <pointer-type-def type-id='type-id-396' size-in-bits='64' id='type-id-19'/>
+    <pointer-type-def type-id='type-id-396' size-in-bits='64' id='type-id-22'/>
     <!-- void (void*)* -->
-    <pointer-type-def type-id='type-id-397' size-in-bits='64' id='type-id-20'/>
+    <pointer-type-def type-id='type-id-397' size-in-bits='64' id='type-id-23'/>
     <!-- void (void*, void*)* -->
     <pointer-type-def type-id='type-id-398' size-in-bits='64' id='type-id-343'/>
     <!-- void** -->
-    <pointer-type-def type-id='type-id-22' size-in-bits='64' id='type-id-185'/>
+    <pointer-type-def type-id='type-id-25' size-in-bits='64' id='type-id-185'/>
     <!-- void gluTessProperty(GLUtesselator*, GLenum, GLdouble) -->
     <function-decl name='gluTessProperty' mangled-name='gluTessProperty' filepath='libtess/tess.c' line='201' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gluTessProperty'>
       <!-- parameter of type 'GLUtesselator*' -->
       <parameter type-id='type-id-386' name='tess' filepath='libtess/tess.c' line='201' column='1'/>
       <!-- parameter of type 'typedef GLenum' -->
-      <parameter type-id='type-id-25' name='which' filepath='libtess/tess.c' line='201' column='1'/>
+      <parameter type-id='type-id-28' name='which' filepath='libtess/tess.c' line='201' column='1'/>
       <!-- parameter of type 'typedef GLdouble' -->
       <parameter type-id='type-id-321' name='value' filepath='libtess/tess.c' line='201' column='1'/>
       <!-- void -->
-      <return type-id='type-id-11'/>
+      <return type-id='type-id-12'/>
     </function-decl>
     <!-- void gluGetTessProperty(GLUtesselator*, GLenum, GLdouble*) -->
     <function-decl name='gluGetTessProperty' mangled-name='gluGetTessProperty' filepath='libtess/tess.c' line='240' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gluGetTessProperty'>
       <!-- parameter of type 'GLUtesselator*' -->
       <parameter type-id='type-id-386' name='tess' filepath='libtess/tess.c' line='240' column='1'/>
       <!-- parameter of type 'typedef GLenum' -->
-      <parameter type-id='type-id-25' name='which' filepath='libtess/tess.c' line='240' column='1'/>
+      <parameter type-id='type-id-28' name='which' filepath='libtess/tess.c' line='240' column='1'/>
       <!-- parameter of type 'GLdouble*' -->
       <parameter type-id='type-id-399' name='value' filepath='libtess/tess.c' line='240' column='1'/>
       <!-- void -->
-      <return type-id='type-id-11'/>
+      <return type-id='type-id-12'/>
     </function-decl>
     <!-- void gluTessNormal(GLUtesselator*, GLdouble, GLdouble, GLdouble) -->
     <function-decl name='gluTessNormal' mangled-name='gluTessNormal' filepath='libtess/tess.c' line='268' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gluTessNormal'>
@@ -15068,71 +15068,71 @@
       <!-- parameter of type 'typedef GLdouble' -->
       <parameter type-id='type-id-321' name='z' filepath='libtess/tess.c' line='268' column='1'/>
       <!-- void -->
-      <return type-id='type-id-11'/>
+      <return type-id='type-id-12'/>
     </function-decl>
     <!-- void gluTessCallback(GLUtesselator*, GLenum, _GLUfuncptr) -->
     <function-decl name='gluTessCallback' mangled-name='gluTessCallback' filepath='libtess/tess.c' line='276' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gluTessCallback'>
       <!-- parameter of type 'GLUtesselator*' -->
       <parameter type-id='type-id-386' name='tess' filepath='libtess/tess.c' line='276' column='1'/>
       <!-- parameter of type 'typedef GLenum' -->
-      <parameter type-id='type-id-25' name='which' filepath='libtess/tess.c' line='276' column='1'/>
+      <parameter type-id='type-id-28' name='which' filepath='libtess/tess.c' line='276' column='1'/>
       <!-- parameter of type 'typedef _GLUfuncptr' -->
-      <parameter type-id='type-id-26' name='fn' filepath='libtess/tess.c' line='276' column='1'/>
+      <parameter type-id='type-id-29' name='fn' filepath='libtess/tess.c' line='276' column='1'/>
       <!-- void -->
-      <return type-id='type-id-11'/>
+      <return type-id='type-id-12'/>
     </function-decl>
     <!-- void gluTessEndContour(GLUtesselator*) -->
     <function-decl name='gluTessEndContour' mangled-name='gluTessEndContour' filepath='libtess/tess.c' line='493' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gluTessEndContour'>
       <!-- parameter of type 'GLUtesselator*' -->
       <parameter type-id='type-id-386' name='tess' filepath='libtess/tess.c' line='493' column='1'/>
       <!-- void -->
-      <return type-id='type-id-11'/>
+      <return type-id='type-id-12'/>
     </function-decl>
     <!-- void gluTessBeginContour(GLUtesselator*) -->
     <function-decl name='gluTessBeginContour' mangled-name='gluTessBeginContour' filepath='libtess/tess.c' line='476' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gluTessBeginContour'>
       <!-- parameter of type 'GLUtesselator*' -->
       <parameter type-id='type-id-386' name='tess' filepath='libtess/tess.c' line='476' column='1'/>
       <!-- void -->
-      <return type-id='type-id-11'/>
+      <return type-id='type-id-12'/>
     </function-decl>
     <!-- void gluNextContour(GLUtesselator*, GLenum) -->
     <function-decl name='gluNextContour' mangled-name='gluNextContour' filepath='libtess/tess.c' line='620' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gluNextContour'>
       <!-- parameter of type 'GLUtesselator*' -->
       <parameter type-id='type-id-386' name='tess' filepath='libtess/tess.c' line='620' column='1'/>
       <!-- parameter of type 'typedef GLenum' -->
-      <parameter type-id='type-id-25' name='type' filepath='libtess/tess.c' line='620' column='1'/>
+      <parameter type-id='type-id-28' name='type' filepath='libtess/tess.c' line='620' column='1'/>
       <!-- void -->
-      <return type-id='type-id-11'/>
+      <return type-id='type-id-12'/>
     </function-decl>
     <!-- void gluTessBeginPolygon(GLUtesselator*, void*) -->
     <function-decl name='gluTessBeginPolygon' mangled-name='gluTessBeginPolygon' filepath='libtess/tess.c' line='462' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gluTessBeginPolygon'>
       <!-- parameter of type 'GLUtesselator*' -->
       <parameter type-id='type-id-386' name='tess' filepath='libtess/tess.c' line='462' column='1'/>
       <!-- parameter of type 'void*' -->
-      <parameter type-id='type-id-22' name='data' filepath='libtess/tess.c' line='462' column='1'/>
+      <parameter type-id='type-id-25' name='data' filepath='libtess/tess.c' line='462' column='1'/>
       <!-- void -->
-      <return type-id='type-id-11'/>
+      <return type-id='type-id-12'/>
     </function-decl>
     <!-- void gluBeginPolygon(GLUtesselator*) -->
     <function-decl name='gluBeginPolygon' mangled-name='gluBeginPolygon' filepath='libtess/tess.c' line='611' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gluBeginPolygon'>
       <!-- parameter of type 'GLUtesselator*' -->
       <parameter type-id='type-id-386' name='tess' filepath='libtess/tess.c' line='611' column='1'/>
       <!-- void -->
-      <return type-id='type-id-11'/>
+      <return type-id='type-id-12'/>
     </function-decl>
     <!-- void gluTessEndPolygon(GLUtesselator*) -->
     <function-decl name='gluTessEndPolygon' mangled-name='gluTessEndPolygon' filepath='libtess/tess.c' line='500' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gluTessEndPolygon'>
       <!-- parameter of type 'GLUtesselator*' -->
       <parameter type-id='type-id-386' name='tess' filepath='libtess/tess.c' line='500' column='1'/>
       <!-- void -->
-      <return type-id='type-id-11'/>
+      <return type-id='type-id-12'/>
     </function-decl>
     <!-- void gluEndPolygon(GLUtesselator*) -->
     <function-decl name='gluEndPolygon' mangled-name='gluEndPolygon' filepath='libtess/tess.c' line='628' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gluEndPolygon'>
       <!-- parameter of type 'GLUtesselator*' -->
       <parameter type-id='type-id-386' name='tess' filepath='libtess/tess.c' line='628' column='1'/>
       <!-- void -->
-      <return type-id='type-id-11'/>
+      <return type-id='type-id-12'/>
     </function-decl>
     <!-- void gluTessVertex(GLUtesselator*, GLdouble*, void*) -->
     <function-decl name='gluTessVertex' mangled-name='gluTessVertex' filepath='libtess/tess.c' line='415' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gluTessVertex'>
@@ -15141,16 +15141,16 @@
       <!-- parameter of type 'GLdouble*' -->
       <parameter type-id='type-id-399' name='coords' filepath='libtess/tess.c' line='415' column='1'/>
       <!-- parameter of type 'void*' -->
-      <parameter type-id='type-id-22' name='data' filepath='libtess/tess.c' line='415' column='1'/>
+      <parameter type-id='type-id-25' name='data' filepath='libtess/tess.c' line='415' column='1'/>
       <!-- void -->
-      <return type-id='type-id-11'/>
+      <return type-id='type-id-12'/>
     </function-decl>
     <!-- void gluDeleteTess(GLUtesselator*) -->
     <function-decl name='gluDeleteTess' mangled-name='gluDeleteTess' filepath='libtess/tess.c' line='193' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gluDeleteTess'>
       <!-- parameter of type 'GLUtesselator*' -->
       <parameter type-id='type-id-386' name='tess' filepath='libtess/tess.c' line='193' column='1'/>
       <!-- void -->
-      <return type-id='type-id-11'/>
+      <return type-id='type-id-12'/>
     </function-decl>
     <!-- GLUtesselator* gluNewTess() -->
     <function-decl name='gluNewTess' mangled-name='gluNewTess' filepath='libtess/tess.c' line='92' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gluNewTess'>
@@ -15164,7 +15164,7 @@
       <!-- parameter of type 'typedef PQHeapKey' -->
       <parameter type-id='type-id-382'/>
       <!-- int -->
-      <return type-id='type-id-10'/>
+      <return type-id='type-id-11'/>
     </function-type>
     <!-- int (PQSortKey, PQSortKey) -->
     <function-type size-in-bits='64' id='type-id-388'>
@@ -15173,25 +15173,25 @@
       <!-- parameter of type 'typedef PQSortKey' -->
       <parameter type-id='type-id-383'/>
       <!-- int -->
-      <return type-id='type-id-10'/>
+      <return type-id='type-id-11'/>
     </function-type>
     <!-- int (void*, DictListKey, DictListKey) -->
     <function-type size-in-bits='64' id='type-id-389'>
       <!-- parameter of type 'void*' -->
-      <parameter type-id='type-id-22'/>
+      <parameter type-id='type-id-25'/>
       <!-- parameter of type 'typedef DictListKey' -->
       <parameter type-id='type-id-356'/>
       <!-- parameter of type 'typedef DictListKey' -->
       <parameter type-id='type-id-356'/>
       <!-- int -->
-      <return type-id='type-id-10'/>
+      <return type-id='type-id-11'/>
     </function-type>
     <!-- void (GLUmesh*) -->
     <function-type size-in-bits='64' id='type-id-390'>
       <!-- parameter of type 'GLUmesh*' -->
       <parameter type-id='type-id-334'/>
       <!-- void -->
-      <return type-id='type-id-11'/>
+      <return type-id='type-id-12'/>
     </function-type>
     <!-- void (GLdouble*, void**, GLfloat*, void**) -->
     <function-type size-in-bits='64' id='type-id-391'>
@@ -15204,7 +15204,7 @@
       <!-- parameter of type 'void**' -->
       <parameter type-id='type-id-185'/>
       <!-- void -->
-      <return type-id='type-id-11'/>
+      <return type-id='type-id-12'/>
     </function-type>
     <!-- void (GLdouble*, void**, GLfloat*, void**, void*) -->
     <function-type size-in-bits='64' id='type-id-392'>
@@ -15217,57 +15217,57 @@
       <!-- parameter of type 'void**' -->
       <parameter type-id='type-id-185'/>
       <!-- parameter of type 'void*' -->
-      <parameter type-id='type-id-22'/>
+      <parameter type-id='type-id-25'/>
       <!-- void -->
-      <return type-id='type-id-11'/>
+      <return type-id='type-id-12'/>
     </function-type>
     <!-- void (GLboolean) -->
     <function-type size-in-bits='64' id='type-id-393'>
       <!-- parameter of type 'typedef GLboolean' -->
       <parameter type-id='type-id-42'/>
       <!-- void -->
-      <return type-id='type-id-11'/>
+      <return type-id='type-id-12'/>
     </function-type>
     <!-- void (GLboolean, void*) -->
     <function-type size-in-bits='64' id='type-id-394'>
       <!-- parameter of type 'typedef GLboolean' -->
       <parameter type-id='type-id-42'/>
       <!-- parameter of type 'void*' -->
-      <parameter type-id='type-id-22'/>
+      <parameter type-id='type-id-25'/>
       <!-- void -->
-      <return type-id='type-id-11'/>
+      <return type-id='type-id-12'/>
     </function-type>
     <!-- void (GLenum) -->
     <function-type size-in-bits='64' id='type-id-395'>
       <!-- parameter of type 'typedef GLenum' -->
-      <parameter type-id='type-id-25'/>
+      <parameter type-id='type-id-28'/>
       <!-- void -->
-      <return type-id='type-id-11'/>
+      <return type-id='type-id-12'/>
     </function-type>
     <!-- void (GLenum, void*) -->
     <function-type size-in-bits='64' id='type-id-396'>
       <!-- parameter of type 'typedef GLenum' -->
-      <parameter type-id='type-id-25'/>
+      <parameter type-id='type-id-28'/>
       <!-- parameter of type 'void*' -->
-      <parameter type-id='type-id-22'/>
+      <parameter type-id='type-id-25'/>
       <!-- void -->
-      <return type-id='type-id-11'/>
+      <return type-id='type-id-12'/>
     </function-type>
     <!-- void (void*) -->
     <function-type size-in-bits='64' id='type-id-397'>
       <!-- parameter of type 'void*' -->
-      <parameter type-id='type-id-22'/>
+      <parameter type-id='type-id-25'/>
       <!-- void -->
-      <return type-id='type-id-11'/>
+      <return type-id='type-id-12'/>
     </function-type>
     <!-- void (void*, void*) -->
     <function-type size-in-bits='64' id='type-id-398'>
       <!-- parameter of type 'void*' -->
-      <parameter type-id='type-id-22'/>
+      <parameter type-id='type-id-25'/>
       <!-- parameter of type 'void*' -->
-      <parameter type-id='type-id-22'/>
+      <parameter type-id='type-id-25'/>
       <!-- void -->
-      <return type-id='type-id-11'/>
+      <return type-id='type-id-12'/>
     </function-type>
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='libutil/error.c' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-T0fsxk/Mesa-8.0.5/src/glu/sgi' language='LANG_C99'>
@@ -15278,7 +15278,7 @@
     <!-- typedef unsigned char GLubyte -->
     <typedef-decl name='GLubyte' type-id='type-id-400' filepath='../../../include/GL/gl.h' line='156' column='1' id='type-id-401'/>
     <!-- typedef unsigned int GLenum -->
-    <typedef-decl name='GLenum' type-id='type-id-230' filepath='../../../include/GL/gl.h' line='149' column='1' id='type-id-25'/>
+    <typedef-decl name='GLenum' type-id='type-id-230' filepath='../../../include/GL/gl.h' line='149' column='1' id='type-id-28'/>
     <!-- const GLubyte -->
     <qualified-type-def type-id='type-id-401' const='yes' id='type-id-402'/>
     <!-- const GLubyte* -->
@@ -15286,26 +15286,26 @@
     <!-- const GLubyte* gluErrorString(GLenum) -->
     <function-decl name='gluErrorString' mangled-name='gluErrorString' filepath='libutil/error.c' line='66' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gluErrorString'>
       <!-- parameter of type 'typedef GLenum' -->
-      <parameter type-id='type-id-25' name='errorCode' filepath='libutil/error.c' line='66' column='1'/>
+      <parameter type-id='type-id-28' name='errorCode' filepath='libutil/error.c' line='66' column='1'/>
       <!-- const GLubyte* -->
       <return type-id='type-id-403'/>
     </function-decl>
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='libutil/mipmap.c' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-T0fsxk/Mesa-8.0.5/src/glu/sgi' language='LANG_C99'>
     <!-- int -->
-    <type-decl name='int' size-in-bits='32' id='type-id-10'/>
+    <type-decl name='int' size-in-bits='32' id='type-id-11'/>
     <!-- void -->
-    <type-decl name='void' id='type-id-11'/>
+    <type-decl name='void' id='type-id-12'/>
     <!-- typedef int GLint -->
-    <typedef-decl name='GLint' type-id='type-id-10' filepath='../../../include/GL/gl.h' line='155' column='1' id='type-id-60'/>
+    <typedef-decl name='GLint' type-id='type-id-11' filepath='../../../include/GL/gl.h' line='155' column='1' id='type-id-60'/>
     <!-- typedef int GLsizei -->
-    <typedef-decl name='GLsizei' type-id='type-id-10' filepath='../../../include/GL/gl.h' line='159' column='1' id='type-id-404'/>
+    <typedef-decl name='GLsizei' type-id='type-id-11' filepath='../../../include/GL/gl.h' line='159' column='1' id='type-id-404'/>
     <!-- void* -->
-    <pointer-type-def type-id='type-id-11' size-in-bits='64' id='type-id-22'/>
+    <pointer-type-def type-id='type-id-12' size-in-bits='64' id='type-id-25'/>
     <!-- GLint gluBuild3DMipmaps(GLenum, GLint, GLsizei, GLsizei, GLsizei, GLenum, GLenum, void*) -->
     <function-decl name='gluBuild3DMipmaps' mangled-name='gluBuild3DMipmaps' filepath='libutil/mipmap.c' line='8482' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gluBuild3DMipmaps'>
       <!-- parameter of type 'typedef GLenum' -->
-      <parameter type-id='type-id-25' name='target' filepath='libutil/mipmap.c' line='8482' column='1'/>
+      <parameter type-id='type-id-28' name='target' filepath='libutil/mipmap.c' line='8482' column='1'/>
       <!-- parameter of type 'typedef GLint' -->
       <parameter type-id='type-id-60' name='internalFormat' filepath='libutil/mipmap.c' line='8482' column='1'/>
       <!-- parameter of type 'typedef GLsizei' -->
@@ -15315,18 +15315,18 @@
       <!-- parameter of type 'typedef GLsizei' -->
       <parameter type-id='type-id-404' name='depth' filepath='libutil/mipmap.c' line='8483' column='1'/>
       <!-- parameter of type 'typedef GLenum' -->
-      <parameter type-id='type-id-25' name='format' filepath='libutil/mipmap.c' line='8484' column='1'/>
+      <parameter type-id='type-id-28' name='format' filepath='libutil/mipmap.c' line='8484' column='1'/>
       <!-- parameter of type 'typedef GLenum' -->
-      <parameter type-id='type-id-25' name='type' filepath='libutil/mipmap.c' line='8484' column='1'/>
+      <parameter type-id='type-id-28' name='type' filepath='libutil/mipmap.c' line='8484' column='1'/>
       <!-- parameter of type 'void*' -->
-      <parameter type-id='type-id-22' name='data' filepath='libutil/mipmap.c' line='8484' column='1'/>
+      <parameter type-id='type-id-25' name='data' filepath='libutil/mipmap.c' line='8484' column='1'/>
       <!-- typedef GLint -->
       <return type-id='type-id-60'/>
     </function-decl>
     <!-- GLint gluBuild3DMipmapLevels(GLenum, GLint, GLsizei, GLsizei, GLsizei, GLenum, GLenum, GLint, GLint, GLint, void*) -->
     <function-decl name='gluBuild3DMipmapLevels' mangled-name='gluBuild3DMipmapLevels' filepath='libutil/mipmap.c' line='8444' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gluBuild3DMipmapLevels'>
       <!-- parameter of type 'typedef GLenum' -->
-      <parameter type-id='type-id-25' name='target' filepath='libutil/mipmap.c' line='8444' column='1'/>
+      <parameter type-id='type-id-28' name='target' filepath='libutil/mipmap.c' line='8444' column='1'/>
       <!-- parameter of type 'typedef GLint' -->
       <parameter type-id='type-id-60' name='internalFormat' filepath='libutil/mipmap.c' line='8444' column='1'/>
       <!-- parameter of type 'typedef GLsizei' -->
@@ -15336,9 +15336,9 @@
       <!-- parameter of type 'typedef GLsizei' -->
       <parameter type-id='type-id-404' name='depth' filepath='libutil/mipmap.c' line='8445' column='1'/>
       <!-- parameter of type 'typedef GLenum' -->
-      <parameter type-id='type-id-25' name='format' filepath='libutil/mipmap.c' line='8446' column='1'/>
+      <parameter type-id='type-id-28' name='format' filepath='libutil/mipmap.c' line='8446' column='1'/>
       <!-- parameter of type 'typedef GLenum' -->
-      <parameter type-id='type-id-25' name='type' filepath='libutil/mipmap.c' line='8446' column='1'/>
+      <parameter type-id='type-id-28' name='type' filepath='libutil/mipmap.c' line='8446' column='1'/>
       <!-- parameter of type 'typedef GLint' -->
       <parameter type-id='type-id-60' name='userLevel' filepath='libutil/mipmap.c' line='8447' column='1'/>
       <!-- parameter of type 'typedef GLint' -->
@@ -15346,62 +15346,62 @@
       <!-- parameter of type 'typedef GLint' -->
       <parameter type-id='type-id-60' name='maxLevel' filepath='libutil/mipmap.c' line='8447' column='1'/>
       <!-- parameter of type 'void*' -->
-      <parameter type-id='type-id-22' name='data' filepath='libutil/mipmap.c' line='8448' column='1'/>
+      <parameter type-id='type-id-25' name='data' filepath='libutil/mipmap.c' line='8448' column='1'/>
       <!-- typedef GLint -->
       <return type-id='type-id-60'/>
     </function-decl>
     <!-- GLint gluScaleImage(GLenum, GLsizei, GLsizei, GLenum, void*, GLsizei, GLsizei, GLenum, void*) -->
     <function-decl name='gluScaleImage' mangled-name='gluScaleImage' filepath='libutil/mipmap.c' line='3498' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gluScaleImage'>
       <!-- parameter of type 'typedef GLenum' -->
-      <parameter type-id='type-id-25' name='format' filepath='libutil/mipmap.c' line='3498' column='1'/>
+      <parameter type-id='type-id-28' name='format' filepath='libutil/mipmap.c' line='3498' column='1'/>
       <!-- parameter of type 'typedef GLsizei' -->
       <parameter type-id='type-id-404' name='widthin' filepath='libutil/mipmap.c' line='3498' column='1'/>
       <!-- parameter of type 'typedef GLsizei' -->
       <parameter type-id='type-id-404' name='heightin' filepath='libutil/mipmap.c' line='3498' column='1'/>
       <!-- parameter of type 'typedef GLenum' -->
-      <parameter type-id='type-id-25' name='typein' filepath='libutil/mipmap.c' line='3499' column='1'/>
+      <parameter type-id='type-id-28' name='typein' filepath='libutil/mipmap.c' line='3499' column='1'/>
       <!-- parameter of type 'void*' -->
-      <parameter type-id='type-id-22' name='datain' filepath='libutil/mipmap.c' line='3499' column='1'/>
+      <parameter type-id='type-id-25' name='datain' filepath='libutil/mipmap.c' line='3499' column='1'/>
       <!-- parameter of type 'typedef GLsizei' -->
       <parameter type-id='type-id-404' name='widthout' filepath='libutil/mipmap.c' line='3500' column='1'/>
       <!-- parameter of type 'typedef GLsizei' -->
       <parameter type-id='type-id-404' name='heightout' filepath='libutil/mipmap.c' line='3500' column='1'/>
       <!-- parameter of type 'typedef GLenum' -->
-      <parameter type-id='type-id-25' name='typeout' filepath='libutil/mipmap.c' line='3500' column='1'/>
+      <parameter type-id='type-id-28' name='typeout' filepath='libutil/mipmap.c' line='3500' column='1'/>
       <!-- parameter of type 'void*' -->
-      <parameter type-id='type-id-22' name='dataout' filepath='libutil/mipmap.c' line='3501' column='1'/>
+      <parameter type-id='type-id-25' name='dataout' filepath='libutil/mipmap.c' line='3501' column='1'/>
       <!-- typedef GLint -->
       <return type-id='type-id-60'/>
     </function-decl>
     <!-- GLint gluBuild1DMipmaps(GLenum, GLint, GLsizei, GLenum, GLenum, void*) -->
     <function-decl name='gluBuild1DMipmaps' mangled-name='gluBuild1DMipmaps' filepath='libutil/mipmap.c' line='3672' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gluBuild1DMipmaps'>
       <!-- parameter of type 'typedef GLenum' -->
-      <parameter type-id='type-id-25' name='target' filepath='libutil/mipmap.c' line='3672' column='1'/>
+      <parameter type-id='type-id-28' name='target' filepath='libutil/mipmap.c' line='3672' column='1'/>
       <!-- parameter of type 'typedef GLint' -->
       <parameter type-id='type-id-60' name='internalFormat' filepath='libutil/mipmap.c' line='3672' column='1'/>
       <!-- parameter of type 'typedef GLsizei' -->
       <parameter type-id='type-id-404' name='width' filepath='libutil/mipmap.c' line='3672' column='1'/>
       <!-- parameter of type 'typedef GLenum' -->
-      <parameter type-id='type-id-25' name='format' filepath='libutil/mipmap.c' line='3673' column='1'/>
+      <parameter type-id='type-id-28' name='format' filepath='libutil/mipmap.c' line='3673' column='1'/>
       <!-- parameter of type 'typedef GLenum' -->
-      <parameter type-id='type-id-25' name='type' filepath='libutil/mipmap.c' line='3673' column='1'/>
+      <parameter type-id='type-id-28' name='type' filepath='libutil/mipmap.c' line='3673' column='1'/>
       <!-- parameter of type 'void*' -->
-      <parameter type-id='type-id-22' name='data' filepath='libutil/mipmap.c' line='3674' column='1'/>
+      <parameter type-id='type-id-25' name='data' filepath='libutil/mipmap.c' line='3674' column='1'/>
       <!-- typedef GLint -->
       <return type-id='type-id-60'/>
     </function-decl>
     <!-- GLint gluBuild1DMipmapLevels(GLenum, GLint, GLsizei, GLenum, GLenum, GLint, GLint, GLint, void*) -->
     <function-decl name='gluBuild1DMipmapLevels' mangled-name='gluBuild1DMipmapLevels' filepath='libutil/mipmap.c' line='3643' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gluBuild1DMipmapLevels'>
       <!-- parameter of type 'typedef GLenum' -->
-      <parameter type-id='type-id-25' name='target' filepath='libutil/mipmap.c' line='3643' column='1'/>
+      <parameter type-id='type-id-28' name='target' filepath='libutil/mipmap.c' line='3643' column='1'/>
       <!-- parameter of type 'typedef GLint' -->
       <parameter type-id='type-id-60' name='internalFormat' filepath='libutil/mipmap.c' line='3643' column='1'/>
       <!-- parameter of type 'typedef GLsizei' -->
       <parameter type-id='type-id-404' name='width' filepath='libutil/mipmap.c' line='3644' column='1'/>
       <!-- parameter of type 'typedef GLenum' -->
-      <parameter type-id='type-id-25' name='format' filepath='libutil/mipmap.c' line='3645' column='1'/>
+      <parameter type-id='type-id-28' name='format' filepath='libutil/mipmap.c' line='3645' column='1'/>
       <!-- parameter of type 'typedef GLenum' -->
-      <parameter type-id='type-id-25' name='type' filepath='libutil/mipmap.c' line='3645' column='1'/>
+      <parameter type-id='type-id-28' name='type' filepath='libutil/mipmap.c' line='3645' column='1'/>
       <!-- parameter of type 'typedef GLint' -->
       <parameter type-id='type-id-60' name='userLevel' filepath='libutil/mipmap.c' line='3646' column='1'/>
       <!-- parameter of type 'typedef GLint' -->
@@ -15409,14 +15409,14 @@
       <!-- parameter of type 'typedef GLint' -->
       <parameter type-id='type-id-60' name='maxLevel' filepath='libutil/mipmap.c' line='3646' column='1'/>
       <!-- parameter of type 'void*' -->
-      <parameter type-id='type-id-22' name='data' filepath='libutil/mipmap.c' line='3647' column='1'/>
+      <parameter type-id='type-id-25' name='data' filepath='libutil/mipmap.c' line='3647' column='1'/>
       <!-- typedef GLint -->
       <return type-id='type-id-60'/>
     </function-decl>
     <!-- GLint gluBuild2DMipmaps(GLenum, GLint, GLsizei, GLsizei, GLenum, GLenum, void*) -->
     <function-decl name='gluBuild2DMipmaps' mangled-name='gluBuild2DMipmaps' filepath='libutil/mipmap.c' line='4584' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gluBuild2DMipmaps'>
       <!-- parameter of type 'typedef GLenum' -->
-      <parameter type-id='type-id-25' name='target' filepath='libutil/mipmap.c' line='4584' column='1'/>
+      <parameter type-id='type-id-28' name='target' filepath='libutil/mipmap.c' line='4584' column='1'/>
       <!-- parameter of type 'typedef GLint' -->
       <parameter type-id='type-id-60' name='internalFormat' filepath='libutil/mipmap.c' line='4584' column='1'/>
       <!-- parameter of type 'typedef GLsizei' -->
@@ -15424,18 +15424,18 @@
       <!-- parameter of type 'typedef GLsizei' -->
       <parameter type-id='type-id-404' name='height' filepath='libutil/mipmap.c' line='4585' column='1'/>
       <!-- parameter of type 'typedef GLenum' -->
-      <parameter type-id='type-id-25' name='format' filepath='libutil/mipmap.c' line='4586' column='1'/>
+      <parameter type-id='type-id-28' name='format' filepath='libutil/mipmap.c' line='4586' column='1'/>
       <!-- parameter of type 'typedef GLenum' -->
-      <parameter type-id='type-id-25' name='type' filepath='libutil/mipmap.c' line='4586' column='1'/>
+      <parameter type-id='type-id-28' name='type' filepath='libutil/mipmap.c' line='4586' column='1'/>
       <!-- parameter of type 'void*' -->
-      <parameter type-id='type-id-22' name='data' filepath='libutil/mipmap.c' line='4587' column='1'/>
+      <parameter type-id='type-id-25' name='data' filepath='libutil/mipmap.c' line='4587' column='1'/>
       <!-- typedef GLint -->
       <return type-id='type-id-60'/>
     </function-decl>
     <!-- GLint gluBuild2DMipmapLevels(GLenum, GLint, GLsizei, GLsizei, GLenum, GLenum, GLint, GLint, GLint, void*) -->
     <function-decl name='gluBuild2DMipmapLevels' mangled-name='gluBuild2DMipmapLevels' filepath='libutil/mipmap.c' line='4552' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gluBuild2DMipmapLevels'>
       <!-- parameter of type 'typedef GLenum' -->
-      <parameter type-id='type-id-25' name='target' filepath='libutil/mipmap.c' line='4552' column='1'/>
+      <parameter type-id='type-id-28' name='target' filepath='libutil/mipmap.c' line='4552' column='1'/>
       <!-- parameter of type 'typedef GLint' -->
       <parameter type-id='type-id-60' name='internalFormat' filepath='libutil/mipmap.c' line='4552' column='1'/>
       <!-- parameter of type 'typedef GLsizei' -->
@@ -15443,9 +15443,9 @@
       <!-- parameter of type 'typedef GLsizei' -->
       <parameter type-id='type-id-404' name='height' filepath='libutil/mipmap.c' line='4553' column='1'/>
       <!-- parameter of type 'typedef GLenum' -->
-      <parameter type-id='type-id-25' name='format' filepath='libutil/mipmap.c' line='4554' column='1'/>
+      <parameter type-id='type-id-28' name='format' filepath='libutil/mipmap.c' line='4554' column='1'/>
       <!-- parameter of type 'typedef GLenum' -->
-      <parameter type-id='type-id-25' name='type' filepath='libutil/mipmap.c' line='4554' column='1'/>
+      <parameter type-id='type-id-28' name='type' filepath='libutil/mipmap.c' line='4554' column='1'/>
       <!-- parameter of type 'typedef GLint' -->
       <parameter type-id='type-id-60' name='userLevel' filepath='libutil/mipmap.c' line='4555' column='1'/>
       <!-- parameter of type 'typedef GLint' -->
@@ -15453,7 +15453,7 @@
       <!-- parameter of type 'typedef GLint' -->
       <parameter type-id='type-id-60' name='maxLevel' filepath='libutil/mipmap.c' line='4555' column='1'/>
       <!-- parameter of type 'void*' -->
-      <parameter type-id='type-id-22' name='data' filepath='libutil/mipmap.c' line='4556' column='1'/>
+      <parameter type-id='type-id-25' name='data' filepath='libutil/mipmap.c' line='4556' column='1'/>
       <!-- typedef GLint -->
       <return type-id='type-id-60'/>
     </function-decl>
@@ -15567,7 +15567,7 @@
       <!-- parameter of type 'GLint*' -->
       <parameter type-id='type-id-407' name='viewport' filepath='libutil/project.c' line='349' column='1'/>
       <!-- void -->
-      <return type-id='type-id-11'/>
+      <return type-id='type-id-12'/>
     </function-decl>
     <!-- void gluLookAt(GLdouble, GLdouble, GLdouble, GLdouble, GLdouble, GLdouble, GLdouble, GLdouble, GLdouble) -->
     <function-decl name='gluLookAt' mangled-name='gluLookAt' filepath='libutil/project.c' line='108' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gluLookAt'>
@@ -15590,7 +15590,7 @@
       <!-- parameter of type 'typedef GLdouble' -->
       <parameter type-id='type-id-321' name='upz' filepath='libutil/project.c' line='110' column='1'/>
       <!-- void -->
-      <return type-id='type-id-11'/>
+      <return type-id='type-id-12'/>
     </function-decl>
     <!-- void gluPerspective(GLdouble, GLdouble, GLdouble, GLdouble) -->
     <function-decl name='gluPerspective' mangled-name='gluPerspective' filepath='libutil/project.c' line='65' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gluPerspective'>
@@ -15603,7 +15603,7 @@
       <!-- parameter of type 'typedef GLdouble' -->
       <parameter type-id='type-id-321' name='zFar' filepath='libutil/project.c' line='65' column='1'/>
       <!-- void -->
-      <return type-id='type-id-11'/>
+      <return type-id='type-id-12'/>
     </function-decl>
     <!-- void gluOrtho2D(GLdouble, GLdouble, GLdouble, GLdouble) -->
     <function-decl name='gluOrtho2D' mangled-name='gluOrtho2D' filepath='libutil/project.c' line='57' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gluOrtho2D'>
@@ -15616,7 +15616,7 @@
       <!-- parameter of type 'typedef GLdouble' -->
       <parameter type-id='type-id-321' name='top' filepath='libutil/project.c' line='57' column='1'/>
       <!-- void -->
-      <return type-id='type-id-11'/>
+      <return type-id='type-id-12'/>
     </function-decl>
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='libutil/quad.c' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-T0fsxk/Mesa-8.0.5/src/glu/sgi' language='LANG_C99'>
@@ -15648,11 +15648,11 @@
     <!-- typedef unsigned char GLboolean -->
     <typedef-decl name='GLboolean' type-id='type-id-400' filepath='../../../include/GL/gl.h' line='150' column='1' id='type-id-42'/>
     <!-- typedef void ()* _GLUfuncptr -->
-    <typedef-decl name='_GLUfuncptr' type-id='type-id-17' filepath='../../../include/GL/glu.h' line='287' column='1' id='type-id-26'/>
+    <typedef-decl name='_GLUfuncptr' type-id='type-id-20' filepath='../../../include/GL/glu.h' line='287' column='1' id='type-id-29'/>
     <!-- GLUquadric* -->
     <pointer-type-def type-id='type-id-412' size-in-bits='64' id='type-id-414'/>
     <!-- void ()* -->
-    <pointer-type-def type-id='type-id-415' size-in-bits='64' id='type-id-17'/>
+    <pointer-type-def type-id='type-id-415' size-in-bits='64' id='type-id-20'/>
     <!-- void (typedef GLint)* -->
     <pointer-type-def type-id='type-id-416' size-in-bits='64' id='type-id-413'/>
     <!-- void gluQuadricCallback(GLUquadric*, GLenum, _GLUfuncptr) -->
@@ -15660,20 +15660,20 @@
       <!-- parameter of type 'GLUquadric*' -->
       <parameter type-id='type-id-414' name='qobj' filepath='libutil/quad.c' line='86' column='1'/>
       <!-- parameter of type 'typedef GLenum' -->
-      <parameter type-id='type-id-25' name='which' filepath='libutil/quad.c' line='86' column='1'/>
+      <parameter type-id='type-id-28' name='which' filepath='libutil/quad.c' line='86' column='1'/>
       <!-- parameter of type 'typedef _GLUfuncptr' -->
-      <parameter type-id='type-id-26' name='fn' filepath='libutil/quad.c' line='86' column='1'/>
+      <parameter type-id='type-id-29' name='fn' filepath='libutil/quad.c' line='86' column='1'/>
       <!-- void -->
-      <return type-id='type-id-11'/>
+      <return type-id='type-id-12'/>
     </function-decl>
     <!-- void gluQuadricNormals(GLUquadric*, GLenum) -->
     <function-decl name='gluQuadricNormals' mangled-name='gluQuadricNormals' filepath='libutil/quad.c' line='99' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gluQuadricNormals'>
       <!-- parameter of type 'GLUquadric*' -->
       <parameter type-id='type-id-414' name='qobj' filepath='libutil/quad.c' line='99' column='1'/>
       <!-- parameter of type 'typedef GLenum' -->
-      <parameter type-id='type-id-25' name='normals' filepath='libutil/quad.c' line='99' column='1'/>
+      <parameter type-id='type-id-28' name='normals' filepath='libutil/quad.c' line='99' column='1'/>
       <!-- void -->
-      <return type-id='type-id-11'/>
+      <return type-id='type-id-12'/>
     </function-decl>
     <!-- void gluQuadricTexture(GLUquadric*, GLboolean) -->
     <function-decl name='gluQuadricTexture' mangled-name='gluQuadricTexture' filepath='libutil/quad.c' line='114' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gluQuadricTexture'>
@@ -15682,25 +15682,25 @@
       <!-- parameter of type 'typedef GLboolean' -->
       <parameter type-id='type-id-42' name='textureCoords' filepath='libutil/quad.c' line='114' column='1'/>
       <!-- void -->
-      <return type-id='type-id-11'/>
+      <return type-id='type-id-12'/>
     </function-decl>
     <!-- void gluQuadricOrientation(GLUquadric*, GLenum) -->
     <function-decl name='gluQuadricOrientation' mangled-name='gluQuadricOrientation' filepath='libutil/quad.c' line='120' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gluQuadricOrientation'>
       <!-- parameter of type 'GLUquadric*' -->
       <parameter type-id='type-id-414' name='qobj' filepath='libutil/quad.c' line='120' column='1'/>
       <!-- parameter of type 'typedef GLenum' -->
-      <parameter type-id='type-id-25' name='orientation' filepath='libutil/quad.c' line='120' column='1'/>
+      <parameter type-id='type-id-28' name='orientation' filepath='libutil/quad.c' line='120' column='1'/>
       <!-- void -->
-      <return type-id='type-id-11'/>
+      <return type-id='type-id-12'/>
     </function-decl>
     <!-- void gluQuadricDrawStyle(GLUquadric*, GLenum) -->
     <function-decl name='gluQuadricDrawStyle' mangled-name='gluQuadricDrawStyle' filepath='libutil/quad.c' line='134' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gluQuadricDrawStyle'>
       <!-- parameter of type 'GLUquadric*' -->
       <parameter type-id='type-id-414' name='qobj' filepath='libutil/quad.c' line='134' column='1'/>
       <!-- parameter of type 'typedef GLenum' -->
-      <parameter type-id='type-id-25' name='drawStyle' filepath='libutil/quad.c' line='134' column='1'/>
+      <parameter type-id='type-id-28' name='drawStyle' filepath='libutil/quad.c' line='134' column='1'/>
       <!-- void -->
-      <return type-id='type-id-11'/>
+      <return type-id='type-id-12'/>
     </function-decl>
     <!-- void gluSphere(GLUquadric*, GLdouble, GLint, GLint) -->
     <function-decl name='gluSphere' mangled-name='gluSphere' filepath='libutil/quad.c' line='694' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gluSphere'>
@@ -15713,7 +15713,7 @@
       <!-- parameter of type 'typedef GLint' -->
       <parameter type-id='type-id-60' name='stacks' filepath='libutil/quad.c' line='694' column='1'/>
       <!-- void -->
-      <return type-id='type-id-11'/>
+      <return type-id='type-id-12'/>
     </function-decl>
     <!-- void gluPartialDisk(GLUquadric*, GLdouble, GLdouble, GLint, GLint, GLdouble, GLdouble) -->
     <function-decl name='gluPartialDisk' mangled-name='gluPartialDisk' filepath='libutil/quad.c' line='431' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gluPartialDisk'>
@@ -15732,7 +15732,7 @@
       <!-- parameter of type 'typedef GLdouble' -->
       <parameter type-id='type-id-321' name='sweepAngle' filepath='libutil/quad.c' line='433' column='1'/>
       <!-- void -->
-      <return type-id='type-id-11'/>
+      <return type-id='type-id-12'/>
     </function-decl>
     <!-- void gluDisk(GLUquadric*, GLdouble, GLdouble, GLint, GLint) -->
     <function-decl name='gluDisk' mangled-name='gluDisk' filepath='libutil/quad.c' line='424' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gluDisk'>
@@ -15747,7 +15747,7 @@
       <!-- parameter of type 'typedef GLint' -->
       <parameter type-id='type-id-60' name='loops' filepath='libutil/quad.c' line='425' column='1'/>
       <!-- void -->
-      <return type-id='type-id-11'/>
+      <return type-id='type-id-12'/>
     </function-decl>
     <!-- void gluCylinder(GLUquadric*, GLdouble, GLdouble, GLdouble, GLint, GLint) -->
     <function-decl name='gluCylinder' mangled-name='gluCylinder' filepath='libutil/quad.c' line='150' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gluCylinder'>
@@ -15764,14 +15764,14 @@
       <!-- parameter of type 'typedef GLint' -->
       <parameter type-id='type-id-60' name='stacks' filepath='libutil/quad.c' line='151' column='1'/>
       <!-- void -->
-      <return type-id='type-id-11'/>
+      <return type-id='type-id-12'/>
     </function-decl>
     <!-- void gluDeleteQuadric(GLUquadric*) -->
     <function-decl name='gluDeleteQuadric' mangled-name='gluDeleteQuadric' filepath='libutil/quad.c' line='73' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gluDeleteQuadric'>
       <!-- parameter of type 'GLUquadric*' -->
       <parameter type-id='type-id-414' name='state' filepath='libutil/quad.c' line='73' column='1'/>
       <!-- void -->
-      <return type-id='type-id-11'/>
+      <return type-id='type-id-12'/>
     </function-decl>
     <!-- GLUquadric* gluNewQuadric() -->
     <function-decl name='gluNewQuadric' mangled-name='gluNewQuadric' filepath='libutil/quad.c' line='54' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gluNewQuadric'>
@@ -15781,21 +15781,21 @@
     <!-- void () -->
     <function-type size-in-bits='64' id='type-id-415'>
       <!-- void -->
-      <return type-id='type-id-11'/>
+      <return type-id='type-id-12'/>
     </function-type>
     <!-- void (GLint) -->
     <function-type size-in-bits='64' id='type-id-416'>
       <!-- parameter of type 'typedef GLint' -->
       <parameter type-id='type-id-60'/>
       <!-- void -->
-      <return type-id='type-id-11'/>
+      <return type-id='type-id-12'/>
     </function-type>
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='libutil/registry.c' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-T0fsxk/Mesa-8.0.5/src/glu/sgi' language='LANG_C99'>
     <!-- const GLubyte* gluGetString(GLenum) -->
     <function-decl name='gluGetString' mangled-name='gluGetString' filepath='libutil/registry.c' line='44' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gluGetString'>
       <!-- parameter of type 'typedef GLenum' -->
-      <parameter type-id='type-id-25' name='name' filepath='libutil/registry.c' line='44' column='1'/>
+      <parameter type-id='type-id-28' name='name' filepath='libutil/registry.c' line='44' column='1'/>
       <!-- const GLubyte* -->
       <return type-id='type-id-403'/>
     </function-decl>
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 fcd70f57..57a8defb 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
@@ -4914,7 +4914,7 @@
       </member-type>
       <member-type access='private'>
         <!-- struct HeapLeakChecker::Allocator -->
-        <class-decl name='Allocator' size-in-bits='8' is-struct='yes' visibility='default' filepath='src/heap-checker.cc' line='292' column='1' is-declaration-only='yes' id='type-id-247'>
+        <class-decl name='Allocator' size-in-bits='8' is-struct='yes' visibility='default' filepath='src/heap-checker.cc' line='292' column='1' id='type-id-247'>
           <data-member access='private' static='yes'>
             <!-- static LowLevelAlloc::Arena* HeapLeakChecker::Allocator::arena_ -->
             <var-decl name='arena_' type-id='type-id-74' mangled-name='_ZN15HeapLeakChecker9Allocator6arena_E' visibility='default' filepath='src/heap-checker.cc' line='333' column='1' elf-symbol-id='_ZN15HeapLeakChecker9Allocator6arena_E'/>
@@ -23557,416 +23557,72 @@
       <!-- int -->
       <return type-id='type-id-1'/>
     </function-decl>
-    <!-- class MallocExtension -->
-    <class-decl name='MallocExtension' size-in-bits='64' visibility='default' filepath='src/gperftools/malloc_extension.h' line='90' column='1' is-declaration-only='yes' id='type-id-894'>
-      <member-type access='private'>
-        <!-- enum MallocExtension::Ownership -->
-        <enum-decl name='Ownership' filepath='./src/gperftools/malloc_extension.h' line='315' column='1' id='type-id-898'>
-          <underlying-type type-id='type-id-133'/>
-          <enumerator name='kUnknownOwnership' value='0'/>
-          <enumerator name='kOwned' value='1'/>
-          <enumerator name='kNotOwned' value='2'/>
-        </enum-decl>
-      </member-type>
-      <member-type access='private'>
-        <!-- struct MallocExtension::FreeListInfo -->
-        <class-decl name='FreeListInfo' size-in-bits='256' is-struct='yes' visibility='default' filepath='./src/gperftools/malloc_extension.h' line='333' column='1' id='type-id-899'>
-          <data-member access='public' layout-offset-in-bits='0'>
-            <!-- size_t MallocExtension::FreeListInfo::min_object_size -->
-            <var-decl name='min_object_size' type-id='type-id-57' visibility='default' filepath='./src/gperftools/malloc_extension.h' line='334' column='1'/>
-          </data-member>
-          <data-member access='public' layout-offset-in-bits='64'>
-            <!-- size_t MallocExtension::FreeListInfo::max_object_size -->
-            <var-decl name='max_object_size' type-id='type-id-57' visibility='default' filepath='./src/gperftools/malloc_extension.h' line='335' column='1'/>
-          </data-member>
-          <data-member access='public' layout-offset-in-bits='128'>
-            <!-- size_t MallocExtension::FreeListInfo::total_bytes_free -->
-            <var-decl name='total_bytes_free' type-id='type-id-57' visibility='default' filepath='./src/gperftools/malloc_extension.h' line='336' column='1'/>
-          </data-member>
-          <data-member access='public' layout-offset-in-bits='192'>
-            <!-- const char* MallocExtension::FreeListInfo::type -->
-            <var-decl name='type' type-id='type-id-52' visibility='default' filepath='./src/gperftools/malloc_extension.h' line='337' column='1'/>
-          </data-member>
-        </class-decl>
-      </member-type>
-      <member-type access='private'>
-        <!-- typedef void (void*, const base::MallocRange*) MallocExtension::RangeFunction -->
-        <typedef-decl name='RangeFunction' type-id='type-id-900' filepath='src/gperftools/malloc_extension.h' line='143' column='1' id='type-id-895'/>
-      </member-type>
-      <member-function access='private' static='yes'>
-        <!-- void MallocExtension::Initialize() -->
-        <function-decl name='Initialize' mangled-name='_ZN15MallocExtension10InitializeEv' filepath='src/malloc_extension.cc' line='79' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN15MallocExtension10InitializeEv'>
-          <!-- void -->
-          <return type-id='type-id-56'/>
-        </function-decl>
-      </member-function>
-      <member-function access='private' static='yes'>
-        <!-- MallocExtension* MallocExtension::instance() -->
-        <function-decl name='instance' mangled-name='_ZN15MallocExtension8instanceEv' filepath='src/malloc_extension.cc' line='212' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN15MallocExtension8instanceEv'>
-          <!-- MallocExtension* -->
-          <return type-id='type-id-259'/>
-        </function-decl>
-      </member-function>
-      <member-function access='private'>
-        <!-- void MallocExtension::Register() -->
-        <function-decl name='Register' mangled-name='_ZN15MallocExtension8RegisterEPS_' filepath='src/malloc_extension.cc' line='217' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN15MallocExtension8RegisterEPS_'>
-          <!-- implicit parameter of type 'MallocExtension*' -->
-          <parameter type-id='type-id-259' is-artificial='yes'/>
-          <!-- void -->
-          <return type-id='type-id-56'/>
-        </function-decl>
-      </member-function>
-      <member-function access='private' destructor='yes' vtable-offset='-1'>
-        <!-- MallocExtension::~MallocExtension(int) -->
-        <function-decl name='~MallocExtension' mangled-name='_ZN15MallocExtensionD1Ev' filepath='src/malloc_extension.cc' line='111' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN15MallocExtensionD1Ev'>
-          <!-- implicit parameter of type 'MallocExtension*' -->
-          <parameter type-id='type-id-259' is-artificial='yes'/>
-          <!-- artificial parameter of type 'int' -->
-          <parameter type-id='type-id-1' is-artificial='yes'/>
-          <!-- void -->
-          <return type-id='type-id-56'/>
-        </function-decl>
-      </member-function>
-      <member-function access='private' vtable-offset='2'>
-        <!-- bool MallocExtension::VerifyAllMemory() -->
-        <function-decl name='VerifyAllMemory' mangled-name='_ZN15MallocExtension15VerifyAllMemoryEv' filepath='src/malloc_extension.cc' line='112' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN15MallocExtension15VerifyAllMemoryEv'>
-          <!-- implicit parameter of type 'MallocExtension*' -->
-          <parameter type-id='type-id-259' is-artificial='yes'/>
-          <!-- bool -->
-          <return type-id='type-id-55'/>
-        </function-decl>
-      </member-function>
-      <member-function access='private' vtable-offset='3'>
-        <!-- bool MallocExtension::VerifyNewMemory(void*) -->
-        <function-decl name='VerifyNewMemory' mangled-name='_ZN15MallocExtension15VerifyNewMemoryEPKv' filepath='src/malloc_extension.cc' line='113' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN15MallocExtension15VerifyNewMemoryEPKv'>
-          <!-- implicit parameter of type 'MallocExtension*' -->
-          <parameter type-id='type-id-259' is-artificial='yes'/>
-          <!-- parameter of type 'void*' -->
-          <parameter type-id='type-id-53'/>
-          <!-- bool -->
-          <return type-id='type-id-55'/>
-        </function-decl>
-      </member-function>
-      <member-function access='private' vtable-offset='4'>
-        <!-- bool MallocExtension::VerifyArrayNewMemory(void*) -->
-        <function-decl name='VerifyArrayNewMemory' mangled-name='_ZN15MallocExtension20VerifyArrayNewMemoryEPKv' filepath='src/malloc_extension.cc' line='114' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN15MallocExtension20VerifyArrayNewMemoryEPKv'>
-          <!-- implicit parameter of type 'MallocExtension*' -->
-          <parameter type-id='type-id-259' is-artificial='yes'/>
-          <!-- parameter of type 'void*' -->
-          <parameter type-id='type-id-53'/>
-          <!-- bool -->
-          <return type-id='type-id-55'/>
-        </function-decl>
-      </member-function>
-      <member-function access='private' vtable-offset='5'>
-        <!-- bool MallocExtension::VerifyMallocMemory(void*) -->
-        <function-decl name='VerifyMallocMemory' mangled-name='_ZN15MallocExtension18VerifyMallocMemoryEPKv' filepath='src/malloc_extension.cc' line='115' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN15MallocExtension18VerifyMallocMemoryEPKv'>
-          <!-- implicit parameter of type 'MallocExtension*' -->
-          <parameter type-id='type-id-259' is-artificial='yes'/>
-          <!-- parameter of type 'void*' -->
-          <parameter type-id='type-id-53'/>
-          <!-- bool -->
-          <return type-id='type-id-55'/>
-        </function-decl>
-      </member-function>
-      <member-function access='private' vtable-offset='6'>
-        <!-- bool MallocExtension::MallocMemoryStats(int*, size_t*, int*) -->
-        <function-decl name='MallocMemoryStats' mangled-name='_ZN15MallocExtension17MallocMemoryStatsEPiPmS0_' filepath='src/malloc_extension.cc' line='130' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN15MallocExtension17MallocMemoryStatsEPiPmS0_'>
-          <!-- implicit parameter of type 'MallocExtension*' -->
-          <parameter type-id='type-id-259' is-artificial='yes'/>
-          <!-- parameter of type 'int*' -->
-          <parameter type-id='type-id-897'/>
-          <!-- parameter of type 'size_t*' -->
-          <parameter type-id='type-id-230'/>
-          <!-- parameter of type 'int*' -->
-          <parameter type-id='type-id-897'/>
-          <!-- bool -->
-          <return type-id='type-id-55'/>
-        </function-decl>
-      </member-function>
-      <member-function access='private' vtable-offset='7'>
-        <!-- void MallocExtension::GetStats(char*, int) -->
-        <function-decl name='GetStats' mangled-name='_ZN15MallocExtension8GetStatsEPci' filepath='src/malloc_extension.cc' line='125' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN15MallocExtension8GetStatsEPci'>
-          <!-- implicit parameter of type 'MallocExtension*' -->
-          <parameter type-id='type-id-259' is-artificial='yes'/>
-          <!-- parameter of type 'char*' -->
-          <parameter type-id='type-id-90'/>
-          <!-- parameter of type 'int' -->
-          <parameter type-id='type-id-1'/>
-          <!-- void -->
-          <return type-id='type-id-56'/>
-        </function-decl>
-      </member-function>
-      <member-function access='private' vtable-offset='8'>
-        <!-- void MallocExtension::GetHeapSample(MallocExtensionWriter*) -->
-        <function-decl name='GetHeapSample' mangled-name='_ZN15MallocExtension13GetHeapSampleEPSs' filepath='src/malloc_extension.cc' line='292' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN15MallocExtension13GetHeapSampleEPSs'>
-          <!-- implicit parameter of type 'MallocExtension*' -->
-          <parameter type-id='type-id-259' is-artificial='yes'/>
-          <!-- parameter of type 'MallocExtensionWriter*' -->
-          <parameter type-id='type-id-901'/>
-          <!-- void -->
-          <return type-id='type-id-56'/>
-        </function-decl>
-      </member-function>
-      <member-function access='private' vtable-offset='9'>
-        <!-- void MallocExtension::GetHeapGrowthStacks(MallocExtensionWriter*) -->
-        <function-decl name='GetHeapGrowthStacks' mangled-name='_ZN15MallocExtension19GetHeapGrowthStacksEPSs' filepath='src/malloc_extension.cc' line='316' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN15MallocExtension19GetHeapGrowthStacksEPSs'>
-          <!-- implicit parameter of type 'MallocExtension*' -->
-          <parameter type-id='type-id-259' is-artificial='yes'/>
-          <!-- parameter of type 'MallocExtensionWriter*' -->
-          <parameter type-id='type-id-901'/>
-          <!-- void -->
-          <return type-id='type-id-56'/>
-        </function-decl>
-      </member-function>
-      <member-function access='private' vtable-offset='10'>
-        <!-- void MallocExtension::Ranges(void*, MallocExtension::RangeFunction*) -->
-        <function-decl name='Ranges' mangled-name='_ZN15MallocExtension6RangesEPvPFvS0_PKN4base11MallocRangeEE' filepath='src/malloc_extension.cc' line='340' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN15MallocExtension6RangesEPvPFvS0_PKN4base11MallocRangeEE'>
-          <!-- implicit parameter of type 'MallocExtension*' -->
-          <parameter type-id='type-id-259' is-artificial='yes'/>
-          <!-- parameter of type 'void*' -->
-          <parameter type-id='type-id-53'/>
-          <!-- parameter of type 'MallocExtension::RangeFunction*' -->
-          <parameter type-id='type-id-896'/>
-          <!-- void -->
-          <return type-id='type-id-56'/>
-        </function-decl>
-      </member-function>
-      <member-function access='private' vtable-offset='11'>
-        <!-- bool MallocExtension::GetNumericProperty(const char*, size_t*) -->
-        <function-decl name='GetNumericProperty' mangled-name='_ZN15MallocExtension18GetNumericPropertyEPKcPm' filepath='src/malloc_extension.cc' line='117' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN15MallocExtension18GetNumericPropertyEPKcPm'>
-          <!-- implicit parameter of type 'MallocExtension*' -->
-          <parameter type-id='type-id-259' is-artificial='yes'/>
-          <!-- parameter of type 'const char*' -->
-          <parameter type-id='type-id-52'/>
-          <!-- parameter of type 'size_t*' -->
-          <parameter type-id='type-id-230'/>
-          <!-- bool -->
-          <return type-id='type-id-55'/>
-        </function-decl>
-      </member-function>
-      <member-function access='private' vtable-offset='12'>
-        <!-- bool MallocExtension::SetNumericProperty(const char*, size_t) -->
-        <function-decl name='SetNumericProperty' mangled-name='_ZN15MallocExtension18SetNumericPropertyEPKcm' filepath='src/malloc_extension.cc' line='121' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN15MallocExtension18SetNumericPropertyEPKcm'>
-          <!-- implicit parameter of type 'MallocExtension*' -->
-          <parameter type-id='type-id-259' is-artificial='yes'/>
-          <!-- parameter of type 'const char*' -->
-          <parameter type-id='type-id-52'/>
-          <!-- parameter of type 'typedef size_t' -->
-          <parameter type-id='type-id-57'/>
-          <!-- bool -->
-          <return type-id='type-id-55'/>
-        </function-decl>
-      </member-function>
-      <member-function access='private' vtable-offset='13'>
-        <!-- void MallocExtension::MarkThreadIdle() -->
-        <function-decl name='MarkThreadIdle' mangled-name='_ZN15MallocExtension14MarkThreadIdleEv' filepath='src/malloc_extension.cc' line='146' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN15MallocExtension14MarkThreadIdleEv'>
-          <!-- implicit parameter of type 'MallocExtension*' -->
-          <parameter type-id='type-id-259' is-artificial='yes'/>
-          <!-- void -->
-          <return type-id='type-id-56'/>
-        </function-decl>
-      </member-function>
-      <member-function access='private' vtable-offset='14'>
-        <!-- void MallocExtension::MarkThreadBusy() -->
-        <function-decl name='MarkThreadBusy' mangled-name='_ZN15MallocExtension14MarkThreadBusyEv' filepath='src/malloc_extension.cc' line='150' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN15MallocExtension14MarkThreadBusyEv'>
-          <!-- implicit parameter of type 'MallocExtension*' -->
-          <parameter type-id='type-id-259' is-artificial='yes'/>
-          <!-- void -->
-          <return type-id='type-id-56'/>
-        </function-decl>
-      </member-function>
-      <member-function access='private' vtable-offset='15'>
-        <!-- SysAllocator* MallocExtension::GetSystemAllocator() -->
-        <function-decl name='GetSystemAllocator' mangled-name='_ZN15MallocExtension18GetSystemAllocatorEv' filepath='src/malloc_extension.cc' line='154' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN15MallocExtension18GetSystemAllocatorEv'>
-          <!-- implicit parameter of type 'MallocExtension*' -->
-          <parameter type-id='type-id-259' is-artificial='yes'/>
-          <!-- SysAllocator* -->
-          <return type-id='type-id-902'/>
-        </function-decl>
-      </member-function>
-      <member-function access='private' vtable-offset='16'>
-        <!-- void MallocExtension::SetSystemAllocator(SysAllocator*) -->
-        <function-decl name='SetSystemAllocator' mangled-name='_ZN15MallocExtension18SetSystemAllocatorEP12SysAllocator' filepath='src/malloc_extension.cc' line='158' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN15MallocExtension18SetSystemAllocatorEP12SysAllocator'>
-          <!-- implicit parameter of type 'MallocExtension*' -->
-          <parameter type-id='type-id-259' is-artificial='yes'/>
-          <!-- parameter of type 'SysAllocator*' -->
-          <parameter type-id='type-id-902'/>
-          <!-- void -->
-          <return type-id='type-id-56'/>
-        </function-decl>
-      </member-function>
-      <member-function access='private' vtable-offset='17'>
-        <!-- void MallocExtension::ReleaseToSystem(size_t) -->
-        <function-decl name='ReleaseToSystem' mangled-name='_ZN15MallocExtension15ReleaseToSystemEm' filepath='src/malloc_extension.cc' line='162' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN15MallocExtension15ReleaseToSystemEm'>
-          <!-- implicit parameter of type 'MallocExtension*' -->
-          <parameter type-id='type-id-259' is-artificial='yes'/>
-          <!-- parameter of type 'typedef size_t' -->
-          <parameter type-id='type-id-57'/>
-          <!-- void -->
-          <return type-id='type-id-56'/>
-        </function-decl>
-      </member-function>
-      <member-function access='private' vtable-offset='18'>
-        <!-- void MallocExtension::ReleaseFreeMemory() -->
-        <function-decl name='ReleaseFreeMemory' mangled-name='_ZN15MallocExtension17ReleaseFreeMemoryEv' filepath='src/malloc_extension.cc' line='166' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN15MallocExtension17ReleaseFreeMemoryEv'>
-          <!-- implicit parameter of type 'MallocExtension*' -->
-          <parameter type-id='type-id-259' is-artificial='yes'/>
-          <!-- void -->
-          <return type-id='type-id-56'/>
-        </function-decl>
-      </member-function>
-      <member-function access='private' vtable-offset='19'>
-        <!-- void MallocExtension::SetMemoryReleaseRate(double) -->
-        <function-decl name='SetMemoryReleaseRate' mangled-name='_ZN15MallocExtension20SetMemoryReleaseRateEd' filepath='src/malloc_extension.cc' line='170' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN15MallocExtension20SetMemoryReleaseRateEd'>
-          <!-- implicit parameter of type 'MallocExtension*' -->
-          <parameter type-id='type-id-259' is-artificial='yes'/>
-          <!-- parameter of type 'double' -->
-          <parameter type-id='type-id-2'/>
-          <!-- void -->
-          <return type-id='type-id-56'/>
-        </function-decl>
-      </member-function>
-      <member-function access='private' vtable-offset='20'>
-        <!-- double MallocExtension::GetMemoryReleaseRate() -->
-        <function-decl name='GetMemoryReleaseRate' mangled-name='_ZN15MallocExtension20GetMemoryReleaseRateEv' filepath='src/malloc_extension.cc' line='174' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN15MallocExtension20GetMemoryReleaseRateEv'>
-          <!-- implicit parameter of type 'MallocExtension*' -->
-          <parameter type-id='type-id-259' is-artificial='yes'/>
-          <!-- double -->
-          <return type-id='type-id-2'/>
-        </function-decl>
-      </member-function>
-      <member-function access='private' vtable-offset='21'>
-        <!-- size_t MallocExtension::GetEstimatedAllocatedSize(size_t) -->
-        <function-decl name='GetEstimatedAllocatedSize' mangled-name='_ZN15MallocExtension25GetEstimatedAllocatedSizeEm' filepath='src/malloc_extension.cc' line='178' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN15MallocExtension25GetEstimatedAllocatedSizeEm'>
-          <!-- implicit parameter of type 'MallocExtension*' -->
-          <parameter type-id='type-id-259' is-artificial='yes'/>
-          <!-- parameter of type 'typedef size_t' -->
-          <parameter type-id='type-id-57'/>
-          <!-- typedef size_t -->
-          <return type-id='type-id-57'/>
-        </function-decl>
-      </member-function>
-      <member-function access='private' vtable-offset='22'>
-        <!-- size_t MallocExtension::GetAllocatedSize(void*) -->
-        <function-decl name='GetAllocatedSize' mangled-name='_ZN15MallocExtension16GetAllocatedSizeEPKv' filepath='src/malloc_extension.cc' line='182' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN15MallocExtension16GetAllocatedSizeEPKv'>
-          <!-- implicit parameter of type 'MallocExtension*' -->
-          <parameter type-id='type-id-259' is-artificial='yes'/>
-          <!-- parameter of type 'void*' -->
-          <parameter type-id='type-id-53'/>
-          <!-- typedef size_t -->
-          <return type-id='type-id-57'/>
-        </function-decl>
-      </member-function>
-      <member-function access='private' vtable-offset='23'>
-        <!-- MallocExtension::Ownership MallocExtension::GetOwnership(void*) -->
-        <function-decl name='GetOwnership' mangled-name='_ZN15MallocExtension12GetOwnershipEPKv' filepath='src/malloc_extension.cc' line='187' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN15MallocExtension12GetOwnershipEPKv'>
-          <!-- implicit parameter of type 'MallocExtension*' -->
-          <parameter type-id='type-id-259' is-artificial='yes'/>
-          <!-- parameter of type 'void*' -->
-          <parameter type-id='type-id-53'/>
-          <!-- enum MallocExtension::Ownership -->
-          <return type-id='type-id-898'/>
-        </function-decl>
-      </member-function>
-      <member-function access='private' vtable-offset='24'>
-        <!-- void MallocExtension::GetFreeListSizes(std::vector<MallocExtension::FreeListInfo, std::allocator<MallocExtension::FreeListInfo> >*) -->
-        <function-decl name='GetFreeListSizes' mangled-name='_ZN15MallocExtension16GetFreeListSizesEPSt6vectorINS_12FreeListInfoESaIS1_EE' filepath='src/malloc_extension.cc' line='191' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN15MallocExtension16GetFreeListSizesEPSt6vectorINS_12FreeListInfoESaIS1_EE'>
-          <!-- implicit parameter of type 'MallocExtension*' -->
-          <parameter type-id='type-id-259' is-artificial='yes'/>
-          <!-- parameter of type 'std::vector<MallocExtension::FreeListInfo, std::allocator<MallocExtension::FreeListInfo> >*' -->
-          <parameter type-id='type-id-903'/>
-          <!-- void -->
-          <return type-id='type-id-56'/>
-        </function-decl>
-      </member-function>
-      <member-function access='private' vtable-offset='25'>
-        <!-- void** MallocExtension::ReadStackTraces(int*) -->
-        <function-decl name='ReadStackTraces' mangled-name='_ZN15MallocExtension15ReadStackTracesEPi' filepath='src/malloc_extension.cc' line='138' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN15MallocExtension15ReadStackTracesEPi'>
-          <!-- implicit parameter of type 'MallocExtension*' -->
-          <parameter type-id='type-id-259' is-artificial='yes'/>
-          <!-- parameter of type 'int*' -->
-          <parameter type-id='type-id-897'/>
-          <!-- void** -->
-          <return type-id='type-id-120'/>
-        </function-decl>
-      </member-function>
-      <member-function access='private' vtable-offset='26'>
-        <!-- void** MallocExtension::ReadHeapGrowthStackTraces() -->
-        <function-decl name='ReadHeapGrowthStackTraces' mangled-name='_ZN15MallocExtension25ReadHeapGrowthStackTracesEv' filepath='src/malloc_extension.cc' line='142' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN15MallocExtension25ReadHeapGrowthStackTracesEv'>
-          <!-- implicit parameter of type 'MallocExtension*' -->
-          <parameter type-id='type-id-259' is-artificial='yes'/>
-          <!-- void** -->
-          <return type-id='type-id-120'/>
-        </function-decl>
-      </member-function>
-    </class-decl>
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='src/malloc_hook.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-kFgaKP/gperftools-2.4' language='LANG_C_plus_plus'>
     <!-- typedef void (void*, typedef size_t, int, int, int, typedef off_t)* MallocHook_PreMmapHook -->
-    <typedef-decl name='MallocHook_PreMmapHook' type-id='type-id-904' filepath='./src/gperftools/malloc_hook_c.h' line='87' column='1' id='type-id-905'/>
+    <typedef-decl name='MallocHook_PreMmapHook' type-id='type-id-898' filepath='./src/gperftools/malloc_hook_c.h' line='87' column='1' id='type-id-899'/>
     <!-- typedef int (void*, typedef size_t, int, int, int, typedef off_t, void**)* MallocHook_MmapReplacement -->
-    <typedef-decl name='MallocHook_MmapReplacement' type-id='type-id-906' filepath='./src/gperftools/malloc_hook_c.h' line='111' column='1' id='type-id-907'/>
+    <typedef-decl name='MallocHook_MmapReplacement' type-id='type-id-900' filepath='./src/gperftools/malloc_hook_c.h' line='111' column='1' id='type-id-901'/>
     <!-- typedef int (void*, typedef size_t, int*)* MallocHook_MunmapReplacement -->
-    <typedef-decl name='MallocHook_MunmapReplacement' type-id='type-id-908' filepath='./src/gperftools/malloc_hook_c.h' line='123' column='1' id='type-id-909'/>
+    <typedef-decl name='MallocHook_MunmapReplacement' type-id='type-id-902' filepath='./src/gperftools/malloc_hook_c.h' line='123' column='1' id='type-id-903'/>
     <!-- typedef void (void*, typedef size_t)* MallocHook_MunmapHook -->
-    <typedef-decl name='MallocHook_MunmapHook' type-id='type-id-363' filepath='./src/gperftools/malloc_hook_c.h' line='115' column='1' id='type-id-910'/>
+    <typedef-decl name='MallocHook_MunmapHook' type-id='type-id-363' filepath='./src/gperftools/malloc_hook_c.h' line='115' column='1' id='type-id-904'/>
     <!-- typedef void (void*, void*, typedef size_t, typedef size_t, int, void*)* MallocHook_MremapHook -->
-    <typedef-decl name='MallocHook_MremapHook' type-id='type-id-911' filepath='./src/gperftools/malloc_hook_c.h' line='132' column='1' id='type-id-912'/>
+    <typedef-decl name='MallocHook_MremapHook' type-id='type-id-905' filepath='./src/gperftools/malloc_hook_c.h' line='132' column='1' id='type-id-906'/>
     <!-- typedef void (typedef ptrdiff_t)* MallocHook_PreSbrkHook -->
-    <typedef-decl name='MallocHook_PreSbrkHook' type-id='type-id-913' filepath='./src/gperftools/malloc_hook_c.h' line='138' column='1' id='type-id-914'/>
+    <typedef-decl name='MallocHook_PreSbrkHook' type-id='type-id-907' filepath='./src/gperftools/malloc_hook_c.h' line='138' column='1' id='type-id-908'/>
     <!-- base::internal::HookList<int (*)(const void*, size_t, int*)>* -->
-    <pointer-type-def type-id='type-id-915' size-in-bits='64' id='type-id-916'/>
+    <pointer-type-def type-id='type-id-909' size-in-bits='64' id='type-id-910'/>
     <!-- base::internal::HookList<int (*)(const void*, size_t, int, int, int, off_t, void**)>* -->
-    <pointer-type-def type-id='type-id-917' size-in-bits='64' id='type-id-918'/>
+    <pointer-type-def type-id='type-id-911' size-in-bits='64' id='type-id-912'/>
     <!-- base::internal::HookList<void (*)(const void*, const void*, size_t, size_t, int, const void*)>* -->
-    <pointer-type-def type-id='type-id-919' size-in-bits='64' id='type-id-920'/>
+    <pointer-type-def type-id='type-id-913' size-in-bits='64' id='type-id-914'/>
     <!-- base::internal::HookList<void (*)(const void*, size_t, int, int, int, off_t)>* -->
-    <pointer-type-def type-id='type-id-921' size-in-bits='64' id='type-id-922'/>
+    <pointer-type-def type-id='type-id-915' size-in-bits='64' id='type-id-916'/>
     <!-- base::internal::HookList<void (*)(ptrdiff_t)>* -->
-    <pointer-type-def type-id='type-id-923' size-in-bits='64' id='type-id-924'/>
+    <pointer-type-def type-id='type-id-917' size-in-bits='64' id='type-id-918'/>
     <!-- const base::internal::HookList<int (*)(const void*, size_t, int*)> -->
-    <qualified-type-def type-id='type-id-915' const='yes' id='type-id-925'/>
+    <qualified-type-def type-id='type-id-909' const='yes' id='type-id-919'/>
     <!-- const base::internal::HookList<int (*)(const void*, size_t, int*)>* -->
-    <pointer-type-def type-id='type-id-925' size-in-bits='64' id='type-id-926'/>
+    <pointer-type-def type-id='type-id-919' size-in-bits='64' id='type-id-920'/>
     <!-- const base::internal::HookList<int (*)(const void*, size_t, int, int, int, off_t, void**)> -->
-    <qualified-type-def type-id='type-id-917' const='yes' id='type-id-927'/>
+    <qualified-type-def type-id='type-id-911' const='yes' id='type-id-921'/>
     <!-- const base::internal::HookList<int (*)(const void*, size_t, int, int, int, off_t, void**)>* -->
-    <pointer-type-def type-id='type-id-927' size-in-bits='64' id='type-id-928'/>
+    <pointer-type-def type-id='type-id-921' size-in-bits='64' id='type-id-922'/>
     <!-- const base::internal::HookList<void (*)(const void*, const void*, size_t, size_t, int, const void*)> -->
-    <qualified-type-def type-id='type-id-919' const='yes' id='type-id-929'/>
+    <qualified-type-def type-id='type-id-913' const='yes' id='type-id-923'/>
     <!-- const base::internal::HookList<void (*)(const void*, const void*, size_t, size_t, int, const void*)>* -->
-    <pointer-type-def type-id='type-id-929' size-in-bits='64' id='type-id-930'/>
+    <pointer-type-def type-id='type-id-923' size-in-bits='64' id='type-id-924'/>
     <!-- const base::internal::HookList<void (*)(const void*, size_t, int, int, int, off_t)> -->
-    <qualified-type-def type-id='type-id-921' const='yes' id='type-id-931'/>
+    <qualified-type-def type-id='type-id-915' const='yes' id='type-id-925'/>
     <!-- const base::internal::HookList<void (*)(const void*, size_t, int, int, int, off_t)>* -->
-    <pointer-type-def type-id='type-id-931' size-in-bits='64' id='type-id-932'/>
+    <pointer-type-def type-id='type-id-925' size-in-bits='64' id='type-id-926'/>
     <!-- const base::internal::HookList<void (*)(ptrdiff_t)> -->
-    <qualified-type-def type-id='type-id-923' const='yes' id='type-id-933'/>
+    <qualified-type-def type-id='type-id-917' const='yes' id='type-id-927'/>
     <!-- const base::internal::HookList<void (*)(ptrdiff_t)>* -->
-    <pointer-type-def type-id='type-id-933' size-in-bits='64' id='type-id-934'/>
+    <pointer-type-def type-id='type-id-927' size-in-bits='64' id='type-id-928'/>
     <!-- int (void*, typedef size_t, int*)* -->
-    <pointer-type-def type-id='type-id-935' size-in-bits='64' id='type-id-908'/>
+    <pointer-type-def type-id='type-id-929' size-in-bits='64' id='type-id-902'/>
     <!-- int (void*, typedef size_t, int*)** -->
-    <pointer-type-def type-id='type-id-908' size-in-bits='64' id='type-id-936'/>
+    <pointer-type-def type-id='type-id-902' size-in-bits='64' id='type-id-930'/>
     <!-- int (void*, typedef size_t, int, int, int, typedef off_t, void**)* -->
-    <pointer-type-def type-id='type-id-937' size-in-bits='64' id='type-id-906'/>
+    <pointer-type-def type-id='type-id-931' size-in-bits='64' id='type-id-900'/>
     <!-- int (void*, typedef size_t, int, int, int, typedef off_t, void**)** -->
-    <pointer-type-def type-id='type-id-906' size-in-bits='64' id='type-id-938'/>
+    <pointer-type-def type-id='type-id-900' size-in-bits='64' id='type-id-932'/>
     <!-- void (typedef ptrdiff_t)* -->
-    <pointer-type-def type-id='type-id-939' size-in-bits='64' id='type-id-913'/>
+    <pointer-type-def type-id='type-id-933' size-in-bits='64' id='type-id-907'/>
     <!-- void (typedef ptrdiff_t)** -->
-    <pointer-type-def type-id='type-id-913' size-in-bits='64' id='type-id-940'/>
+    <pointer-type-def type-id='type-id-907' size-in-bits='64' id='type-id-934'/>
     <!-- void (void*, typedef size_t, int, int, int, typedef off_t)* -->
-    <pointer-type-def type-id='type-id-941' size-in-bits='64' id='type-id-904'/>
+    <pointer-type-def type-id='type-id-935' size-in-bits='64' id='type-id-898'/>
     <!-- void (void*, typedef size_t, int, int, int, typedef off_t)** -->
-    <pointer-type-def type-id='type-id-904' size-in-bits='64' id='type-id-942'/>
+    <pointer-type-def type-id='type-id-898' size-in-bits='64' id='type-id-936'/>
     <!-- void (void*, void*, typedef size_t, typedef size_t, int, void*)* -->
-    <pointer-type-def type-id='type-id-943' size-in-bits='64' id='type-id-911'/>
+    <pointer-type-def type-id='type-id-937' size-in-bits='64' id='type-id-905'/>
     <!-- void (void*, void*, typedef size_t, typedef size_t, int, void*)** -->
-    <pointer-type-def type-id='type-id-911' size-in-bits='64' id='type-id-944'/>
+    <pointer-type-def type-id='type-id-905' size-in-bits='64' id='type-id-938'/>
     <!-- volatile base::subtle::Atomic64* -->
-    <pointer-type-def type-id='type-id-945' size-in-bits='64' id='type-id-946'/>
+    <pointer-type-def type-id='type-id-939' size-in-bits='64' id='type-id-940'/>
     <!-- namespace std -->
     <namespace-decl name='std'>
       <!-- void** std::__copy_move_a<false, void**, void**>(void**, void**, void**) -->
@@ -24008,7 +23664,7 @@
       <!-- namespace base::internal -->
       <namespace-decl name='internal'>
         <!-- struct base::internal::HookList<void (*)(const void*, size_t, int, int, int, off_t)> -->
-        <class-decl name='HookList&lt;void (*)(const void*, size_t, int, int, int, off_t)&gt;' size-in-bits='576' is-struct='yes' visibility='default' filepath='src/malloc_hook-inl.h' line='59' column='1' id='type-id-921'>
+        <class-decl name='HookList&lt;void (*)(const void*, size_t, int, int, int, off_t)&gt;' size-in-bits='576' is-struct='yes' visibility='default' filepath='src/malloc_hook-inl.h' line='59' column='1' id='type-id-915'>
           <data-member access='public' layout-offset-in-bits='0'>
             <!-- AtomicWord base::internal::HookList<void (*)(const void*, size_t, int, int, int, off_t)>::priv_end -->
             <var-decl name='priv_end' type-id='type-id-781' visibility='default' filepath='src/malloc_hook-inl.h' line='101' column='1'/>
@@ -24021,9 +23677,9 @@
             <!-- bool base::internal::HookList<void (*)(const void*, size_t, int, int, int, off_t)>::Add(void (void*, typedef size_t, int, int, int, typedef off_t)*) -->
             <function-decl name='Add' mangled-name='_ZN4base8internal8HookListIPFvPKvmiiilEE3AddES5_' filepath='src/malloc_hook-inl.h' line='65' column='1' visibility='default' binding='global' size-in-bits='64'>
               <!-- implicit parameter of type 'base::internal::HookList<void (*)(const void*, size_t, int, int, int, off_t)>*' -->
-              <parameter type-id='type-id-922' is-artificial='yes'/>
+              <parameter type-id='type-id-916' is-artificial='yes'/>
               <!-- parameter of type 'void (void*, typedef size_t, int, int, int, typedef off_t)*' -->
-              <parameter type-id='type-id-904'/>
+              <parameter type-id='type-id-898'/>
               <!-- bool -->
               <return type-id='type-id-55'/>
             </function-decl>
@@ -24032,7 +23688,7 @@
             <!-- void base::internal::HookList<void (*)(const void*, size_t, int, int, int, off_t)>::FixupPrivEndLocked() -->
             <function-decl name='FixupPrivEndLocked' mangled-name='_ZN4base8internal8HookListIPFvPKvmiiilEE18FixupPrivEndLockedEv' filepath='src/malloc_hook-inl.h' line='67' column='1' visibility='default' binding='global' size-in-bits='64'>
               <!-- implicit parameter of type 'base::internal::HookList<void (*)(const void*, size_t, int, int, int, off_t)>*' -->
-              <parameter type-id='type-id-922' is-artificial='yes'/>
+              <parameter type-id='type-id-916' is-artificial='yes'/>
               <!-- void -->
               <return type-id='type-id-56'/>
             </function-decl>
@@ -24041,9 +23697,9 @@
             <!-- bool base::internal::HookList<void (*)(const void*, size_t, int, int, int, off_t)>::Remove(void (void*, typedef size_t, int, int, int, typedef off_t)*) -->
             <function-decl name='Remove' mangled-name='_ZN4base8internal8HookListIPFvPKvmiiilEE6RemoveES5_' filepath='src/malloc_hook-inl.h' line='72' column='1' visibility='default' binding='global' size-in-bits='64'>
               <!-- implicit parameter of type 'base::internal::HookList<void (*)(const void*, size_t, int, int, int, off_t)>*' -->
-              <parameter type-id='type-id-922' is-artificial='yes'/>
+              <parameter type-id='type-id-916' is-artificial='yes'/>
               <!-- parameter of type 'void (void*, typedef size_t, int, int, int, typedef off_t)*' -->
-              <parameter type-id='type-id-904'/>
+              <parameter type-id='type-id-898'/>
               <!-- bool -->
               <return type-id='type-id-55'/>
             </function-decl>
@@ -24052,9 +23708,9 @@
             <!-- int base::internal::HookList<void (*)(const void*, size_t, int, int, int, off_t)>::Traverse(void (void*, typedef size_t, int, int, int, typedef off_t)**, int) -->
             <function-decl name='Traverse' mangled-name='_ZNK4base8internal8HookListIPFvPKvmiiilEE8TraverseEPS5_i' filepath='src/malloc_hook-inl.h' line='77' column='1' visibility='default' binding='global' size-in-bits='64'>
               <!-- implicit parameter of type 'const base::internal::HookList<void (*)(const void*, size_t, int, int, int, off_t)>*' -->
-              <parameter type-id='type-id-932' is-artificial='yes'/>
+              <parameter type-id='type-id-926' is-artificial='yes'/>
               <!-- parameter of type 'void (void*, typedef size_t, int, int, int, typedef off_t)**' -->
-              <parameter type-id='type-id-942'/>
+              <parameter type-id='type-id-936'/>
               <!-- parameter of type 'int' -->
               <parameter type-id='type-id-1'/>
               <!-- int -->
@@ -24065,7 +23721,7 @@
             <!-- bool base::internal::HookList<void (*)(const void*, size_t, int, int, int, off_t)>::empty() -->
             <function-decl name='empty' mangled-name='_ZNK4base8internal8HookListIPFvPKvmiiilEE5emptyEv' filepath='src/malloc_hook-inl.h' line='80' column='1' visibility='default' binding='global' size-in-bits='64'>
               <!-- implicit parameter of type 'const base::internal::HookList<void (*)(const void*, size_t, int, int, int, off_t)>*' -->
-              <parameter type-id='type-id-932' is-artificial='yes'/>
+              <parameter type-id='type-id-926' is-artificial='yes'/>
               <!-- bool -->
               <return type-id='type-id-55'/>
             </function-decl>
@@ -24074,25 +23730,25 @@
             <!-- void (void*, typedef size_t, int, int, int, typedef off_t)* base::internal::HookList<void (*)(const void*, size_t, int, int, int, off_t)>::GetSingular() -->
             <function-decl name='GetSingular' mangled-name='_ZNK4base8internal8HookListIPFvPKvmiiilEE11GetSingularEv' filepath='src/malloc_hook-inl.h' line='85' column='1' visibility='default' binding='global' size-in-bits='64'>
               <!-- implicit parameter of type 'const base::internal::HookList<void (*)(const void*, size_t, int, int, int, off_t)>*' -->
-              <parameter type-id='type-id-932' is-artificial='yes'/>
+              <parameter type-id='type-id-926' is-artificial='yes'/>
               <!-- void (void*, typedef size_t, int, int, int, typedef off_t)* -->
-              <return type-id='type-id-904'/>
+              <return type-id='type-id-898'/>
             </function-decl>
           </member-function>
           <member-function access='public'>
             <!-- void (void*, typedef size_t, int, int, int, typedef off_t)* base::internal::HookList<void (*)(const void*, size_t, int, int, int, off_t)>::ExchangeSingular(void (void*, typedef size_t, int, int, int, typedef off_t)*) -->
             <function-decl name='ExchangeSingular' mangled-name='_ZN4base8internal8HookListIPFvPKvmiiilEE16ExchangeSingularES5_' filepath='src/malloc_hook-inl.h' line='90' column='1' visibility='default' binding='global' size-in-bits='64'>
               <!-- implicit parameter of type 'base::internal::HookList<void (*)(const void*, size_t, int, int, int, off_t)>*' -->
-              <parameter type-id='type-id-922' is-artificial='yes'/>
+              <parameter type-id='type-id-916' is-artificial='yes'/>
               <!-- parameter of type 'void (void*, typedef size_t, int, int, int, typedef off_t)*' -->
-              <parameter type-id='type-id-904'/>
+              <parameter type-id='type-id-898'/>
               <!-- void (void*, typedef size_t, int, int, int, typedef off_t)* -->
-              <return type-id='type-id-904'/>
+              <return type-id='type-id-898'/>
             </function-decl>
           </member-function>
         </class-decl>
         <!-- struct base::internal::HookList<void (*)(const void*, const void*, size_t, size_t, int, const void*)> -->
-        <class-decl name='HookList&lt;void (*)(const void*, const void*, size_t, size_t, int, const void*)&gt;' size-in-bits='576' is-struct='yes' visibility='default' filepath='src/malloc_hook-inl.h' line='59' column='1' id='type-id-919'>
+        <class-decl name='HookList&lt;void (*)(const void*, const void*, size_t, size_t, int, const void*)&gt;' size-in-bits='576' is-struct='yes' visibility='default' filepath='src/malloc_hook-inl.h' line='59' column='1' id='type-id-913'>
           <data-member access='public' layout-offset-in-bits='0'>
             <!-- AtomicWord base::internal::HookList<void (*)(const void*, const void*, size_t, size_t, int, const void*)>::priv_end -->
             <var-decl name='priv_end' type-id='type-id-781' visibility='default' filepath='src/malloc_hook-inl.h' line='101' column='1'/>
@@ -24105,9 +23761,9 @@
             <!-- bool base::internal::HookList<void (*)(const void*, const void*, size_t, size_t, int, const void*)>::Add(void (void*, void*, typedef size_t, typedef size_t, int, void*)*) -->
             <function-decl name='Add' mangled-name='_ZN4base8internal8HookListIPFvPKvS3_mmiS3_EE3AddES5_' filepath='src/malloc_hook-inl.h' line='65' column='1' visibility='default' binding='global' size-in-bits='64'>
               <!-- implicit parameter of type 'base::internal::HookList<void (*)(const void*, const void*, size_t, size_t, int, const void*)>*' -->
-              <parameter type-id='type-id-920' is-artificial='yes'/>
+              <parameter type-id='type-id-914' is-artificial='yes'/>
               <!-- parameter of type 'void (void*, void*, typedef size_t, typedef size_t, int, void*)*' -->
-              <parameter type-id='type-id-911'/>
+              <parameter type-id='type-id-905'/>
               <!-- bool -->
               <return type-id='type-id-55'/>
             </function-decl>
@@ -24116,7 +23772,7 @@
             <!-- void base::internal::HookList<void (*)(const void*, const void*, size_t, size_t, int, const void*)>::FixupPrivEndLocked() -->
             <function-decl name='FixupPrivEndLocked' mangled-name='_ZN4base8internal8HookListIPFvPKvS3_mmiS3_EE18FixupPrivEndLockedEv' filepath='src/malloc_hook-inl.h' line='67' column='1' visibility='default' binding='global' size-in-bits='64'>
               <!-- implicit parameter of type 'base::internal::HookList<void (*)(const void*, const void*, size_t, size_t, int, const void*)>*' -->
-              <parameter type-id='type-id-920' is-artificial='yes'/>
+              <parameter type-id='type-id-914' is-artificial='yes'/>
               <!-- void -->
               <return type-id='type-id-56'/>
             </function-decl>
@@ -24125,9 +23781,9 @@
             <!-- bool base::internal::HookList<void (*)(const void*, const void*, size_t, size_t, int, const void*)>::Remove(void (void*, void*, typedef size_t, typedef size_t, int, void*)*) -->
             <function-decl name='Remove' mangled-name='_ZN4base8internal8HookListIPFvPKvS3_mmiS3_EE6RemoveES5_' filepath='src/malloc_hook-inl.h' line='72' column='1' visibility='default' binding='global' size-in-bits='64'>
               <!-- implicit parameter of type 'base::internal::HookList<void (*)(const void*, const void*, size_t, size_t, int, const void*)>*' -->
-              <parameter type-id='type-id-920' is-artificial='yes'/>
+              <parameter type-id='type-id-914' is-artificial='yes'/>
               <!-- parameter of type 'void (void*, void*, typedef size_t, typedef size_t, int, void*)*' -->
-              <parameter type-id='type-id-911'/>
+              <parameter type-id='type-id-905'/>
               <!-- bool -->
               <return type-id='type-id-55'/>
             </function-decl>
@@ -24136,9 +23792,9 @@
             <!-- int base::internal::HookList<void (*)(const void*, const void*, size_t, size_t, int, const void*)>::Traverse(void (void*, void*, typedef size_t, typedef size_t, int, void*)**, int) -->
             <function-decl name='Traverse' mangled-name='_ZNK4base8internal8HookListIPFvPKvS3_mmiS3_EE8TraverseEPS5_i' filepath='src/malloc_hook-inl.h' line='77' column='1' visibility='default' binding='global' size-in-bits='64'>
               <!-- implicit parameter of type 'const base::internal::HookList<void (*)(const void*, const void*, size_t, size_t, int, const void*)>*' -->
-              <parameter type-id='type-id-930' is-artificial='yes'/>
+              <parameter type-id='type-id-924' is-artificial='yes'/>
               <!-- parameter of type 'void (void*, void*, typedef size_t, typedef size_t, int, void*)**' -->
-              <parameter type-id='type-id-944'/>
+              <parameter type-id='type-id-938'/>
               <!-- parameter of type 'int' -->
               <parameter type-id='type-id-1'/>
               <!-- int -->
@@ -24149,7 +23805,7 @@
             <!-- bool base::internal::HookList<void (*)(const void*, const void*, size_t, size_t, int, const void*)>::empty() -->
             <function-decl name='empty' mangled-name='_ZNK4base8internal8HookListIPFvPKvS3_mmiS3_EE5emptyEv' filepath='src/malloc_hook-inl.h' line='80' column='1' visibility='default' binding='global' size-in-bits='64'>
               <!-- implicit parameter of type 'const base::internal::HookList<void (*)(const void*, const void*, size_t, size_t, int, const void*)>*' -->
-              <parameter type-id='type-id-930' is-artificial='yes'/>
+              <parameter type-id='type-id-924' is-artificial='yes'/>
               <!-- bool -->
               <return type-id='type-id-55'/>
             </function-decl>
@@ -24158,25 +23814,25 @@
             <!-- void (void*, void*, typedef size_t, typedef size_t, int, void*)* base::internal::HookList<void (*)(const void*, const void*, size_t, size_t, int, const void*)>::GetSingular() -->
             <function-decl name='GetSingular' mangled-name='_ZNK4base8internal8HookListIPFvPKvS3_mmiS3_EE11GetSingularEv' filepath='src/malloc_hook-inl.h' line='85' column='1' visibility='default' binding='global' size-in-bits='64'>
               <!-- implicit parameter of type 'const base::internal::HookList<void (*)(const void*, const void*, size_t, size_t, int, const void*)>*' -->
-              <parameter type-id='type-id-930' is-artificial='yes'/>
+              <parameter type-id='type-id-924' is-artificial='yes'/>
               <!-- void (void*, void*, typedef size_t, typedef size_t, int, void*)* -->
-              <return type-id='type-id-911'/>
+              <return type-id='type-id-905'/>
             </function-decl>
           </member-function>
           <member-function access='public'>
             <!-- void (void*, void*, typedef size_t, typedef size_t, int, void*)* base::internal::HookList<void (*)(const void*, const void*, size_t, size_t, int, const void*)>::ExchangeSingular(void (void*, void*, typedef size_t, typedef size_t, int, void*)*) -->
             <function-decl name='ExchangeSingular' mangled-name='_ZN4base8internal8HookListIPFvPKvS3_mmiS3_EE16ExchangeSingularES5_' filepath='src/malloc_hook-inl.h' line='90' column='1' visibility='default' binding='global' size-in-bits='64'>
               <!-- implicit parameter of type 'base::internal::HookList<void (*)(const void*, const void*, size_t, size_t, int, const void*)>*' -->
-              <parameter type-id='type-id-920' is-artificial='yes'/>
+              <parameter type-id='type-id-914' is-artificial='yes'/>
               <!-- parameter of type 'void (void*, void*, typedef size_t, typedef size_t, int, void*)*' -->
-              <parameter type-id='type-id-911'/>
+              <parameter type-id='type-id-905'/>
               <!-- void (void*, void*, typedef size_t, typedef size_t, int, void*)* -->
-              <return type-id='type-id-911'/>
+              <return type-id='type-id-905'/>
             </function-decl>
           </member-function>
         </class-decl>
         <!-- struct base::internal::HookList<void (*)(ptrdiff_t)> -->
-        <class-decl name='HookList&lt;void (*)(ptrdiff_t)&gt;' size-in-bits='576' is-struct='yes' visibility='default' filepath='src/malloc_hook-inl.h' line='59' column='1' id='type-id-923'>
+        <class-decl name='HookList&lt;void (*)(ptrdiff_t)&gt;' size-in-bits='576' is-struct='yes' visibility='default' filepath='src/malloc_hook-inl.h' line='59' column='1' id='type-id-917'>
           <data-member access='public' layout-offset-in-bits='0'>
             <!-- AtomicWord base::internal::HookList<void (*)(ptrdiff_t)>::priv_end -->
             <var-decl name='priv_end' type-id='type-id-781' visibility='default' filepath='src/malloc_hook-inl.h' line='101' column='1'/>
@@ -24189,9 +23845,9 @@
             <!-- bool base::internal::HookList<void (*)(ptrdiff_t)>::Add(void (typedef ptrdiff_t)*) -->
             <function-decl name='Add' mangled-name='_ZN4base8internal8HookListIPFvlEE3AddES3_' filepath='src/malloc_hook-inl.h' line='65' column='1' visibility='default' binding='global' size-in-bits='64'>
               <!-- implicit parameter of type 'base::internal::HookList<void (*)(ptrdiff_t)>*' -->
-              <parameter type-id='type-id-924' is-artificial='yes'/>
+              <parameter type-id='type-id-918' is-artificial='yes'/>
               <!-- parameter of type 'void (typedef ptrdiff_t)*' -->
-              <parameter type-id='type-id-913'/>
+              <parameter type-id='type-id-907'/>
               <!-- bool -->
               <return type-id='type-id-55'/>
             </function-decl>
@@ -24200,7 +23856,7 @@
             <!-- void base::internal::HookList<void (*)(ptrdiff_t)>::FixupPrivEndLocked() -->
             <function-decl name='FixupPrivEndLocked' mangled-name='_ZN4base8internal8HookListIPFvlEE18FixupPrivEndLockedEv' filepath='src/malloc_hook-inl.h' line='67' column='1' visibility='default' binding='global' size-in-bits='64'>
               <!-- implicit parameter of type 'base::internal::HookList<void (*)(ptrdiff_t)>*' -->
-              <parameter type-id='type-id-924' is-artificial='yes'/>
+              <parameter type-id='type-id-918' is-artificial='yes'/>
               <!-- void -->
               <return type-id='type-id-56'/>
             </function-decl>
@@ -24209,9 +23865,9 @@
             <!-- bool base::internal::HookList<void (*)(ptrdiff_t)>::Remove(void (typedef ptrdiff_t)*) -->
             <function-decl name='Remove' mangled-name='_ZN4base8internal8HookListIPFvlEE6RemoveES3_' filepath='src/malloc_hook-inl.h' line='72' column='1' visibility='default' binding='global' size-in-bits='64'>
               <!-- implicit parameter of type 'base::internal::HookList<void (*)(ptrdiff_t)>*' -->
-              <parameter type-id='type-id-924' is-artificial='yes'/>
+              <parameter type-id='type-id-918' is-artificial='yes'/>
               <!-- parameter of type 'void (typedef ptrdiff_t)*' -->
-              <parameter type-id='type-id-913'/>
+              <parameter type-id='type-id-907'/>
               <!-- bool -->
               <return type-id='type-id-55'/>
             </function-decl>
@@ -24220,9 +23876,9 @@
             <!-- int base::internal::HookList<void (*)(ptrdiff_t)>::Traverse(void (typedef ptrdiff_t)**, int) -->
             <function-decl name='Traverse' mangled-name='_ZNK4base8internal8HookListIPFvlEE8TraverseEPS3_i' filepath='src/malloc_hook-inl.h' line='77' column='1' visibility='default' binding='global' size-in-bits='64'>
               <!-- implicit parameter of type 'const base::internal::HookList<void (*)(ptrdiff_t)>*' -->
-              <parameter type-id='type-id-934' is-artificial='yes'/>
+              <parameter type-id='type-id-928' is-artificial='yes'/>
               <!-- parameter of type 'void (typedef ptrdiff_t)**' -->
-              <parameter type-id='type-id-940'/>
+              <parameter type-id='type-id-934'/>
               <!-- parameter of type 'int' -->
               <parameter type-id='type-id-1'/>
               <!-- int -->
@@ -24233,7 +23889,7 @@
             <!-- bool base::internal::HookList<void (*)(ptrdiff_t)>::empty() -->
             <function-decl name='empty' mangled-name='_ZNK4base8internal8HookListIPFvlEE5emptyEv' filepath='src/malloc_hook-inl.h' line='80' column='1' visibility='default' binding='global' size-in-bits='64'>
               <!-- implicit parameter of type 'const base::internal::HookList<void (*)(ptrdiff_t)>*' -->
-              <parameter type-id='type-id-934' is-artificial='yes'/>
+              <parameter type-id='type-id-928' is-artificial='yes'/>
               <!-- bool -->
               <return type-id='type-id-55'/>
             </function-decl>
@@ -24242,25 +23898,25 @@
             <!-- void (typedef ptrdiff_t)* base::internal::HookList<void (*)(ptrdiff_t)>::GetSingular() -->
             <function-decl name='GetSingular' mangled-name='_ZNK4base8internal8HookListIPFvlEE11GetSingularEv' filepath='src/malloc_hook-inl.h' line='85' column='1' visibility='default' binding='global' size-in-bits='64'>
               <!-- implicit parameter of type 'const base::internal::HookList<void (*)(ptrdiff_t)>*' -->
-              <parameter type-id='type-id-934' is-artificial='yes'/>
+              <parameter type-id='type-id-928' is-artificial='yes'/>
               <!-- void (typedef ptrdiff_t)* -->
-              <return type-id='type-id-913'/>
+              <return type-id='type-id-907'/>
             </function-decl>
           </member-function>
           <member-function access='public'>
             <!-- void (typedef ptrdiff_t)* base::internal::HookList<void (*)(ptrdiff_t)>::ExchangeSingular(void (typedef ptrdiff_t)*) -->
             <function-decl name='ExchangeSingular' mangled-name='_ZN4base8internal8HookListIPFvlEE16ExchangeSingularES3_' filepath='src/malloc_hook-inl.h' line='90' column='1' visibility='default' binding='global' size-in-bits='64'>
               <!-- implicit parameter of type 'base::internal::HookList<void (*)(ptrdiff_t)>*' -->
-              <parameter type-id='type-id-924' is-artificial='yes'/>
+              <parameter type-id='type-id-918' is-artificial='yes'/>
               <!-- parameter of type 'void (typedef ptrdiff_t)*' -->
-              <parameter type-id='type-id-913'/>
+              <parameter type-id='type-id-907'/>
               <!-- void (typedef ptrdiff_t)* -->
-              <return type-id='type-id-913'/>
+              <return type-id='type-id-907'/>
             </function-decl>
           </member-function>
         </class-decl>
         <!-- struct base::internal::HookList<int (*)(const void*, size_t, int, int, int, off_t, void**)> -->
-        <class-decl name='HookList&lt;int (*)(const void*, size_t, int, int, int, off_t, void**)&gt;' size-in-bits='576' is-struct='yes' visibility='default' filepath='src/malloc_hook-inl.h' line='59' column='1' id='type-id-917'>
+        <class-decl name='HookList&lt;int (*)(const void*, size_t, int, int, int, off_t, void**)&gt;' size-in-bits='576' is-struct='yes' visibility='default' filepath='src/malloc_hook-inl.h' line='59' column='1' id='type-id-911'>
           <data-member access='public' layout-offset-in-bits='0'>
             <!-- AtomicWord base::internal::HookList<int (*)(const void*, size_t, int, int, int, off_t, void**)>::priv_end -->
             <var-decl name='priv_end' type-id='type-id-781' visibility='default' filepath='src/malloc_hook-inl.h' line='101' column='1'/>
@@ -24273,9 +23929,9 @@
             <!-- bool base::internal::HookList<int (*)(const void*, size_t, int, int, int, off_t, void**)>::Add(int (void*, typedef size_t, int, int, int, typedef off_t, void**)*) -->
             <function-decl name='Add' mangled-name='_ZN4base8internal8HookListIPFiPKvmiiilPPvEE3AddES7_' filepath='src/malloc_hook-inl.h' line='65' column='1' visibility='default' binding='global' size-in-bits='64'>
               <!-- implicit parameter of type 'base::internal::HookList<int (*)(const void*, size_t, int, int, int, off_t, void**)>*' -->
-              <parameter type-id='type-id-918' is-artificial='yes'/>
+              <parameter type-id='type-id-912' is-artificial='yes'/>
               <!-- parameter of type 'int (void*, typedef size_t, int, int, int, typedef off_t, void**)*' -->
-              <parameter type-id='type-id-906'/>
+              <parameter type-id='type-id-900'/>
               <!-- bool -->
               <return type-id='type-id-55'/>
             </function-decl>
@@ -24284,7 +23940,7 @@
             <!-- void base::internal::HookList<int (*)(const void*, size_t, int, int, int, off_t, void**)>::FixupPrivEndLocked() -->
             <function-decl name='FixupPrivEndLocked' mangled-name='_ZN4base8internal8HookListIPFiPKvmiiilPPvEE18FixupPrivEndLockedEv' filepath='src/malloc_hook-inl.h' line='67' column='1' visibility='default' binding='global' size-in-bits='64'>
               <!-- implicit parameter of type 'base::internal::HookList<int (*)(const void*, size_t, int, int, int, off_t, void**)>*' -->
-              <parameter type-id='type-id-918' is-artificial='yes'/>
+              <parameter type-id='type-id-912' is-artificial='yes'/>
               <!-- void -->
               <return type-id='type-id-56'/>
             </function-decl>
@@ -24293,9 +23949,9 @@
             <!-- bool base::internal::HookList<int (*)(const void*, size_t, int, int, int, off_t, void**)>::Remove(int (void*, typedef size_t, int, int, int, typedef off_t, void**)*) -->
             <function-decl name='Remove' mangled-name='_ZN4base8internal8HookListIPFiPKvmiiilPPvEE6RemoveES7_' filepath='src/malloc_hook-inl.h' line='72' column='1' visibility='default' binding='global' size-in-bits='64'>
               <!-- implicit parameter of type 'base::internal::HookList<int (*)(const void*, size_t, int, int, int, off_t, void**)>*' -->
-              <parameter type-id='type-id-918' is-artificial='yes'/>
+              <parameter type-id='type-id-912' is-artificial='yes'/>
               <!-- parameter of type 'int (void*, typedef size_t, int, int, int, typedef off_t, void**)*' -->
-              <parameter type-id='type-id-906'/>
+              <parameter type-id='type-id-900'/>
               <!-- bool -->
               <return type-id='type-id-55'/>
             </function-decl>
@@ -24304,9 +23960,9 @@
             <!-- int base::internal::HookList<int (*)(const void*, size_t, int, int, int, off_t, void**)>::Traverse(int (void*, typedef size_t, int, int, int, typedef off_t, void**)**, int) -->
             <function-decl name='Traverse' mangled-name='_ZNK4base8internal8HookListIPFiPKvmiiilPPvEE8TraverseEPS7_i' filepath='src/malloc_hook-inl.h' line='77' column='1' visibility='default' binding='global' size-in-bits='64'>
               <!-- implicit parameter of type 'const base::internal::HookList<int (*)(const void*, size_t, int, int, int, off_t, void**)>*' -->
-              <parameter type-id='type-id-928' is-artificial='yes'/>
+              <parameter type-id='type-id-922' is-artificial='yes'/>
               <!-- parameter of type 'int (void*, typedef size_t, int, int, int, typedef off_t, void**)**' -->
-              <parameter type-id='type-id-938'/>
+              <parameter type-id='type-id-932'/>
               <!-- parameter of type 'int' -->
               <parameter type-id='type-id-1'/>
               <!-- int -->
@@ -24317,7 +23973,7 @@
             <!-- bool base::internal::HookList<int (*)(const void*, size_t, int, int, int, off_t, void**)>::empty() -->
             <function-decl name='empty' mangled-name='_ZNK4base8internal8HookListIPFiPKvmiiilPPvEE5emptyEv' filepath='src/malloc_hook-inl.h' line='80' column='1' visibility='default' binding='global' size-in-bits='64'>
               <!-- implicit parameter of type 'const base::internal::HookList<int (*)(const void*, size_t, int, int, int, off_t, void**)>*' -->
-              <parameter type-id='type-id-928' is-artificial='yes'/>
+              <parameter type-id='type-id-922' is-artificial='yes'/>
               <!-- bool -->
               <return type-id='type-id-55'/>
             </function-decl>
@@ -24326,25 +23982,25 @@
             <!-- int (void*, typedef size_t, int, int, int, typedef off_t, void**)* base::internal::HookList<int (*)(const void*, size_t, int, int, int, off_t, void**)>::GetSingular() -->
             <function-decl name='GetSingular' mangled-name='_ZNK4base8internal8HookListIPFiPKvmiiilPPvEE11GetSingularEv' filepath='src/malloc_hook-inl.h' line='85' column='1' visibility='default' binding='global' size-in-bits='64'>
               <!-- implicit parameter of type 'const base::internal::HookList<int (*)(const void*, size_t, int, int, int, off_t, void**)>*' -->
-              <parameter type-id='type-id-928' is-artificial='yes'/>
+              <parameter type-id='type-id-922' is-artificial='yes'/>
               <!-- int (void*, typedef size_t, int, int, int, typedef off_t, void**)* -->
-              <return type-id='type-id-906'/>
+              <return type-id='type-id-900'/>
             </function-decl>
           </member-function>
           <member-function access='public'>
             <!-- int (void*, typedef size_t, int, int, int, typedef off_t, void**)* base::internal::HookList<int (*)(const void*, size_t, int, int, int, off_t, void**)>::ExchangeSingular(int (void*, typedef size_t, int, int, int, typedef off_t, void**)*) -->
             <function-decl name='ExchangeSingular' mangled-name='_ZN4base8internal8HookListIPFiPKvmiiilPPvEE16ExchangeSingularES7_' filepath='src/malloc_hook-inl.h' line='90' column='1' visibility='default' binding='global' size-in-bits='64'>
               <!-- implicit parameter of type 'base::internal::HookList<int (*)(const void*, size_t, int, int, int, off_t, void**)>*' -->
-              <parameter type-id='type-id-918' is-artificial='yes'/>
+              <parameter type-id='type-id-912' is-artificial='yes'/>
               <!-- parameter of type 'int (void*, typedef size_t, int, int, int, typedef off_t, void**)*' -->
-              <parameter type-id='type-id-906'/>
+              <parameter type-id='type-id-900'/>
               <!-- int (void*, typedef size_t, int, int, int, typedef off_t, void**)* -->
-              <return type-id='type-id-906'/>
+              <return type-id='type-id-900'/>
             </function-decl>
           </member-function>
         </class-decl>
         <!-- struct base::internal::HookList<int (*)(const void*, size_t, int*)> -->
-        <class-decl name='HookList&lt;int (*)(const void*, size_t, int*)&gt;' size-in-bits='576' is-struct='yes' visibility='default' filepath='src/malloc_hook-inl.h' line='59' column='1' id='type-id-915'>
+        <class-decl name='HookList&lt;int (*)(const void*, size_t, int*)&gt;' size-in-bits='576' is-struct='yes' visibility='default' filepath='src/malloc_hook-inl.h' line='59' column='1' id='type-id-909'>
           <data-member access='public' layout-offset-in-bits='0'>
             <!-- AtomicWord base::internal::HookList<int (*)(const void*, size_t, int*)>::priv_end -->
             <var-decl name='priv_end' type-id='type-id-781' visibility='default' filepath='src/malloc_hook-inl.h' line='101' column='1'/>
@@ -24357,9 +24013,9 @@
             <!-- bool base::internal::HookList<int (*)(const void*, size_t, int*)>::Add(int (void*, typedef size_t, int*)*) -->
             <function-decl name='Add' mangled-name='_ZN4base8internal8HookListIPFiPKvmPiEE3AddES6_' filepath='src/malloc_hook.cc' line='168' column='1' visibility='default' binding='global' size-in-bits='64'>
               <!-- implicit parameter of type 'base::internal::HookList<int (*)(const void*, size_t, int*)>*' -->
-              <parameter type-id='type-id-916' is-artificial='yes'/>
+              <parameter type-id='type-id-910' is-artificial='yes'/>
               <!-- parameter of type 'int (void*, typedef size_t, int*)*' -->
-              <parameter type-id='type-id-908'/>
+              <parameter type-id='type-id-902'/>
               <!-- bool -->
               <return type-id='type-id-55'/>
             </function-decl>
@@ -24368,7 +24024,7 @@
             <!-- void base::internal::HookList<int (*)(const void*, size_t, int*)>::FixupPrivEndLocked() -->
             <function-decl name='FixupPrivEndLocked' mangled-name='_ZN4base8internal8HookListIPFiPKvmPiEE18FixupPrivEndLockedEv' filepath='src/malloc_hook.cc' line='192' column='1' visibility='default' binding='global' size-in-bits='64'>
               <!-- implicit parameter of type 'base::internal::HookList<int (*)(const void*, size_t, int*)>*' -->
-              <parameter type-id='type-id-916' is-artificial='yes'/>
+              <parameter type-id='type-id-910' is-artificial='yes'/>
               <!-- void -->
               <return type-id='type-id-56'/>
             </function-decl>
@@ -24377,9 +24033,9 @@
             <!-- bool base::internal::HookList<int (*)(const void*, size_t, int*)>::Remove(int (void*, typedef size_t, int*)*) -->
             <function-decl name='Remove' mangled-name='_ZN4base8internal8HookListIPFiPKvmPiEE6RemoveES6_' filepath='src/malloc_hook.cc' line='202' column='1' visibility='default' binding='global' size-in-bits='64'>
               <!-- implicit parameter of type 'base::internal::HookList<int (*)(const void*, size_t, int*)>*' -->
-              <parameter type-id='type-id-916' is-artificial='yes'/>
+              <parameter type-id='type-id-910' is-artificial='yes'/>
               <!-- parameter of type 'int (void*, typedef size_t, int*)*' -->
-              <parameter type-id='type-id-908'/>
+              <parameter type-id='type-id-902'/>
               <!-- bool -->
               <return type-id='type-id-55'/>
             </function-decl>
@@ -24388,9 +24044,9 @@
             <!-- int base::internal::HookList<int (*)(const void*, size_t, int*)>::Traverse(int (void*, typedef size_t, int*)**, int) -->
             <function-decl name='Traverse' mangled-name='_ZNK4base8internal8HookListIPFiPKvmPiEE8TraverseEPS6_i' filepath='src/malloc_hook.cc' line='222' column='1' visibility='default' binding='global' size-in-bits='64'>
               <!-- implicit parameter of type 'const base::internal::HookList<int (*)(const void*, size_t, int*)>*' -->
-              <parameter type-id='type-id-926' is-artificial='yes'/>
+              <parameter type-id='type-id-920' is-artificial='yes'/>
               <!-- parameter of type 'int (void*, typedef size_t, int*)**' -->
-              <parameter type-id='type-id-936'/>
+              <parameter type-id='type-id-930'/>
               <!-- parameter of type 'int' -->
               <parameter type-id='type-id-1'/>
               <!-- int -->
@@ -24401,7 +24057,7 @@
             <!-- bool base::internal::HookList<int (*)(const void*, size_t, int*)>::empty() -->
             <function-decl name='empty' mangled-name='_ZNK4base8internal8HookListIPFiPKvmPiEE5emptyEv' filepath='src/malloc_hook-inl.h' line='80' column='1' visibility='default' binding='global' size-in-bits='64'>
               <!-- implicit parameter of type 'const base::internal::HookList<int (*)(const void*, size_t, int*)>*' -->
-              <parameter type-id='type-id-926' is-artificial='yes'/>
+              <parameter type-id='type-id-920' is-artificial='yes'/>
               <!-- bool -->
               <return type-id='type-id-55'/>
             </function-decl>
@@ -24410,41 +24066,41 @@
             <!-- int (void*, typedef size_t, int*)* base::internal::HookList<int (*)(const void*, size_t, int*)>::GetSingular() -->
             <function-decl name='GetSingular' mangled-name='_ZNK4base8internal8HookListIPFiPKvmPiEE11GetSingularEv' filepath='src/malloc_hook-inl.h' line='85' column='1' visibility='default' binding='global' size-in-bits='64'>
               <!-- implicit parameter of type 'const base::internal::HookList<int (*)(const void*, size_t, int*)>*' -->
-              <parameter type-id='type-id-926' is-artificial='yes'/>
+              <parameter type-id='type-id-920' is-artificial='yes'/>
               <!-- int (void*, typedef size_t, int*)* -->
-              <return type-id='type-id-908'/>
+              <return type-id='type-id-902'/>
             </function-decl>
           </member-function>
           <member-function access='public'>
             <!-- int (void*, typedef size_t, int*)* base::internal::HookList<int (*)(const void*, size_t, int*)>::ExchangeSingular(int (void*, typedef size_t, int*)*) -->
             <function-decl name='ExchangeSingular' mangled-name='_ZN4base8internal8HookListIPFiPKvmPiEE16ExchangeSingularES6_' filepath='src/malloc_hook.cc' line='237' column='1' visibility='default' binding='global' size-in-bits='64'>
               <!-- implicit parameter of type 'base::internal::HookList<int (*)(const void*, size_t, int*)>*' -->
-              <parameter type-id='type-id-916' is-artificial='yes'/>
+              <parameter type-id='type-id-910' is-artificial='yes'/>
               <!-- parameter of type 'int (void*, typedef size_t, int*)*' -->
-              <parameter type-id='type-id-908'/>
+              <parameter type-id='type-id-902'/>
               <!-- int (void*, typedef size_t, int*)* -->
-              <return type-id='type-id-908'/>
+              <return type-id='type-id-902'/>
             </function-decl>
           </member-function>
         </class-decl>
         <!-- base::internal::HookList<void (*)(const void*, size_t)> base::internal::new_hooks_ -->
-        <var-decl name='new_hooks_' type-id='type-id-947' mangled-name='_ZN4base8internal10new_hooks_E' visibility='default' filepath='src/malloc_hook.cc' line='260' column='1'/>
+        <var-decl name='new_hooks_' type-id='type-id-941' mangled-name='_ZN4base8internal10new_hooks_E' visibility='default' filepath='src/malloc_hook.cc' line='260' column='1'/>
         <!-- base::internal::HookList<void (*)(const void*)> base::internal::delete_hooks_ -->
-        <var-decl name='delete_hooks_' type-id='type-id-948' mangled-name='_ZN4base8internal13delete_hooks_E' visibility='default' filepath='src/malloc_hook.cc' line='262' column='1'/>
+        <var-decl name='delete_hooks_' type-id='type-id-942' mangled-name='_ZN4base8internal13delete_hooks_E' visibility='default' filepath='src/malloc_hook.cc' line='262' column='1'/>
         <!-- base::internal::HookList<void (*)(const void*, size_t, int, int, int, off_t)> base::internal::premmap_hooks_ -->
-        <var-decl name='premmap_hooks_' type-id='type-id-921' mangled-name='_ZN4base8internal14premmap_hooks_E' visibility='default' filepath='src/malloc_hook.cc' line='263' column='1'/>
+        <var-decl name='premmap_hooks_' type-id='type-id-915' mangled-name='_ZN4base8internal14premmap_hooks_E' visibility='default' filepath='src/malloc_hook.cc' line='263' column='1'/>
         <!-- base::internal::HookList<void (*)(const void*, const void*, size_t, int, int, int, off_t)> base::internal::mmap_hooks_ -->
         <var-decl name='mmap_hooks_' type-id='type-id-403' mangled-name='_ZN4base8internal11mmap_hooks_E' visibility='default' filepath='src/malloc_hook.cc' line='265' column='1'/>
         <!-- base::internal::HookList<int (*)(const void*, size_t, int, int, int, off_t, void**)> base::internal::mmap_replacement_ -->
-        <var-decl name='mmap_replacement_' type-id='type-id-917' mangled-name='_ZN4base8internal17mmap_replacement_E' visibility='default' filepath='src/malloc_hook.cc' line='273' column='1'/>
+        <var-decl name='mmap_replacement_' type-id='type-id-911' mangled-name='_ZN4base8internal17mmap_replacement_E' visibility='default' filepath='src/malloc_hook.cc' line='273' column='1'/>
         <!-- base::internal::HookList<void (*)(const void*, size_t)> base::internal::munmap_hooks_ -->
-        <var-decl name='munmap_hooks_' type-id='type-id-947' mangled-name='_ZN4base8internal13munmap_hooks_E' visibility='default' filepath='src/malloc_hook.cc' line='266' column='1'/>
+        <var-decl name='munmap_hooks_' type-id='type-id-941' mangled-name='_ZN4base8internal13munmap_hooks_E' visibility='default' filepath='src/malloc_hook.cc' line='266' column='1'/>
         <!-- base::internal::HookList<int (*)(const void*, size_t, int*)> base::internal::munmap_replacement_ -->
-        <var-decl name='munmap_replacement_' type-id='type-id-915' mangled-name='_ZN4base8internal19munmap_replacement_E' visibility='default' filepath='src/malloc_hook.cc' line='274' column='1'/>
+        <var-decl name='munmap_replacement_' type-id='type-id-909' mangled-name='_ZN4base8internal19munmap_replacement_E' visibility='default' filepath='src/malloc_hook.cc' line='274' column='1'/>
         <!-- base::internal::HookList<void (*)(const void*, const void*, size_t, size_t, int, const void*)> base::internal::mremap_hooks_ -->
-        <var-decl name='mremap_hooks_' type-id='type-id-919' mangled-name='_ZN4base8internal13mremap_hooks_E' visibility='default' filepath='src/malloc_hook.cc' line='267' column='1'/>
+        <var-decl name='mremap_hooks_' type-id='type-id-913' mangled-name='_ZN4base8internal13mremap_hooks_E' visibility='default' filepath='src/malloc_hook.cc' line='267' column='1'/>
         <!-- base::internal::HookList<void (*)(ptrdiff_t)> base::internal::presbrk_hooks_ -->
-        <var-decl name='presbrk_hooks_' type-id='type-id-923' mangled-name='_ZN4base8internal14presbrk_hooks_E' visibility='default' filepath='src/malloc_hook.cc' line='268' column='1'/>
+        <var-decl name='presbrk_hooks_' type-id='type-id-917' mangled-name='_ZN4base8internal14presbrk_hooks_E' visibility='default' filepath='src/malloc_hook.cc' line='268' column='1'/>
         <!-- base::internal::HookList<void (*)(const void*, ptrdiff_t)> base::internal::sbrk_hooks_ -->
         <var-decl name='sbrk_hooks_' type-id='type-id-405' mangled-name='_ZN4base8internal11sbrk_hooks_E' visibility='default' filepath='src/malloc_hook.cc' line='270' column='1'/>
       </namespace-decl>
@@ -24453,18 +24109,18 @@
         <!-- void base::subtle::NoBarrier_Store(volatile base::subtle::Atomic64*, base::subtle::Atomic64) -->
         <function-decl name='NoBarrier_Store' filepath='./src/base/atomicops-internals-x86.h' line='215' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- parameter of type 'volatile base::subtle::Atomic64*' -->
-          <parameter type-id='type-id-946'/>
+          <parameter type-id='type-id-940'/>
           <!-- parameter of type 'typedef base::subtle::Atomic64' -->
-          <parameter type-id='type-id-949'/>
+          <parameter type-id='type-id-943'/>
           <!-- void -->
           <return type-id='type-id-56'/>
         </function-decl>
         <!-- base::subtle::Atomic64 base::subtle::Acquire_Load(const volatile base::subtle::Atomic64*) -->
         <function-decl name='Acquire_Load' filepath='./src/base/atomicops-internals-x86.h' line='249' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- parameter of type 'const volatile base::subtle::Atomic64*' -->
-          <parameter type-id='type-id-950'/>
+          <parameter type-id='type-id-944'/>
           <!-- typedef base::subtle::Atomic64 -->
-          <return type-id='type-id-949'/>
+          <return type-id='type-id-943'/>
         </function-decl>
       </namespace-decl>
     </namespace-decl>
@@ -24498,7 +24154,7 @@
       <!-- parameter of type 'int' -->
       <parameter type-id='type-id-1' name='fd' filepath='src/malloc_hook_mmap_linux.h' line='156' column='1'/>
       <!-- parameter of type 'typedef __off64_t' -->
-      <parameter type-id='type-id-951' name='offset' filepath='src/malloc_hook_mmap_linux.h' line='156' column='1'/>
+      <parameter type-id='type-id-945' name='offset' filepath='src/malloc_hook_mmap_linux.h' line='156' column='1'/>
       <!-- void* -->
       <return type-id='type-id-53'/>
     </function-decl>
@@ -24546,16 +24202,16 @@
     <!-- int MallocHook_AddPreSbrkHook(MallocHook_PreSbrkHook) -->
     <function-decl name='MallocHook_AddPreSbrkHook' mangled-name='MallocHook_AddPreSbrkHook' filepath='src/malloc_hook.cc' line='399' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='MallocHook_AddPreSbrkHook'>
       <!-- parameter of type 'typedef MallocHook_PreSbrkHook' -->
-      <parameter type-id='type-id-914' name='hook' filepath='src/malloc_hook.cc' line='399' column='1'/>
+      <parameter type-id='type-id-908' name='hook' filepath='src/malloc_hook.cc' line='399' column='1'/>
       <!-- int -->
       <return type-id='type-id-1'/>
     </function-decl>
     <!-- MallocHook_MunmapHook MallocHook_SetMunmapHook(MallocHook_MunmapHook) -->
     <function-decl name='MallocHook_SetMunmapHook' mangled-name='MallocHook_SetMunmapHook' filepath='src/malloc_hook.cc' line='448' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='MallocHook_SetMunmapHook'>
       <!-- parameter of type 'typedef MallocHook_MunmapHook' -->
-      <parameter type-id='type-id-910' name='hook' filepath='src/malloc_hook.cc' line='448' column='1'/>
+      <parameter type-id='type-id-904' name='hook' filepath='src/malloc_hook.cc' line='448' column='1'/>
       <!-- typedef MallocHook_MunmapHook -->
-      <return type-id='type-id-910'/>
+      <return type-id='type-id-904'/>
     </function-decl>
     <!-- MallocHook_NewHook MallocHook_SetNewHook(MallocHook_NewHook) -->
     <function-decl name='MallocHook_SetNewHook' mangled-name='MallocHook_SetNewHook' filepath='src/malloc_hook.cc' line='424' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='MallocHook_SetNewHook'>
@@ -24574,16 +24230,16 @@
     <!-- MallocHook_PreSbrkHook MallocHook_SetPreSbrkHook(MallocHook_PreSbrkHook) -->
     <function-decl name='MallocHook_SetPreSbrkHook' mangled-name='MallocHook_SetPreSbrkHook' filepath='src/malloc_hook.cc' line='460' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='MallocHook_SetPreSbrkHook'>
       <!-- parameter of type 'typedef MallocHook_PreSbrkHook' -->
-      <parameter type-id='type-id-914' name='hook' filepath='src/malloc_hook.cc' line='460' column='1'/>
+      <parameter type-id='type-id-908' name='hook' filepath='src/malloc_hook.cc' line='460' column='1'/>
       <!-- typedef MallocHook_PreSbrkHook -->
-      <return type-id='type-id-914'/>
+      <return type-id='type-id-908'/>
     </function-decl>
     <!-- MallocHook_MremapHook MallocHook_SetMremapHook(MallocHook_MremapHook) -->
     <function-decl name='MallocHook_SetMremapHook' mangled-name='MallocHook_SetMremapHook' filepath='src/malloc_hook.cc' line='454' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='MallocHook_SetMremapHook'>
       <!-- parameter of type 'typedef MallocHook_MremapHook' -->
-      <parameter type-id='type-id-912' name='hook' filepath='src/malloc_hook.cc' line='454' column='1'/>
+      <parameter type-id='type-id-906' name='hook' filepath='src/malloc_hook.cc' line='454' column='1'/>
       <!-- typedef MallocHook_MremapHook -->
-      <return type-id='type-id-912'/>
+      <return type-id='type-id-906'/>
     </function-decl>
     <!-- MallocHook_MmapHook MallocHook_SetMmapHook(MallocHook_MmapHook) -->
     <function-decl name='MallocHook_SetMmapHook' mangled-name='MallocHook_SetMmapHook' filepath='src/malloc_hook.cc' line='442' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='MallocHook_SetMmapHook'>
@@ -24595,9 +24251,9 @@
     <!-- MallocHook_PreMmapHook MallocHook_SetPreMmapHook(MallocHook_PreMmapHook) -->
     <function-decl name='MallocHook_SetPreMmapHook' mangled-name='MallocHook_SetPreMmapHook' filepath='src/malloc_hook.cc' line='436' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='MallocHook_SetPreMmapHook'>
       <!-- parameter of type 'typedef MallocHook_PreMmapHook' -->
-      <parameter type-id='type-id-905' name='hook' filepath='src/malloc_hook.cc' line='436' column='1'/>
+      <parameter type-id='type-id-899' name='hook' filepath='src/malloc_hook.cc' line='436' column='1'/>
       <!-- typedef MallocHook_PreMmapHook -->
-      <return type-id='type-id-905'/>
+      <return type-id='type-id-899'/>
     </function-decl>
     <!-- MallocHook_DeleteHook MallocHook_SetDeleteHook(MallocHook_DeleteHook) -->
     <function-decl name='MallocHook_SetDeleteHook' mangled-name='MallocHook_SetDeleteHook' filepath='src/malloc_hook.cc' line='430' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='MallocHook_SetDeleteHook'>
@@ -24609,7 +24265,7 @@
     <!-- int MallocHook_RemoveMunmapHook(MallocHook_MunmapHook) -->
     <function-decl name='MallocHook_RemoveMunmapHook' mangled-name='MallocHook_RemoveMunmapHook' filepath='src/malloc_hook.cc' line='365' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='MallocHook_RemoveMunmapHook'>
       <!-- parameter of type 'typedef MallocHook_MunmapHook' -->
-      <parameter type-id='type-id-910' name='hook' filepath='src/malloc_hook.cc' line='365' column='1'/>
+      <parameter type-id='type-id-904' name='hook' filepath='src/malloc_hook.cc' line='365' column='1'/>
       <!-- int -->
       <return type-id='type-id-1'/>
     </function-decl>
@@ -24630,14 +24286,14 @@
     <!-- int MallocHook_RemoveMmapReplacement(MallocHook_MmapReplacement) -->
     <function-decl name='MallocHook_RemoveMmapReplacement' mangled-name='MallocHook_RemoveMmapReplacement' filepath='src/malloc_hook.cc' line='341' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='MallocHook_RemoveMmapReplacement'>
       <!-- parameter of type 'typedef MallocHook_MmapReplacement' -->
-      <parameter type-id='type-id-907' name='hook' filepath='src/malloc_hook.cc' line='341' column='1'/>
+      <parameter type-id='type-id-901' name='hook' filepath='src/malloc_hook.cc' line='341' column='1'/>
       <!-- int -->
       <return type-id='type-id-1'/>
     </function-decl>
     <!-- int MallocHook_RemovePreMmapHook(MallocHook_PreMmapHook) -->
     <function-decl name='MallocHook_RemovePreMmapHook' mangled-name='MallocHook_RemovePreMmapHook' filepath='src/malloc_hook.cc' line='326' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='MallocHook_RemovePreMmapHook'>
       <!-- parameter of type 'typedef MallocHook_PreMmapHook' -->
-      <parameter type-id='type-id-905' name='hook' filepath='src/malloc_hook.cc' line='326' column='1'/>
+      <parameter type-id='type-id-899' name='hook' filepath='src/malloc_hook.cc' line='326' column='1'/>
       <!-- int -->
       <return type-id='type-id-1'/>
     </function-decl>
@@ -24651,21 +24307,21 @@
     <!-- int MallocHook_RemovePreSbrkHook(MallocHook_PreSbrkHook) -->
     <function-decl name='MallocHook_RemovePreSbrkHook' mangled-name='MallocHook_RemovePreSbrkHook' filepath='src/malloc_hook.cc' line='405' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='MallocHook_RemovePreSbrkHook'>
       <!-- parameter of type 'typedef MallocHook_PreSbrkHook' -->
-      <parameter type-id='type-id-914' name='hook' filepath='src/malloc_hook.cc' line='399' column='1'/>
+      <parameter type-id='type-id-908' name='hook' filepath='src/malloc_hook.cc' line='399' column='1'/>
       <!-- int -->
       <return type-id='type-id-1'/>
     </function-decl>
     <!-- int MallocHook_RemoveMremapHook(MallocHook_MremapHook) -->
     <function-decl name='MallocHook_RemoveMremapHook' mangled-name='MallocHook_RemoveMremapHook' filepath='src/malloc_hook.cc' line='393' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='MallocHook_RemoveMremapHook'>
       <!-- parameter of type 'typedef MallocHook_MremapHook' -->
-      <parameter type-id='type-id-912' name='hook' filepath='src/malloc_hook.cc' line='393' column='1'/>
+      <parameter type-id='type-id-906' name='hook' filepath='src/malloc_hook.cc' line='393' column='1'/>
       <!-- int -->
       <return type-id='type-id-1'/>
     </function-decl>
     <!-- int MallocHook_RemoveMunmapReplacement(MallocHook_MunmapReplacement) -->
     <function-decl name='MallocHook_RemoveMunmapReplacement' mangled-name='MallocHook_RemoveMunmapReplacement' filepath='src/malloc_hook.cc' line='381' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='MallocHook_RemoveMunmapReplacement'>
       <!-- parameter of type 'typedef MallocHook_MunmapReplacement' -->
-      <parameter type-id='type-id-909' name='hook' filepath='src/malloc_hook.cc' line='381' column='1'/>
+      <parameter type-id='type-id-903' name='hook' filepath='src/malloc_hook.cc' line='381' column='1'/>
       <!-- int -->
       <return type-id='type-id-1'/>
     </function-decl>
@@ -24686,35 +24342,35 @@
     <!-- int MallocHook_AddMremapHook(MallocHook_MremapHook) -->
     <function-decl name='MallocHook_AddMremapHook' mangled-name='MallocHook_AddMremapHook' filepath='src/malloc_hook.cc' line='387' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='MallocHook_AddMremapHook'>
       <!-- parameter of type 'typedef MallocHook_MremapHook' -->
-      <parameter type-id='type-id-912' name='hook' filepath='src/malloc_hook.cc' line='393' column='1'/>
+      <parameter type-id='type-id-906' name='hook' filepath='src/malloc_hook.cc' line='393' column='1'/>
       <!-- int -->
       <return type-id='type-id-1'/>
     </function-decl>
     <!-- int MallocHook_SetMunmapReplacement(MallocHook_MunmapReplacement) -->
     <function-decl name='MallocHook_SetMunmapReplacement' mangled-name='MallocHook_SetMunmapReplacement' filepath='src/malloc_hook.cc' line='371' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='MallocHook_SetMunmapReplacement'>
       <!-- parameter of type 'typedef MallocHook_MunmapReplacement' -->
-      <parameter type-id='type-id-909' name='hook' filepath='src/malloc_hook.cc' line='381' column='1'/>
+      <parameter type-id='type-id-903' name='hook' filepath='src/malloc_hook.cc' line='381' column='1'/>
       <!-- int -->
       <return type-id='type-id-1'/>
     </function-decl>
     <!-- int MallocHook_SetMmapReplacement(MallocHook_MmapReplacement) -->
     <function-decl name='MallocHook_SetMmapReplacement' mangled-name='MallocHook_SetMmapReplacement' filepath='src/malloc_hook.cc' line='332' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='MallocHook_SetMmapReplacement'>
       <!-- parameter of type 'typedef MallocHook_MmapReplacement' -->
-      <parameter type-id='type-id-907' name='hook' filepath='src/malloc_hook.cc' line='341' column='1'/>
+      <parameter type-id='type-id-901' name='hook' filepath='src/malloc_hook.cc' line='341' column='1'/>
       <!-- int -->
       <return type-id='type-id-1'/>
     </function-decl>
     <!-- int MallocHook_AddPreMmapHook(MallocHook_PreMmapHook) -->
     <function-decl name='MallocHook_AddPreMmapHook' mangled-name='MallocHook_AddPreMmapHook' filepath='src/malloc_hook.cc' line='320' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='MallocHook_AddPreMmapHook'>
       <!-- parameter of type 'typedef MallocHook_PreMmapHook' -->
-      <parameter type-id='type-id-905' name='hook' filepath='src/malloc_hook.cc' line='326' column='1'/>
+      <parameter type-id='type-id-899' name='hook' filepath='src/malloc_hook.cc' line='326' column='1'/>
       <!-- int -->
       <return type-id='type-id-1'/>
     </function-decl>
     <!-- int MallocHook_AddMunmapHook(MallocHook_MunmapHook) -->
     <function-decl name='MallocHook_AddMunmapHook' mangled-name='MallocHook_AddMunmapHook' filepath='src/malloc_hook.cc' line='359' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='MallocHook_AddMunmapHook'>
       <!-- parameter of type 'typedef MallocHook_MunmapHook' -->
-      <parameter type-id='type-id-910' name='hook' filepath='src/malloc_hook.cc' line='365' column='1'/>
+      <parameter type-id='type-id-904' name='hook' filepath='src/malloc_hook.cc' line='365' column='1'/>
       <!-- int -->
       <return type-id='type-id-1'/>
     </function-decl>
@@ -24740,7 +24396,7 @@
       <return type-id='type-id-1'/>
     </function-decl>
     <!-- int (void*, size_t, int*) -->
-    <function-type size-in-bits='64' id='type-id-935'>
+    <function-type size-in-bits='64' id='type-id-929'>
       <!-- parameter of type 'void*' -->
       <parameter type-id='type-id-53'/>
       <!-- parameter of type 'typedef size_t' -->
@@ -24751,7 +24407,7 @@
       <return type-id='type-id-1'/>
     </function-type>
     <!-- int (void*, size_t, int, int, int, off_t, void**) -->
-    <function-type size-in-bits='64' id='type-id-937'>
+    <function-type size-in-bits='64' id='type-id-931'>
       <!-- parameter of type 'void*' -->
       <parameter type-id='type-id-53'/>
       <!-- parameter of type 'typedef size_t' -->
@@ -24770,23 +24426,14 @@
       <return type-id='type-id-1'/>
     </function-type>
     <!-- void (ptrdiff_t) -->
-    <function-type size-in-bits='64' id='type-id-939'>
+    <function-type size-in-bits='64' id='type-id-933'>
       <!-- parameter of type 'typedef ptrdiff_t' -->
       <parameter type-id='type-id-186'/>
       <!-- void -->
       <return type-id='type-id-56'/>
     </function-type>
-    <!-- void (void*, const base::MallocRange*) -->
-    <function-type size-in-bits='64' id='type-id-900'>
-      <!-- parameter of type 'void*' -->
-      <parameter type-id='type-id-53'/>
-      <!-- parameter of type 'const base::MallocRange*' -->
-      <parameter type-id='type-id-952'/>
-      <!-- void -->
-      <return type-id='type-id-56'/>
-    </function-type>
     <!-- void (void*, size_t, int, int, int, off_t) -->
-    <function-type size-in-bits='64' id='type-id-941'>
+    <function-type size-in-bits='64' id='type-id-935'>
       <!-- parameter of type 'void*' -->
       <parameter type-id='type-id-53'/>
       <!-- parameter of type 'typedef size_t' -->
@@ -24803,7 +24450,7 @@
       <return type-id='type-id-56'/>
     </function-type>
     <!-- void (void*, void*, size_t, size_t, int, void*) -->
-    <function-type size-in-bits='64' id='type-id-943'>
+    <function-type size-in-bits='64' id='type-id-937'>
       <!-- parameter of type 'void*' -->
       <parameter type-id='type-id-53'/>
       <!-- parameter of type 'void*' -->
@@ -24822,13 +24469,13 @@
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='src/maybe_threads.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-kFgaKP/gperftools-2.4' language='LANG_C_plus_plus'>
     <!-- pthread_key_t* -->
-    <pointer-type-def type-id='type-id-953' size-in-bits='64' id='type-id-954'/>
+    <pointer-type-def type-id='type-id-946' size-in-bits='64' id='type-id-947'/>
     <!-- pthread_once_t* -->
-    <pointer-type-def type-id='type-id-955' size-in-bits='64' id='type-id-956'/>
+    <pointer-type-def type-id='type-id-948' size-in-bits='64' id='type-id-949'/>
     <!-- int perftools_pthread_once(pthread_once_t*, void ()*) -->
     <function-decl name='perftools_pthread_once' mangled-name='_Z22perftools_pthread_oncePiPFvvE' filepath='src/maybe_threads.cc' line='128' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z22perftools_pthread_oncePiPFvvE'>
       <!-- parameter of type 'pthread_once_t*' -->
-      <parameter type-id='type-id-956' name='ctl' filepath='src/maybe_threads.cc' line='128' column='1'/>
+      <parameter type-id='type-id-949' name='ctl' filepath='src/maybe_threads.cc' line='128' column='1'/>
       <!-- parameter of type 'void ()*' -->
       <parameter type-id='type-id-153' name='init_routine' filepath='src/maybe_threads.cc' line='129' column='1'/>
       <!-- int -->
@@ -24837,7 +24484,7 @@
     <!-- int perftools_pthread_setspecific(pthread_key_t, void*) -->
     <function-decl name='perftools_pthread_setspecific' mangled-name='_Z29perftools_pthread_setspecificjPv' filepath='src/maybe_threads.cc' line='117' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z29perftools_pthread_setspecificjPv'>
       <!-- parameter of type 'typedef pthread_key_t' -->
-      <parameter type-id='type-id-953' name='key' filepath='src/maybe_threads.cc' line='117' column='1'/>
+      <parameter type-id='type-id-946' name='key' filepath='src/maybe_threads.cc' line='117' column='1'/>
       <!-- parameter of type 'void*' -->
       <parameter type-id='type-id-53' name='val' filepath='src/maybe_threads.cc' line='117' column='1'/>
       <!-- int -->
@@ -24846,21 +24493,21 @@
     <!-- void* perftools_pthread_getspecific(pthread_key_t) -->
     <function-decl name='perftools_pthread_getspecific' mangled-name='_Z29perftools_pthread_getspecificj' filepath='src/maybe_threads.cc' line='109' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z29perftools_pthread_getspecificj'>
       <!-- parameter of type 'typedef pthread_key_t' -->
-      <parameter type-id='type-id-953' name='key' filepath='src/maybe_threads.cc' line='109' column='1'/>
+      <parameter type-id='type-id-946' name='key' filepath='src/maybe_threads.cc' line='109' column='1'/>
       <!-- void* -->
       <return type-id='type-id-53'/>
     </function-decl>
     <!-- int perftools_pthread_key_delete(pthread_key_t) -->
     <function-decl name='perftools_pthread_key_delete' mangled-name='_Z28perftools_pthread_key_deletej' filepath='src/maybe_threads.cc' line='101' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z28perftools_pthread_key_deletej'>
       <!-- parameter of type 'typedef pthread_key_t' -->
-      <parameter type-id='type-id-953' name='key' filepath='src/maybe_threads.cc' line='101' column='1'/>
+      <parameter type-id='type-id-946' name='key' filepath='src/maybe_threads.cc' line='101' column='1'/>
       <!-- int -->
       <return type-id='type-id-1'/>
     </function-decl>
     <!-- int perftools_pthread_key_create(pthread_key_t*, void (void*)*) -->
     <function-decl name='perftools_pthread_key_create' mangled-name='_Z28perftools_pthread_key_createPjPFvPvE' filepath='src/maybe_threads.cc' line='90' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z28perftools_pthread_key_createPjPFvPvE'>
       <!-- parameter of type 'pthread_key_t*' -->
-      <parameter type-id='type-id-954' name='key' filepath='src/maybe_threads.cc' line='90' column='1'/>
+      <parameter type-id='type-id-947' name='key' filepath='src/maybe_threads.cc' line='90' column='1'/>
       <!-- parameter of type 'void (void*)*' -->
       <parameter type-id='type-id-218' name='destr_function' filepath='src/maybe_threads.cc' line='91' column='1'/>
       <!-- int -->
@@ -24869,9 +24516,9 @@
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='src/memfs_malloc.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-kFgaKP/gperftools-2.4' language='LANG_C_plus_plus'>
     <!-- class HugetlbSysAllocator -->
-    <class-decl name='HugetlbSysAllocator' size-in-bits='384' visibility='default' filepath='src/memfs_malloc.cc' line='90' column='1' id='type-id-957'>
+    <class-decl name='HugetlbSysAllocator' size-in-bits='384' visibility='default' filepath='src/memfs_malloc.cc' line='90' column='1' id='type-id-950'>
       <!-- class SysAllocator -->
-      <base-class access='public' layout-offset-in-bits='0' type-id='type-id-958'/>
+      <base-class access='public' layout-offset-in-bits='0' type-id='type-id-951'/>
       <data-member access='private' layout-offset-in-bits='64'>
         <!-- bool HugetlbSysAllocator::failed_ -->
         <var-decl name='failed_' type-id='type-id-55' visibility='default' filepath='src/memfs_malloc.cc' line='103' column='1'/>
@@ -24890,15 +24537,15 @@
       </data-member>
       <data-member access='private' layout-offset-in-bits='320'>
         <!-- SysAllocator* HugetlbSysAllocator::fallback_ -->
-        <var-decl name='fallback_' type-id='type-id-902' visibility='default' filepath='src/memfs_malloc.cc' line='112' column='1'/>
+        <var-decl name='fallback_' type-id='type-id-952' visibility='default' filepath='src/memfs_malloc.cc' line='112' column='1'/>
       </data-member>
       <member-function access='private' constructor='yes'>
         <!-- HugetlbSysAllocator::HugetlbSysAllocator(SysAllocator*) -->
         <function-decl name='HugetlbSysAllocator' filepath='src/memfs_malloc.cc' line='92' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'HugetlbSysAllocator*' -->
-          <parameter type-id='type-id-959' is-artificial='yes'/>
+          <parameter type-id='type-id-953' is-artificial='yes'/>
           <!-- parameter of type 'SysAllocator*' -->
-          <parameter type-id='type-id-902'/>
+          <parameter type-id='type-id-952'/>
           <!-- void -->
           <return type-id='type-id-56'/>
         </function-decl>
@@ -24907,7 +24554,7 @@
         <!-- bool HugetlbSysAllocator::Initialize() -->
         <function-decl name='Initialize' mangled-name='_ZN19HugetlbSysAllocator10InitializeEv' filepath='src/memfs_malloc.cc' line='218' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN19HugetlbSysAllocator10InitializeEv'>
           <!-- implicit parameter of type 'HugetlbSysAllocator*' -->
-          <parameter type-id='type-id-959' is-artificial='yes'/>
+          <parameter type-id='type-id-953' is-artificial='yes'/>
           <!-- bool -->
           <return type-id='type-id-55'/>
         </function-decl>
@@ -24916,7 +24563,7 @@
         <!-- void* HugetlbSysAllocator::AllocInternal(size_t, size_t*, size_t) -->
         <function-decl name='AllocInternal' mangled-name='_ZN19HugetlbSysAllocator13AllocInternalEmPmm' filepath='src/memfs_malloc.cc' line='152' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN19HugetlbSysAllocator13AllocInternalEmPmm'>
           <!-- implicit parameter of type 'HugetlbSysAllocator*' -->
-          <parameter type-id='type-id-959' is-artificial='yes'/>
+          <parameter type-id='type-id-953' is-artificial='yes'/>
           <!-- parameter of type 'typedef size_t' -->
           <parameter type-id='type-id-57'/>
           <!-- parameter of type 'size_t*' -->
@@ -24931,7 +24578,7 @@
         <!-- void* HugetlbSysAllocator::Alloc(size_t, size_t*, size_t) -->
         <function-decl name='Alloc' mangled-name='_ZN19HugetlbSysAllocator5AllocEmPmm' filepath='src/memfs_malloc.cc' line='118' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN19HugetlbSysAllocator5AllocEmPmm'>
           <!-- implicit parameter of type 'HugetlbSysAllocator*' -->
-          <parameter type-id='type-id-959' is-artificial='yes'/>
+          <parameter type-id='type-id-953' is-artificial='yes'/>
           <!-- parameter of type 'typedef size_t' -->
           <parameter type-id='type-id-57'/>
           <!-- parameter of type 'size_t*' -->
@@ -24944,7 +24591,7 @@
       </member-function>
     </class-decl>
     <!-- HugetlbSysAllocator* -->
-    <pointer-type-def type-id='type-id-957' size-in-bits='64' id='type-id-959'/>
+    <pointer-type-def type-id='type-id-950' size-in-bits='64' id='type-id-953'/>
     <!-- namespace FLAG__namespace_do_not_use_directly_use_DECLARE_string_instead -->
     <namespace-decl name='FLAG__namespace_do_not_use_directly_use_DECLARE_string_instead'>
       <!-- std::string FLAG__namespace_do_not_use_directly_use_DECLARE_string_instead::FLAGS_memfs_malloc_path -->
@@ -24974,65 +24621,27 @@
       <!-- char FLAG__namespace_do_not_use_directly_use_DECLARE_bool_instead::FLAGS_nomemfs_malloc_map_private -->
       <var-decl name='FLAGS_nomemfs_malloc_map_private' type-id='type-id-66' mangled-name='_ZN60FLAG__namespace_do_not_use_directly_use_DECLARE_bool_instead32FLAGS_nomemfs_malloc_map_privateE' visibility='default' filepath='src/memfs_malloc.cc' line='87' column='1' elf-symbol-id='_ZN60FLAG__namespace_do_not_use_directly_use_DECLARE_bool_instead32FLAGS_nomemfs_malloc_map_privateE'/>
     </namespace-decl>
-    <!-- class SysAllocator -->
-    <class-decl name='SysAllocator' size-in-bits='64' visibility='default' filepath='src/gperftools/malloc_extension.h' line='75' column='1' is-declaration-only='yes' id='type-id-958'>
-      <member-function access='private' constructor='yes'>
-        <!-- SysAllocator::SysAllocator() -->
-        <function-decl name='SysAllocator' filepath='./src/gperftools/malloc_extension.h' line='77' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <!-- implicit parameter of type 'SysAllocator*' -->
-          <parameter type-id='type-id-902' is-artificial='yes'/>
-          <!-- void -->
-          <return type-id='type-id-56'/>
-        </function-decl>
-      </member-function>
-      <member-function access='private' destructor='yes' vtable-offset='-1'>
-        <!-- SysAllocator::~SysAllocator(int) -->
-        <function-decl name='~SysAllocator' mangled-name='_ZN12SysAllocatorD1Ev' filepath='src/malloc_extension.cc' line='108' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN12SysAllocatorD1Ev'>
-          <!-- implicit parameter of type 'SysAllocator*' -->
-          <parameter type-id='type-id-902' is-artificial='yes'/>
-          <!-- artificial parameter of type 'int' -->
-          <parameter type-id='type-id-1' is-artificial='yes'/>
-          <!-- void -->
-          <return type-id='type-id-56'/>
-        </function-decl>
-      </member-function>
-      <member-function access='private' vtable-offset='2'>
-        <!-- void* SysAllocator::Alloc(size_t, size_t*, size_t) -->
-        <function-decl name='Alloc' mangled-name='_ZN12SysAllocator5AllocEmPmm' filepath='src/gperftools/malloc_extension.h' line='84' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <!-- implicit parameter of type 'SysAllocator*' -->
-          <parameter type-id='type-id-902' is-artificial='yes'/>
-          <!-- parameter of type 'typedef size_t' -->
-          <parameter type-id='type-id-57'/>
-          <!-- parameter of type 'size_t*' -->
-          <parameter type-id='type-id-230'/>
-          <!-- parameter of type 'typedef size_t' -->
-          <parameter type-id='type-id-57'/>
-          <!-- void* -->
-          <return type-id='type-id-53'/>
-        </function-decl>
-      </member-function>
-    </class-decl>
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='src/memory_region_map.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-kFgaKP/gperftools-2.4' language='LANG_C_plus_plus'>
     <!-- HeapProfileBucket[20] -->
     <array-type-def dimensions='1' type-id='type-id-190' size-in-bits='8960' id='type-id-179'>
       <!-- <anonymous range>[20] -->
-      <subrange length='20' type-id='type-id-5' id='type-id-960'/>
+      <subrange length='20' type-id='type-id-5' id='type-id-954'/>
     </array-type-def>
     <!-- void*[20][32] -->
     <array-type-def dimensions='2' type-id='type-id-53' size-in-bits='40960' id='type-id-180'>
       <!-- <anonymous range>[20] -->
-      <subrange length='20' type-id='type-id-5' id='type-id-960'/>
+      <subrange length='20' type-id='type-id-5' id='type-id-954'/>
       <!-- <anonymous range>[32] -->
       <subrange length='32' type-id='type-id-5' id='type-id-128'/>
     </array-type-def>
     <!-- class STL_Allocator<std::_Rb_tree_node<MemoryRegionMap::Region>, MemoryRegionMap::MyAllocator> -->
-    <class-decl name='STL_Allocator&lt;std::_Rb_tree_node&lt;MemoryRegionMap::Region&gt;, MemoryRegionMap::MyAllocator&gt;' size-in-bits='8' visibility='default' filepath='src/base/stl_allocator.h' line='60' column='1' id='type-id-961'>
+    <class-decl name='STL_Allocator&lt;std::_Rb_tree_node&lt;MemoryRegionMap::Region&gt;, MemoryRegionMap::MyAllocator&gt;' size-in-bits='8' visibility='default' filepath='src/base/stl_allocator.h' line='60' column='1' id='type-id-955'>
       <member-function access='private'>
         <!-- void STL_Allocator<std::_Rb_tree_node<MemoryRegionMap::Region>, MemoryRegionMap::MyAllocator>::STL_Allocator() -->
         <function-decl name='STL_Allocator' filepath='src/base/stl_allocator.h' line='74' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'STL_Allocator<std::_Rb_tree_node<MemoryRegionMap::Region>, MemoryRegionMap::MyAllocator>*' -->
-          <parameter type-id='type-id-962' is-artificial='yes'/>
+          <parameter type-id='type-id-956' is-artificial='yes'/>
           <!-- void -->
           <return type-id='type-id-56'/>
         </function-decl>
@@ -25041,9 +24650,9 @@
         <!-- void STL_Allocator<std::_Rb_tree_node<MemoryRegionMap::Region>, MemoryRegionMap::MyAllocator>::STL_Allocator(const STL_Allocator<std::_Rb_tree_node<MemoryRegionMap::Region>, MemoryRegionMap::MyAllocator>&) -->
         <function-decl name='STL_Allocator' filepath='src/base/stl_allocator.h' line='75' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'STL_Allocator<std::_Rb_tree_node<MemoryRegionMap::Region>, MemoryRegionMap::MyAllocator>*' -->
-          <parameter type-id='type-id-962' is-artificial='yes'/>
+          <parameter type-id='type-id-956' is-artificial='yes'/>
           <!-- parameter of type 'const STL_Allocator<std::_Rb_tree_node<MemoryRegionMap::Region>, MemoryRegionMap::MyAllocator>&' -->
-          <parameter type-id='type-id-963'/>
+          <parameter type-id='type-id-957'/>
           <!-- void -->
           <return type-id='type-id-56'/>
         </function-decl>
@@ -25052,7 +24661,7 @@
         <!-- STL_Allocator<std::_Rb_tree_node<MemoryRegionMap::Region>, MemoryRegionMap::MyAllocator>::~STL_Allocator(int) -->
         <function-decl name='~STL_Allocator' filepath='src/base/stl_allocator.h' line='77' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'STL_Allocator<std::_Rb_tree_node<MemoryRegionMap::Region>, MemoryRegionMap::MyAllocator>*' -->
-          <parameter type-id='type-id-962' is-artificial='yes'/>
+          <parameter type-id='type-id-956' is-artificial='yes'/>
           <!-- artificial parameter of type 'int' -->
           <parameter type-id='type-id-1' is-artificial='yes'/>
           <!-- void -->
@@ -25063,9 +24672,9 @@
         <!-- std::_Rb_tree_node<MemoryRegionMap::Region>* STL_Allocator<std::_Rb_tree_node<MemoryRegionMap::Region>, MemoryRegionMap::MyAllocator>::address(std::_Rb_tree_node<MemoryRegionMap::Region>&) -->
         <function-decl name='address' mangled-name='_ZNK13STL_AllocatorISt13_Rb_tree_nodeIN15MemoryRegionMap6RegionEENS1_11MyAllocatorEE7addressERS3_' filepath='src/base/stl_allocator.h' line='79' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'const STL_Allocator<std::_Rb_tree_node<MemoryRegionMap::Region>, MemoryRegionMap::MyAllocator>*' -->
-          <parameter type-id='type-id-964' is-artificial='yes'/>
+          <parameter type-id='type-id-958' is-artificial='yes'/>
           <!-- parameter of type 'std::_Rb_tree_node<MemoryRegionMap::Region>&' -->
-          <parameter type-id='type-id-965'/>
+          <parameter type-id='type-id-959'/>
           <!-- std::_Rb_tree_node<MemoryRegionMap::Region>* -->
           <return type-id='type-id-776'/>
         </function-decl>
@@ -25074,9 +24683,9 @@
         <!-- const std::_Rb_tree_node<MemoryRegionMap::Region>* STL_Allocator<std::_Rb_tree_node<MemoryRegionMap::Region>, MemoryRegionMap::MyAllocator>::address(const std::_Rb_tree_node<MemoryRegionMap::Region>&) -->
         <function-decl name='address' mangled-name='_ZNK13STL_AllocatorISt13_Rb_tree_nodeIN15MemoryRegionMap6RegionEENS1_11MyAllocatorEE7addressERKS3_' filepath='src/base/stl_allocator.h' line='80' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'const STL_Allocator<std::_Rb_tree_node<MemoryRegionMap::Region>, MemoryRegionMap::MyAllocator>*' -->
-          <parameter type-id='type-id-964' is-artificial='yes'/>
+          <parameter type-id='type-id-958' is-artificial='yes'/>
           <!-- parameter of type 'const std::_Rb_tree_node<MemoryRegionMap::Region>&' -->
-          <parameter type-id='type-id-966'/>
+          <parameter type-id='type-id-960'/>
           <!-- const std::_Rb_tree_node<MemoryRegionMap::Region>* -->
           <return type-id='type-id-522'/>
         </function-decl>
@@ -25085,7 +24694,7 @@
         <!-- std::_Rb_tree_node<MemoryRegionMap::Region>* STL_Allocator<std::_Rb_tree_node<MemoryRegionMap::Region>, MemoryRegionMap::MyAllocator>::allocate(unsigned long int, void*) -->
         <function-decl name='allocate' mangled-name='_ZN13STL_AllocatorISt13_Rb_tree_nodeIN15MemoryRegionMap6RegionEENS1_11MyAllocatorEE8allocateEmPKv' filepath='src/base/stl_allocator.h' line='82' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'STL_Allocator<std::_Rb_tree_node<MemoryRegionMap::Region>, MemoryRegionMap::MyAllocator>*' -->
-          <parameter type-id='type-id-962' is-artificial='yes'/>
+          <parameter type-id='type-id-956' is-artificial='yes'/>
           <!-- parameter of type 'unsigned long int' -->
           <parameter type-id='type-id-5'/>
           <!-- parameter of type 'void*' -->
@@ -25098,7 +24707,7 @@
         <!-- void STL_Allocator<std::_Rb_tree_node<MemoryRegionMap::Region>, MemoryRegionMap::MyAllocator>::deallocate(std::_Rb_tree_node<MemoryRegionMap::Region>*, unsigned long int) -->
         <function-decl name='deallocate' mangled-name='_ZN13STL_AllocatorISt13_Rb_tree_nodeIN15MemoryRegionMap6RegionEENS1_11MyAllocatorEE10deallocateEPS3_m' filepath='src/base/stl_allocator.h' line='86' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'STL_Allocator<std::_Rb_tree_node<MemoryRegionMap::Region>, MemoryRegionMap::MyAllocator>*' -->
-          <parameter type-id='type-id-962' is-artificial='yes'/>
+          <parameter type-id='type-id-956' is-artificial='yes'/>
           <!-- parameter of type 'std::_Rb_tree_node<MemoryRegionMap::Region>*' -->
           <parameter type-id='type-id-776'/>
           <!-- parameter of type 'unsigned long int' -->
@@ -25111,7 +24720,7 @@
         <!-- size_t STL_Allocator<std::_Rb_tree_node<MemoryRegionMap::Region>, MemoryRegionMap::MyAllocator>::max_size() -->
         <function-decl name='max_size' mangled-name='_ZNK13STL_AllocatorISt13_Rb_tree_nodeIN15MemoryRegionMap6RegionEENS1_11MyAllocatorEE8max_sizeEv' filepath='src/base/stl_allocator.h' line='88' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'const STL_Allocator<std::_Rb_tree_node<MemoryRegionMap::Region>, MemoryRegionMap::MyAllocator>*' -->
-          <parameter type-id='type-id-964' is-artificial='yes'/>
+          <parameter type-id='type-id-958' is-artificial='yes'/>
           <!-- typedef size_t -->
           <return type-id='type-id-57'/>
         </function-decl>
@@ -25120,11 +24729,11 @@
         <!-- void STL_Allocator<std::_Rb_tree_node<MemoryRegionMap::Region>, MemoryRegionMap::MyAllocator>::construct(std::_Rb_tree_node<MemoryRegionMap::Region>*, const std::_Rb_tree_node<MemoryRegionMap::Region>&) -->
         <function-decl name='construct' mangled-name='_ZN13STL_AllocatorISt13_Rb_tree_nodeIN15MemoryRegionMap6RegionEENS1_11MyAllocatorEE9constructEPS3_RKS3_' filepath='src/base/stl_allocator.h' line='90' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'STL_Allocator<std::_Rb_tree_node<MemoryRegionMap::Region>, MemoryRegionMap::MyAllocator>*' -->
-          <parameter type-id='type-id-962' is-artificial='yes'/>
+          <parameter type-id='type-id-956' is-artificial='yes'/>
           <!-- parameter of type 'std::_Rb_tree_node<MemoryRegionMap::Region>*' -->
           <parameter type-id='type-id-776'/>
           <!-- parameter of type 'const std::_Rb_tree_node<MemoryRegionMap::Region>&' -->
-          <parameter type-id='type-id-966'/>
+          <parameter type-id='type-id-960'/>
           <!-- void -->
           <return type-id='type-id-56'/>
         </function-decl>
@@ -25133,7 +24742,7 @@
         <!-- void STL_Allocator<std::_Rb_tree_node<MemoryRegionMap::Region>, MemoryRegionMap::MyAllocator>::construct(std::_Rb_tree_node<MemoryRegionMap::Region>*) -->
         <function-decl name='construct' mangled-name='_ZN13STL_AllocatorISt13_Rb_tree_nodeIN15MemoryRegionMap6RegionEENS1_11MyAllocatorEE9constructEPS3_' filepath='src/base/stl_allocator.h' line='91' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'STL_Allocator<std::_Rb_tree_node<MemoryRegionMap::Region>, MemoryRegionMap::MyAllocator>*' -->
-          <parameter type-id='type-id-962' is-artificial='yes'/>
+          <parameter type-id='type-id-956' is-artificial='yes'/>
           <!-- parameter of type 'std::_Rb_tree_node<MemoryRegionMap::Region>*' -->
           <parameter type-id='type-id-776'/>
           <!-- void -->
@@ -25144,7 +24753,7 @@
         <!-- void STL_Allocator<std::_Rb_tree_node<MemoryRegionMap::Region>, MemoryRegionMap::MyAllocator>::destroy(std::_Rb_tree_node<MemoryRegionMap::Region>*) -->
         <function-decl name='destroy' mangled-name='_ZN13STL_AllocatorISt13_Rb_tree_nodeIN15MemoryRegionMap6RegionEENS1_11MyAllocatorEE7destroyEPS3_' filepath='src/base/stl_allocator.h' line='92' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'STL_Allocator<std::_Rb_tree_node<MemoryRegionMap::Region>, MemoryRegionMap::MyAllocator>*' -->
-          <parameter type-id='type-id-962' is-artificial='yes'/>
+          <parameter type-id='type-id-956' is-artificial='yes'/>
           <!-- parameter of type 'std::_Rb_tree_node<MemoryRegionMap::Region>*' -->
           <parameter type-id='type-id-776'/>
           <!-- void -->
@@ -25155,21 +24764,21 @@
         <!-- bool STL_Allocator<std::_Rb_tree_node<MemoryRegionMap::Region>, MemoryRegionMap::MyAllocator>::operator==(const STL_Allocator<std::_Rb_tree_node<MemoryRegionMap::Region>, MemoryRegionMap::MyAllocator>&) -->
         <function-decl name='operator==' mangled-name='_ZNK13STL_AllocatorISt13_Rb_tree_nodeIN15MemoryRegionMap6RegionEENS1_11MyAllocatorEEeqERKS5_' filepath='src/base/stl_allocator.h' line='95' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'const STL_Allocator<std::_Rb_tree_node<MemoryRegionMap::Region>, MemoryRegionMap::MyAllocator>*' -->
-          <parameter type-id='type-id-964' is-artificial='yes'/>
+          <parameter type-id='type-id-958' is-artificial='yes'/>
           <!-- parameter of type 'const STL_Allocator<std::_Rb_tree_node<MemoryRegionMap::Region>, MemoryRegionMap::MyAllocator>&' -->
-          <parameter type-id='type-id-963'/>
+          <parameter type-id='type-id-957'/>
           <!-- bool -->
           <return type-id='type-id-55'/>
         </function-decl>
       </member-function>
     </class-decl>
     <!-- class STL_Allocator<MemoryRegionMap::Region, MemoryRegionMap::MyAllocator> -->
-    <class-decl name='STL_Allocator&lt;MemoryRegionMap::Region, MemoryRegionMap::MyAllocator&gt;' size-in-bits='8' visibility='default' filepath='src/base/stl_allocator.h' line='60' column='1' id='type-id-967'>
+    <class-decl name='STL_Allocator&lt;MemoryRegionMap::Region, MemoryRegionMap::MyAllocator&gt;' size-in-bits='8' visibility='default' filepath='src/base/stl_allocator.h' line='60' column='1' id='type-id-961'>
       <member-function access='private'>
         <!-- void STL_Allocator<MemoryRegionMap::Region, MemoryRegionMap::MyAllocator>::STL_Allocator() -->
         <function-decl name='STL_Allocator' filepath='src/base/stl_allocator.h' line='74' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'STL_Allocator<MemoryRegionMap::Region, MemoryRegionMap::MyAllocator>*' -->
-          <parameter type-id='type-id-968' is-artificial='yes'/>
+          <parameter type-id='type-id-962' is-artificial='yes'/>
           <!-- void -->
           <return type-id='type-id-56'/>
         </function-decl>
@@ -25178,9 +24787,9 @@
         <!-- void STL_Allocator<MemoryRegionMap::Region, MemoryRegionMap::MyAllocator>::STL_Allocator(const STL_Allocator<MemoryRegionMap::Region, MemoryRegionMap::MyAllocator>&) -->
         <function-decl name='STL_Allocator' filepath='src/base/stl_allocator.h' line='75' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'STL_Allocator<MemoryRegionMap::Region, MemoryRegionMap::MyAllocator>*' -->
-          <parameter type-id='type-id-968' is-artificial='yes'/>
+          <parameter type-id='type-id-962' is-artificial='yes'/>
           <!-- parameter of type 'const STL_Allocator<MemoryRegionMap::Region, MemoryRegionMap::MyAllocator>&' -->
-          <parameter type-id='type-id-969'/>
+          <parameter type-id='type-id-963'/>
           <!-- void -->
           <return type-id='type-id-56'/>
         </function-decl>
@@ -25189,7 +24798,7 @@
         <!-- STL_Allocator<MemoryRegionMap::Region, MemoryRegionMap::MyAllocator>::~STL_Allocator(int) -->
         <function-decl name='~STL_Allocator' filepath='src/base/stl_allocator.h' line='77' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'STL_Allocator<MemoryRegionMap::Region, MemoryRegionMap::MyAllocator>*' -->
-          <parameter type-id='type-id-968' is-artificial='yes'/>
+          <parameter type-id='type-id-962' is-artificial='yes'/>
           <!-- artificial parameter of type 'int' -->
           <parameter type-id='type-id-1' is-artificial='yes'/>
           <!-- void -->
@@ -25200,7 +24809,7 @@
         <!-- MemoryRegionMap::Region* STL_Allocator<MemoryRegionMap::Region, MemoryRegionMap::MyAllocator>::address(MemoryRegionMap::Region&) -->
         <function-decl name='address' mangled-name='_ZNK13STL_AllocatorIN15MemoryRegionMap6RegionENS0_11MyAllocatorEE7addressERS1_' filepath='src/base/stl_allocator.h' line='79' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'const STL_Allocator<MemoryRegionMap::Region, MemoryRegionMap::MyAllocator>*' -->
-          <parameter type-id='type-id-970' is-artificial='yes'/>
+          <parameter type-id='type-id-964' is-artificial='yes'/>
           <!-- parameter of type 'MemoryRegionMap::Region&' -->
           <parameter type-id='type-id-778'/>
           <!-- MemoryRegionMap::Region* -->
@@ -25211,7 +24820,7 @@
         <!-- const MemoryRegionMap::Region* STL_Allocator<MemoryRegionMap::Region, MemoryRegionMap::MyAllocator>::address(const MemoryRegionMap::Region&) -->
         <function-decl name='address' mangled-name='_ZNK13STL_AllocatorIN15MemoryRegionMap6RegionENS0_11MyAllocatorEE7addressERKS1_' filepath='src/base/stl_allocator.h' line='80' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'const STL_Allocator<MemoryRegionMap::Region, MemoryRegionMap::MyAllocator>*' -->
-          <parameter type-id='type-id-970' is-artificial='yes'/>
+          <parameter type-id='type-id-964' is-artificial='yes'/>
           <!-- parameter of type 'const MemoryRegionMap::Region&' -->
           <parameter type-id='type-id-160'/>
           <!-- const MemoryRegionMap::Region* -->
@@ -25222,7 +24831,7 @@
         <!-- MemoryRegionMap::Region* STL_Allocator<MemoryRegionMap::Region, MemoryRegionMap::MyAllocator>::allocate(unsigned long int, void*) -->
         <function-decl name='allocate' mangled-name='_ZN13STL_AllocatorIN15MemoryRegionMap6RegionENS0_11MyAllocatorEE8allocateEmPKv' filepath='src/base/stl_allocator.h' line='82' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'STL_Allocator<MemoryRegionMap::Region, MemoryRegionMap::MyAllocator>*' -->
-          <parameter type-id='type-id-968' is-artificial='yes'/>
+          <parameter type-id='type-id-962' is-artificial='yes'/>
           <!-- parameter of type 'unsigned long int' -->
           <parameter type-id='type-id-5'/>
           <!-- parameter of type 'void*' -->
@@ -25235,7 +24844,7 @@
         <!-- void STL_Allocator<MemoryRegionMap::Region, MemoryRegionMap::MyAllocator>::deallocate(MemoryRegionMap::Region*, unsigned long int) -->
         <function-decl name='deallocate' mangled-name='_ZN13STL_AllocatorIN15MemoryRegionMap6RegionENS0_11MyAllocatorEE10deallocateEPS1_m' filepath='src/base/stl_allocator.h' line='86' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'STL_Allocator<MemoryRegionMap::Region, MemoryRegionMap::MyAllocator>*' -->
-          <parameter type-id='type-id-968' is-artificial='yes'/>
+          <parameter type-id='type-id-962' is-artificial='yes'/>
           <!-- parameter of type 'MemoryRegionMap::Region*' -->
           <parameter type-id='type-id-163'/>
           <!-- parameter of type 'unsigned long int' -->
@@ -25248,7 +24857,7 @@
         <!-- size_t STL_Allocator<MemoryRegionMap::Region, MemoryRegionMap::MyAllocator>::max_size() -->
         <function-decl name='max_size' mangled-name='_ZNK13STL_AllocatorIN15MemoryRegionMap6RegionENS0_11MyAllocatorEE8max_sizeEv' filepath='src/base/stl_allocator.h' line='88' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'const STL_Allocator<MemoryRegionMap::Region, MemoryRegionMap::MyAllocator>*' -->
-          <parameter type-id='type-id-970' is-artificial='yes'/>
+          <parameter type-id='type-id-964' is-artificial='yes'/>
           <!-- typedef size_t -->
           <return type-id='type-id-57'/>
         </function-decl>
@@ -25257,7 +24866,7 @@
         <!-- void STL_Allocator<MemoryRegionMap::Region, MemoryRegionMap::MyAllocator>::construct(MemoryRegionMap::Region*, const MemoryRegionMap::Region&) -->
         <function-decl name='construct' mangled-name='_ZN13STL_AllocatorIN15MemoryRegionMap6RegionENS0_11MyAllocatorEE9constructEPS1_RKS1_' filepath='src/base/stl_allocator.h' line='90' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'STL_Allocator<MemoryRegionMap::Region, MemoryRegionMap::MyAllocator>*' -->
-          <parameter type-id='type-id-968' is-artificial='yes'/>
+          <parameter type-id='type-id-962' is-artificial='yes'/>
           <!-- parameter of type 'MemoryRegionMap::Region*' -->
           <parameter type-id='type-id-163'/>
           <!-- parameter of type 'const MemoryRegionMap::Region&' -->
@@ -25270,7 +24879,7 @@
         <!-- void STL_Allocator<MemoryRegionMap::Region, MemoryRegionMap::MyAllocator>::construct(MemoryRegionMap::Region*) -->
         <function-decl name='construct' mangled-name='_ZN13STL_AllocatorIN15MemoryRegionMap6RegionENS0_11MyAllocatorEE9constructEPS1_' filepath='src/base/stl_allocator.h' line='91' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'STL_Allocator<MemoryRegionMap::Region, MemoryRegionMap::MyAllocator>*' -->
-          <parameter type-id='type-id-968' is-artificial='yes'/>
+          <parameter type-id='type-id-962' is-artificial='yes'/>
           <!-- parameter of type 'MemoryRegionMap::Region*' -->
           <parameter type-id='type-id-163'/>
           <!-- void -->
@@ -25281,7 +24890,7 @@
         <!-- void STL_Allocator<MemoryRegionMap::Region, MemoryRegionMap::MyAllocator>::destroy(MemoryRegionMap::Region*) -->
         <function-decl name='destroy' mangled-name='_ZN13STL_AllocatorIN15MemoryRegionMap6RegionENS0_11MyAllocatorEE7destroyEPS1_' filepath='src/base/stl_allocator.h' line='92' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'STL_Allocator<MemoryRegionMap::Region, MemoryRegionMap::MyAllocator>*' -->
-          <parameter type-id='type-id-968' is-artificial='yes'/>
+          <parameter type-id='type-id-962' is-artificial='yes'/>
           <!-- parameter of type 'MemoryRegionMap::Region*' -->
           <parameter type-id='type-id-163'/>
           <!-- void -->
@@ -25292,9 +24901,9 @@
         <!-- bool STL_Allocator<MemoryRegionMap::Region, MemoryRegionMap::MyAllocator>::operator==(const STL_Allocator<MemoryRegionMap::Region, MemoryRegionMap::MyAllocator>&) -->
         <function-decl name='operator==' mangled-name='_ZNK13STL_AllocatorIN15MemoryRegionMap6RegionENS0_11MyAllocatorEEeqERKS3_' filepath='src/base/stl_allocator.h' line='95' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'const STL_Allocator<MemoryRegionMap::Region, MemoryRegionMap::MyAllocator>*' -->
-          <parameter type-id='type-id-970' is-artificial='yes'/>
+          <parameter type-id='type-id-964' is-artificial='yes'/>
           <!-- parameter of type 'const STL_Allocator<MemoryRegionMap::Region, MemoryRegionMap::MyAllocator>&' -->
-          <parameter type-id='type-id-969'/>
+          <parameter type-id='type-id-963'/>
           <!-- bool -->
           <return type-id='type-id-55'/>
         </function-decl>
@@ -25303,9 +24912,9 @@
         <!-- void STL_Allocator<MemoryRegionMap::Region, MemoryRegionMap::MyAllocator>::STL_Allocator<std::_Rb_tree_node<MemoryRegionMap::Region> >(const STL_Allocator<std::_Rb_tree_node<MemoryRegionMap::Region>, MemoryRegionMap::MyAllocator>&) -->
         <function-decl name='STL_Allocator&lt;std::_Rb_tree_node&lt;MemoryRegionMap::Region&gt; &gt;' filepath='src/base/stl_allocator.h' line='76' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'STL_Allocator<MemoryRegionMap::Region, MemoryRegionMap::MyAllocator>*' -->
-          <parameter type-id='type-id-968' is-artificial='yes'/>
+          <parameter type-id='type-id-962' is-artificial='yes'/>
           <!-- parameter of type 'const STL_Allocator<std::_Rb_tree_node<MemoryRegionMap::Region>, MemoryRegionMap::MyAllocator>&' -->
-          <parameter type-id='type-id-963'/>
+          <parameter type-id='type-id-957'/>
           <!-- void -->
           <return type-id='type-id-56'/>
         </function-decl>
@@ -25320,77 +24929,77 @@
     <!-- MemoryRegionMap::RegionSetRep* -->
     <pointer-type-def type-id='type-id-167' size-in-bits='64' id='type-id-169'/>
     <!-- STL_Allocator<MemoryRegionMap::Region, MemoryRegionMap::MyAllocator>* -->
-    <pointer-type-def type-id='type-id-967' size-in-bits='64' id='type-id-968'/>
+    <pointer-type-def type-id='type-id-961' size-in-bits='64' id='type-id-962'/>
     <!-- STL_Allocator<std::_Rb_tree_node<MemoryRegionMap::Region>, MemoryRegionMap::MyAllocator>& -->
-    <reference-type-def kind='lvalue' type-id='type-id-961' size-in-bits='64' id='type-id-971'/>
+    <reference-type-def kind='lvalue' type-id='type-id-955' size-in-bits='64' id='type-id-965'/>
     <!-- STL_Allocator<std::_Rb_tree_node<MemoryRegionMap::Region>, MemoryRegionMap::MyAllocator>* -->
-    <pointer-type-def type-id='type-id-961' size-in-bits='64' id='type-id-962'/>
+    <pointer-type-def type-id='type-id-955' size-in-bits='64' id='type-id-956'/>
     <!-- const MemoryRegionMap::RegionCmp -->
-    <qualified-type-def type-id='type-id-158' const='yes' id='type-id-972'/>
+    <qualified-type-def type-id='type-id-158' const='yes' id='type-id-966'/>
     <!-- const MemoryRegionMap::RegionCmp& -->
-    <reference-type-def kind='lvalue' type-id='type-id-972' size-in-bits='64' id='type-id-973'/>
+    <reference-type-def kind='lvalue' type-id='type-id-966' size-in-bits='64' id='type-id-967'/>
     <!-- const MemoryRegionMap::RegionCmp* -->
-    <pointer-type-def type-id='type-id-972' size-in-bits='64' id='type-id-159'/>
+    <pointer-type-def type-id='type-id-966' size-in-bits='64' id='type-id-159'/>
     <!-- const STL_Allocator<MemoryRegionMap::Region, MemoryRegionMap::MyAllocator> -->
-    <qualified-type-def type-id='type-id-967' const='yes' id='type-id-974'/>
+    <qualified-type-def type-id='type-id-961' const='yes' id='type-id-968'/>
     <!-- const STL_Allocator<MemoryRegionMap::Region, MemoryRegionMap::MyAllocator>& -->
-    <reference-type-def kind='lvalue' type-id='type-id-974' size-in-bits='64' id='type-id-969'/>
+    <reference-type-def kind='lvalue' type-id='type-id-968' size-in-bits='64' id='type-id-963'/>
     <!-- const STL_Allocator<MemoryRegionMap::Region, MemoryRegionMap::MyAllocator>* -->
-    <pointer-type-def type-id='type-id-974' size-in-bits='64' id='type-id-970'/>
+    <pointer-type-def type-id='type-id-968' size-in-bits='64' id='type-id-964'/>
     <!-- const STL_Allocator<std::_Rb_tree_node<MemoryRegionMap::Region>, MemoryRegionMap::MyAllocator> -->
-    <qualified-type-def type-id='type-id-961' const='yes' id='type-id-975'/>
+    <qualified-type-def type-id='type-id-955' const='yes' id='type-id-969'/>
     <!-- const STL_Allocator<std::_Rb_tree_node<MemoryRegionMap::Region>, MemoryRegionMap::MyAllocator>& -->
-    <reference-type-def kind='lvalue' type-id='type-id-975' size-in-bits='64' id='type-id-963'/>
+    <reference-type-def kind='lvalue' type-id='type-id-969' size-in-bits='64' id='type-id-957'/>
     <!-- const STL_Allocator<std::_Rb_tree_node<MemoryRegionMap::Region>, MemoryRegionMap::MyAllocator>* -->
-    <pointer-type-def type-id='type-id-975' size-in-bits='64' id='type-id-964'/>
+    <pointer-type-def type-id='type-id-969' size-in-bits='64' id='type-id-958'/>
     <!-- const std::_Identity<MemoryRegionMap::Region> -->
-    <qualified-type-def type-id='type-id-976' const='yes' id='type-id-977'/>
+    <qualified-type-def type-id='type-id-970' const='yes' id='type-id-971'/>
     <!-- const std::_Identity<MemoryRegionMap::Region>* -->
-    <pointer-type-def type-id='type-id-977' size-in-bits='64' id='type-id-978'/>
+    <pointer-type-def type-id='type-id-971' size-in-bits='64' id='type-id-972'/>
     <!-- const std::_Rb_tree<MemoryRegionMap::Region, MemoryRegionMap::Region, std::_Identity<MemoryRegionMap::Region>, MemoryRegionMap::RegionCmp, STL_Allocator<MemoryRegionMap::Region, MemoryRegionMap::MyAllocator> > -->
-    <qualified-type-def type-id='type-id-979' const='yes' id='type-id-980'/>
+    <qualified-type-def type-id='type-id-973' const='yes' id='type-id-974'/>
     <!-- const std::_Rb_tree<MemoryRegionMap::Region, MemoryRegionMap::Region, std::_Identity<MemoryRegionMap::Region>, MemoryRegionMap::RegionCmp, STL_Allocator<MemoryRegionMap::Region, MemoryRegionMap::MyAllocator> >& -->
-    <reference-type-def kind='lvalue' type-id='type-id-980' size-in-bits='64' id='type-id-981'/>
+    <reference-type-def kind='lvalue' type-id='type-id-974' size-in-bits='64' id='type-id-975'/>
     <!-- const std::_Rb_tree<MemoryRegionMap::Region, MemoryRegionMap::Region, std::_Identity<MemoryRegionMap::Region>, MemoryRegionMap::RegionCmp, STL_Allocator<MemoryRegionMap::Region, MemoryRegionMap::MyAllocator> >* -->
-    <pointer-type-def type-id='type-id-980' size-in-bits='64' id='type-id-982'/>
+    <pointer-type-def type-id='type-id-974' size-in-bits='64' id='type-id-976'/>
     <!-- const std::_Rb_tree_iterator<MemoryRegionMap::Region>* -->
     <pointer-type-def type-id='type-id-502' size-in-bits='64' id='type-id-777'/>
     <!-- const std::_Rb_tree_node<MemoryRegionMap::Region>& -->
-    <reference-type-def kind='lvalue' type-id='type-id-521' size-in-bits='64' id='type-id-966'/>
+    <reference-type-def kind='lvalue' type-id='type-id-521' size-in-bits='64' id='type-id-960'/>
     <!-- const std::set<MemoryRegionMap::Region, MemoryRegionMap::RegionCmp, STL_Allocator<MemoryRegionMap::Region, MemoryRegionMap::MyAllocator> > -->
-    <qualified-type-def type-id='type-id-166' const='yes' id='type-id-983'/>
+    <qualified-type-def type-id='type-id-166' const='yes' id='type-id-977'/>
     <!-- const std::set<MemoryRegionMap::Region, MemoryRegionMap::RegionCmp, STL_Allocator<MemoryRegionMap::Region, MemoryRegionMap::MyAllocator> >& -->
-    <reference-type-def kind='lvalue' type-id='type-id-983' size-in-bits='64' id='type-id-984'/>
+    <reference-type-def kind='lvalue' type-id='type-id-977' size-in-bits='64' id='type-id-978'/>
     <!-- const std::set<MemoryRegionMap::Region, MemoryRegionMap::RegionCmp, STL_Allocator<MemoryRegionMap::Region, MemoryRegionMap::MyAllocator> >* -->
-    <pointer-type-def type-id='type-id-983' size-in-bits='64' id='type-id-985'/>
+    <pointer-type-def type-id='type-id-977' size-in-bits='64' id='type-id-979'/>
     <!-- const volatile Atomic32 -->
-    <qualified-type-def type-id='type-id-986' const='yes' id='type-id-987'/>
+    <qualified-type-def type-id='type-id-980' const='yes' id='type-id-981'/>
     <!-- const volatile Atomic32* -->
-    <pointer-type-def type-id='type-id-987' size-in-bits='64' id='type-id-81'/>
+    <pointer-type-def type-id='type-id-981' size-in-bits='64' id='type-id-81'/>
     <!-- std::_Rb_tree<MemoryRegionMap::Region, MemoryRegionMap::Region, std::_Identity<MemoryRegionMap::Region>, MemoryRegionMap::RegionCmp, STL_Allocator<MemoryRegionMap::Region, MemoryRegionMap::MyAllocator> >& -->
-    <reference-type-def kind='lvalue' type-id='type-id-979' size-in-bits='64' id='type-id-988'/>
+    <reference-type-def kind='lvalue' type-id='type-id-973' size-in-bits='64' id='type-id-982'/>
     <!-- std::_Rb_tree<MemoryRegionMap::Region, MemoryRegionMap::Region, std::_Identity<MemoryRegionMap::Region>, MemoryRegionMap::RegionCmp, STL_Allocator<MemoryRegionMap::Region, MemoryRegionMap::MyAllocator> >* -->
-    <pointer-type-def type-id='type-id-979' size-in-bits='64' id='type-id-989'/>
+    <pointer-type-def type-id='type-id-973' size-in-bits='64' id='type-id-983'/>
     <!-- std::_Rb_tree<MemoryRegionMap::Region, MemoryRegionMap::Region, std::_Identity<MemoryRegionMap::Region>, MemoryRegionMap::RegionCmp, STL_Allocator<MemoryRegionMap::Region, MemoryRegionMap::MyAllocator> >::_Rb_tree_impl<MemoryRegionMap::RegionCmp, true>* -->
-    <pointer-type-def type-id='type-id-990' size-in-bits='64' id='type-id-991'/>
+    <pointer-type-def type-id='type-id-984' size-in-bits='64' id='type-id-985'/>
     <!-- std::_Rb_tree_iterator<MemoryRegionMap::Region>& -->
     <reference-type-def kind='lvalue' type-id='type-id-501' size-in-bits='64' id='type-id-779'/>
     <!-- std::_Rb_tree_iterator<MemoryRegionMap::Region>* -->
     <pointer-type-def type-id='type-id-501' size-in-bits='64' id='type-id-775'/>
     <!-- std::_Rb_tree_node<MemoryRegionMap::Region>& -->
-    <reference-type-def kind='lvalue' type-id='type-id-520' size-in-bits='64' id='type-id-965'/>
+    <reference-type-def kind='lvalue' type-id='type-id-520' size-in-bits='64' id='type-id-959'/>
     <!-- std::_Rb_tree_node<MemoryRegionMap::Region>* -->
     <pointer-type-def type-id='type-id-520' size-in-bits='64' id='type-id-776'/>
     <!-- std::pair<std::_Rb_tree_const_iterator<MemoryRegionMap::Region>, bool>* -->
-    <pointer-type-def type-id='type-id-992' size-in-bits='64' id='type-id-993'/>
+    <pointer-type-def type-id='type-id-986' size-in-bits='64' id='type-id-987'/>
     <!-- std::pair<std::_Rb_tree_iterator<MemoryRegionMap::Region>, bool>* -->
-    <pointer-type-def type-id='type-id-994' size-in-bits='64' id='type-id-995'/>
+    <pointer-type-def type-id='type-id-988' size-in-bits='64' id='type-id-989'/>
     <!-- std::set<MemoryRegionMap::Region, MemoryRegionMap::RegionCmp, STL_Allocator<MemoryRegionMap::Region, MemoryRegionMap::MyAllocator> >& -->
-    <reference-type-def kind='lvalue' type-id='type-id-166' size-in-bits='64' id='type-id-996'/>
+    <reference-type-def kind='lvalue' type-id='type-id-166' size-in-bits='64' id='type-id-990'/>
     <!-- std::set<MemoryRegionMap::Region, MemoryRegionMap::RegionCmp, STL_Allocator<MemoryRegionMap::Region, MemoryRegionMap::MyAllocator> >* -->
-    <pointer-type-def type-id='type-id-166' size-in-bits='64' id='type-id-997'/>
+    <pointer-type-def type-id='type-id-166' size-in-bits='64' id='type-id-991'/>
     <!-- void (const MemoryRegionMap::Region&)* -->
-    <pointer-type-def type-id='type-id-998' size-in-bits='64' id='type-id-184'/>
+    <pointer-type-def type-id='type-id-992' size-in-bits='64' id='type-id-184'/>
     <!-- namespace std -->
     <namespace-decl name='std'>
       <!-- bool std::__equal_aux<const void**, const void**>(void**, void**, void**) -->
@@ -25452,13 +25061,13 @@
       <class-decl name='set&lt;MemoryRegionMap::Region, MemoryRegionMap::RegionCmp, STL_Allocator&lt;MemoryRegionMap::Region, MemoryRegionMap::MyAllocator&gt; &gt;' size-in-bits='384' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_set.h' line='88' column='1' id='type-id-166'>
         <data-member access='private' layout-offset-in-bits='0'>
           <!-- std::_Rb_tree<MemoryRegionMap::Region, MemoryRegionMap::Region, std::_Identity<MemoryRegionMap::Region>, MemoryRegionMap::RegionCmp, STL_Allocator<MemoryRegionMap::Region, MemoryRegionMap::MyAllocator> > std::set<MemoryRegionMap::Region, MemoryRegionMap::RegionCmp, STL_Allocator<MemoryRegionMap::Region, MemoryRegionMap::MyAllocator> >::_M_t -->
-          <var-decl name='_M_t' type-id='type-id-979' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_set.h' line='112' column='1'/>
+          <var-decl name='_M_t' type-id='type-id-973' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_set.h' line='112' column='1'/>
         </data-member>
         <member-function access='private'>
           <!-- void std::set<MemoryRegionMap::Region, MemoryRegionMap::RegionCmp, STL_Allocator<MemoryRegionMap::Region, MemoryRegionMap::MyAllocator> >::set() -->
           <function-decl name='set' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_set.h' line='136' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::set<MemoryRegionMap::Region, MemoryRegionMap::RegionCmp, STL_Allocator<MemoryRegionMap::Region, MemoryRegionMap::MyAllocator> >*' -->
-            <parameter type-id='type-id-997' is-artificial='yes'/>
+            <parameter type-id='type-id-991' is-artificial='yes'/>
             <!-- void -->
             <return type-id='type-id-56'/>
           </function-decl>
@@ -25467,11 +25076,11 @@
           <!-- void std::set<MemoryRegionMap::Region, MemoryRegionMap::RegionCmp, STL_Allocator<MemoryRegionMap::Region, MemoryRegionMap::MyAllocator> >::set(const MemoryRegionMap::RegionCmp&, const STL_Allocator<MemoryRegionMap::Region, MemoryRegionMap::MyAllocator>&) -->
           <function-decl name='set' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_set.h' line='145' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::set<MemoryRegionMap::Region, MemoryRegionMap::RegionCmp, STL_Allocator<MemoryRegionMap::Region, MemoryRegionMap::MyAllocator> >*' -->
-            <parameter type-id='type-id-997' is-artificial='yes'/>
+            <parameter type-id='type-id-991' is-artificial='yes'/>
             <!-- parameter of type 'const MemoryRegionMap::RegionCmp&' -->
-            <parameter type-id='type-id-973'/>
+            <parameter type-id='type-id-967'/>
             <!-- parameter of type 'const STL_Allocator<MemoryRegionMap::Region, MemoryRegionMap::MyAllocator>&' -->
-            <parameter type-id='type-id-969'/>
+            <parameter type-id='type-id-963'/>
             <!-- void -->
             <return type-id='type-id-56'/>
           </function-decl>
@@ -25480,9 +25089,9 @@
           <!-- void std::set<MemoryRegionMap::Region, MemoryRegionMap::RegionCmp, STL_Allocator<MemoryRegionMap::Region, MemoryRegionMap::MyAllocator> >::set(const std::set<MemoryRegionMap::Region, MemoryRegionMap::RegionCmp, STL_Allocator<MemoryRegionMap::Region, MemoryRegionMap::MyAllocator> >&) -->
           <function-decl name='set' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_set.h' line='188' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::set<MemoryRegionMap::Region, MemoryRegionMap::RegionCmp, STL_Allocator<MemoryRegionMap::Region, MemoryRegionMap::MyAllocator> >*' -->
-            <parameter type-id='type-id-997' is-artificial='yes'/>
+            <parameter type-id='type-id-991' is-artificial='yes'/>
             <!-- parameter of type 'const std::set<MemoryRegionMap::Region, MemoryRegionMap::RegionCmp, STL_Allocator<MemoryRegionMap::Region, MemoryRegionMap::MyAllocator> >&' -->
-            <parameter type-id='type-id-984'/>
+            <parameter type-id='type-id-978'/>
             <!-- void -->
             <return type-id='type-id-56'/>
           </function-decl>
@@ -25491,18 +25100,18 @@
           <!-- std::set<MemoryRegionMap::Region, MemoryRegionMap::RegionCmp, STL_Allocator<MemoryRegionMap::Region, MemoryRegionMap::MyAllocator> >& std::set<MemoryRegionMap::Region, MemoryRegionMap::RegionCmp, STL_Allocator<MemoryRegionMap::Region, MemoryRegionMap::MyAllocator> >::operator=(const std::set<MemoryRegionMap::Region, MemoryRegionMap::RegionCmp, STL_Allocator<MemoryRegionMap::Region, MemoryRegionMap::MyAllocator> >&) -->
           <function-decl name='operator=' mangled-name='_ZNSt3setIN15MemoryRegionMap6RegionENS0_9RegionCmpE13STL_AllocatorIS1_NS0_11MyAllocatorEEEaSERKS6_' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_set.h' line='227' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::set<MemoryRegionMap::Region, MemoryRegionMap::RegionCmp, STL_Allocator<MemoryRegionMap::Region, MemoryRegionMap::MyAllocator> >*' -->
-            <parameter type-id='type-id-997' is-artificial='yes'/>
+            <parameter type-id='type-id-991' is-artificial='yes'/>
             <!-- parameter of type 'const std::set<MemoryRegionMap::Region, MemoryRegionMap::RegionCmp, STL_Allocator<MemoryRegionMap::Region, MemoryRegionMap::MyAllocator> >&' -->
-            <parameter type-id='type-id-984'/>
+            <parameter type-id='type-id-978'/>
             <!-- std::set<MemoryRegionMap::Region, MemoryRegionMap::RegionCmp, STL_Allocator<MemoryRegionMap::Region, MemoryRegionMap::MyAllocator> >& -->
-            <return type-id='type-id-996'/>
+            <return type-id='type-id-990'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <!-- MemoryRegionMap::RegionCmp std::set<MemoryRegionMap::Region, MemoryRegionMap::RegionCmp, STL_Allocator<MemoryRegionMap::Region, MemoryRegionMap::MyAllocator> >::key_comp() -->
           <function-decl name='key_comp' mangled-name='_ZNKSt3setIN15MemoryRegionMap6RegionENS0_9RegionCmpE13STL_AllocatorIS1_NS0_11MyAllocatorEEE8key_compEv' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_set.h' line='274' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const std::set<MemoryRegionMap::Region, MemoryRegionMap::RegionCmp, STL_Allocator<MemoryRegionMap::Region, MemoryRegionMap::MyAllocator> >*' -->
-            <parameter type-id='type-id-985' is-artificial='yes'/>
+            <parameter type-id='type-id-979' is-artificial='yes'/>
             <!-- struct MemoryRegionMap::RegionCmp -->
             <return type-id='type-id-158'/>
           </function-decl>
@@ -25511,7 +25120,7 @@
           <!-- MemoryRegionMap::RegionCmp std::set<MemoryRegionMap::Region, MemoryRegionMap::RegionCmp, STL_Allocator<MemoryRegionMap::Region, MemoryRegionMap::MyAllocator> >::value_comp() -->
           <function-decl name='value_comp' mangled-name='_ZNKSt3setIN15MemoryRegionMap6RegionENS0_9RegionCmpE13STL_AllocatorIS1_NS0_11MyAllocatorEEE10value_compEv' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_set.h' line='278' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const std::set<MemoryRegionMap::Region, MemoryRegionMap::RegionCmp, STL_Allocator<MemoryRegionMap::Region, MemoryRegionMap::MyAllocator> >*' -->
-            <parameter type-id='type-id-985' is-artificial='yes'/>
+            <parameter type-id='type-id-979' is-artificial='yes'/>
             <!-- struct MemoryRegionMap::RegionCmp -->
             <return type-id='type-id-158'/>
           </function-decl>
@@ -25520,16 +25129,16 @@
           <!-- STL_Allocator<MemoryRegionMap::Region, MemoryRegionMap::MyAllocator> std::set<MemoryRegionMap::Region, MemoryRegionMap::RegionCmp, STL_Allocator<MemoryRegionMap::Region, MemoryRegionMap::MyAllocator> >::get_allocator() -->
           <function-decl name='get_allocator' mangled-name='_ZNKSt3setIN15MemoryRegionMap6RegionENS0_9RegionCmpE13STL_AllocatorIS1_NS0_11MyAllocatorEEE13get_allocatorEv' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_set.h' line='282' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const std::set<MemoryRegionMap::Region, MemoryRegionMap::RegionCmp, STL_Allocator<MemoryRegionMap::Region, MemoryRegionMap::MyAllocator> >*' -->
-            <parameter type-id='type-id-985' is-artificial='yes'/>
+            <parameter type-id='type-id-979' is-artificial='yes'/>
             <!-- class STL_Allocator<MemoryRegionMap::Region, MemoryRegionMap::MyAllocator> -->
-            <return type-id='type-id-967'/>
+            <return type-id='type-id-961'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <!-- std::_Rb_tree_const_iterator<MemoryRegionMap::Region> std::set<MemoryRegionMap::Region, MemoryRegionMap::RegionCmp, STL_Allocator<MemoryRegionMap::Region, MemoryRegionMap::MyAllocator> >::begin() -->
           <function-decl name='begin' mangled-name='_ZNKSt3setIN15MemoryRegionMap6RegionENS0_9RegionCmpE13STL_AllocatorIS1_NS0_11MyAllocatorEEE5beginEv' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_set.h' line='291' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const std::set<MemoryRegionMap::Region, MemoryRegionMap::RegionCmp, STL_Allocator<MemoryRegionMap::Region, MemoryRegionMap::MyAllocator> >*' -->
-            <parameter type-id='type-id-985' is-artificial='yes'/>
+            <parameter type-id='type-id-979' is-artificial='yes'/>
             <!-- struct std::_Rb_tree_const_iterator<MemoryRegionMap::Region> -->
             <return type-id='type-id-175'/>
           </function-decl>
@@ -25538,7 +25147,7 @@
           <!-- std::_Rb_tree_const_iterator<MemoryRegionMap::Region> std::set<MemoryRegionMap::Region, MemoryRegionMap::RegionCmp, STL_Allocator<MemoryRegionMap::Region, MemoryRegionMap::MyAllocator> >::end() -->
           <function-decl name='end' mangled-name='_ZNKSt3setIN15MemoryRegionMap6RegionENS0_9RegionCmpE13STL_AllocatorIS1_NS0_11MyAllocatorEEE3endEv' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_set.h' line='300' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const std::set<MemoryRegionMap::Region, MemoryRegionMap::RegionCmp, STL_Allocator<MemoryRegionMap::Region, MemoryRegionMap::MyAllocator> >*' -->
-            <parameter type-id='type-id-985' is-artificial='yes'/>
+            <parameter type-id='type-id-979' is-artificial='yes'/>
             <!-- struct std::_Rb_tree_const_iterator<MemoryRegionMap::Region> -->
             <return type-id='type-id-175'/>
           </function-decl>
@@ -25547,25 +25156,25 @@
           <!-- std::reverse_iterator<std::_Rb_tree_const_iterator<MemoryRegionMap::Region> > std::set<MemoryRegionMap::Region, MemoryRegionMap::RegionCmp, STL_Allocator<MemoryRegionMap::Region, MemoryRegionMap::MyAllocator> >::rbegin() -->
           <function-decl name='rbegin' mangled-name='_ZNKSt3setIN15MemoryRegionMap6RegionENS0_9RegionCmpE13STL_AllocatorIS1_NS0_11MyAllocatorEEE6rbeginEv' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_set.h' line='309' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const std::set<MemoryRegionMap::Region, MemoryRegionMap::RegionCmp, STL_Allocator<MemoryRegionMap::Region, MemoryRegionMap::MyAllocator> >*' -->
-            <parameter type-id='type-id-985' is-artificial='yes'/>
+            <parameter type-id='type-id-979' is-artificial='yes'/>
             <!-- class std::reverse_iterator<std::_Rb_tree_const_iterator<MemoryRegionMap::Region> > -->
-            <return type-id='type-id-999'/>
+            <return type-id='type-id-993'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <!-- std::reverse_iterator<std::_Rb_tree_const_iterator<MemoryRegionMap::Region> > std::set<MemoryRegionMap::Region, MemoryRegionMap::RegionCmp, STL_Allocator<MemoryRegionMap::Region, MemoryRegionMap::MyAllocator> >::rend() -->
           <function-decl name='rend' mangled-name='_ZNKSt3setIN15MemoryRegionMap6RegionENS0_9RegionCmpE13STL_AllocatorIS1_NS0_11MyAllocatorEEE4rendEv' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_set.h' line='318' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const std::set<MemoryRegionMap::Region, MemoryRegionMap::RegionCmp, STL_Allocator<MemoryRegionMap::Region, MemoryRegionMap::MyAllocator> >*' -->
-            <parameter type-id='type-id-985' is-artificial='yes'/>
+            <parameter type-id='type-id-979' is-artificial='yes'/>
             <!-- class std::reverse_iterator<std::_Rb_tree_const_iterator<MemoryRegionMap::Region> > -->
-            <return type-id='type-id-999'/>
+            <return type-id='type-id-993'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <!-- bool std::set<MemoryRegionMap::Region, MemoryRegionMap::RegionCmp, STL_Allocator<MemoryRegionMap::Region, MemoryRegionMap::MyAllocator> >::empty() -->
           <function-decl name='empty' mangled-name='_ZNKSt3setIN15MemoryRegionMap6RegionENS0_9RegionCmpE13STL_AllocatorIS1_NS0_11MyAllocatorEEE5emptyEv' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_set.h' line='361' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const std::set<MemoryRegionMap::Region, MemoryRegionMap::RegionCmp, STL_Allocator<MemoryRegionMap::Region, MemoryRegionMap::MyAllocator> >*' -->
-            <parameter type-id='type-id-985' is-artificial='yes'/>
+            <parameter type-id='type-id-979' is-artificial='yes'/>
             <!-- bool -->
             <return type-id='type-id-55'/>
           </function-decl>
@@ -25574,7 +25183,7 @@
           <!-- size_t std::set<MemoryRegionMap::Region, MemoryRegionMap::RegionCmp, STL_Allocator<MemoryRegionMap::Region, MemoryRegionMap::MyAllocator> >::size() -->
           <function-decl name='size' mangled-name='_ZNKSt3setIN15MemoryRegionMap6RegionENS0_9RegionCmpE13STL_AllocatorIS1_NS0_11MyAllocatorEEE4sizeEv' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_set.h' line='366' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const std::set<MemoryRegionMap::Region, MemoryRegionMap::RegionCmp, STL_Allocator<MemoryRegionMap::Region, MemoryRegionMap::MyAllocator> >*' -->
-            <parameter type-id='type-id-985' is-artificial='yes'/>
+            <parameter type-id='type-id-979' is-artificial='yes'/>
             <!-- typedef size_t -->
             <return type-id='type-id-57'/>
           </function-decl>
@@ -25583,7 +25192,7 @@
           <!-- size_t std::set<MemoryRegionMap::Region, MemoryRegionMap::RegionCmp, STL_Allocator<MemoryRegionMap::Region, MemoryRegionMap::MyAllocator> >::max_size() -->
           <function-decl name='max_size' mangled-name='_ZNKSt3setIN15MemoryRegionMap6RegionENS0_9RegionCmpE13STL_AllocatorIS1_NS0_11MyAllocatorEEE8max_sizeEv' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_set.h' line='371' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const std::set<MemoryRegionMap::Region, MemoryRegionMap::RegionCmp, STL_Allocator<MemoryRegionMap::Region, MemoryRegionMap::MyAllocator> >*' -->
-            <parameter type-id='type-id-985' is-artificial='yes'/>
+            <parameter type-id='type-id-979' is-artificial='yes'/>
             <!-- typedef size_t -->
             <return type-id='type-id-57'/>
           </function-decl>
@@ -25592,9 +25201,9 @@
           <!-- void std::set<MemoryRegionMap::Region, MemoryRegionMap::RegionCmp, STL_Allocator<MemoryRegionMap::Region, MemoryRegionMap::MyAllocator> >::swap(std::set<MemoryRegionMap::Region, MemoryRegionMap::RegionCmp, STL_Allocator<MemoryRegionMap::Region, MemoryRegionMap::MyAllocator> >&) -->
           <function-decl name='swap' mangled-name='_ZNSt3setIN15MemoryRegionMap6RegionENS0_9RegionCmpE13STL_AllocatorIS1_NS0_11MyAllocatorEEE4swapERS6_' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_set.h' line='389' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::set<MemoryRegionMap::Region, MemoryRegionMap::RegionCmp, STL_Allocator<MemoryRegionMap::Region, MemoryRegionMap::MyAllocator> >*' -->
-            <parameter type-id='type-id-997' is-artificial='yes'/>
+            <parameter type-id='type-id-991' is-artificial='yes'/>
             <!-- parameter of type 'std::set<MemoryRegionMap::Region, MemoryRegionMap::RegionCmp, STL_Allocator<MemoryRegionMap::Region, MemoryRegionMap::MyAllocator> >&' -->
-            <parameter type-id='type-id-996'/>
+            <parameter type-id='type-id-990'/>
             <!-- void -->
             <return type-id='type-id-56'/>
           </function-decl>
@@ -25603,18 +25212,18 @@
           <!-- std::pair<std::_Rb_tree_const_iterator<MemoryRegionMap::Region>, bool> std::set<MemoryRegionMap::Region, MemoryRegionMap::RegionCmp, STL_Allocator<MemoryRegionMap::Region, MemoryRegionMap::MyAllocator> >::insert(const MemoryRegionMap::Region&) -->
           <function-decl name='insert' mangled-name='_ZNSt3setIN15MemoryRegionMap6RegionENS0_9RegionCmpE13STL_AllocatorIS1_NS0_11MyAllocatorEEE6insertERKS1_' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_set.h' line='408' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::set<MemoryRegionMap::Region, MemoryRegionMap::RegionCmp, STL_Allocator<MemoryRegionMap::Region, MemoryRegionMap::MyAllocator> >*' -->
-            <parameter type-id='type-id-997' is-artificial='yes'/>
+            <parameter type-id='type-id-991' is-artificial='yes'/>
             <!-- parameter of type 'const MemoryRegionMap::Region&' -->
             <parameter type-id='type-id-160'/>
             <!-- struct std::pair<std::_Rb_tree_const_iterator<MemoryRegionMap::Region>, bool> -->
-            <return type-id='type-id-992'/>
+            <return type-id='type-id-986'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <!-- std::_Rb_tree_const_iterator<MemoryRegionMap::Region> std::set<MemoryRegionMap::Region, MemoryRegionMap::RegionCmp, STL_Allocator<MemoryRegionMap::Region, MemoryRegionMap::MyAllocator> >::insert(std::_Rb_tree_const_iterator<MemoryRegionMap::Region>, const MemoryRegionMap::Region&) -->
           <function-decl name='insert' mangled-name='_ZNSt3setIN15MemoryRegionMap6RegionENS0_9RegionCmpE13STL_AllocatorIS1_NS0_11MyAllocatorEEE6insertESt23_Rb_tree_const_iteratorIS1_ERKS1_' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_set.h' line='435' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::set<MemoryRegionMap::Region, MemoryRegionMap::RegionCmp, STL_Allocator<MemoryRegionMap::Region, MemoryRegionMap::MyAllocator> >*' -->
-            <parameter type-id='type-id-997' is-artificial='yes'/>
+            <parameter type-id='type-id-991' is-artificial='yes'/>
             <!-- parameter of type 'struct std::_Rb_tree_const_iterator<MemoryRegionMap::Region>' -->
             <parameter type-id='type-id-175'/>
             <!-- parameter of type 'const MemoryRegionMap::Region&' -->
@@ -25627,7 +25236,7 @@
           <!-- void std::set<MemoryRegionMap::Region, MemoryRegionMap::RegionCmp, STL_Allocator<MemoryRegionMap::Region, MemoryRegionMap::MyAllocator> >::erase(std::_Rb_tree_const_iterator<MemoryRegionMap::Region>) -->
           <function-decl name='erase' mangled-name='_ZNSt3setIN15MemoryRegionMap6RegionENS0_9RegionCmpE13STL_AllocatorIS1_NS0_11MyAllocatorEEE5eraseESt23_Rb_tree_const_iteratorIS1_E' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_set.h' line='475' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::set<MemoryRegionMap::Region, MemoryRegionMap::RegionCmp, STL_Allocator<MemoryRegionMap::Region, MemoryRegionMap::MyAllocator> >*' -->
-            <parameter type-id='type-id-997' is-artificial='yes'/>
+            <parameter type-id='type-id-991' is-artificial='yes'/>
             <!-- parameter of type 'struct std::_Rb_tree_const_iterator<MemoryRegionMap::Region>' -->
             <parameter type-id='type-id-175'/>
             <!-- void -->
@@ -25638,7 +25247,7 @@
           <!-- size_t std::set<MemoryRegionMap::Region, MemoryRegionMap::RegionCmp, STL_Allocator<MemoryRegionMap::Region, MemoryRegionMap::MyAllocator> >::erase(const MemoryRegionMap::Region&) -->
           <function-decl name='erase' mangled-name='_ZNSt3setIN15MemoryRegionMap6RegionENS0_9RegionCmpE13STL_AllocatorIS1_NS0_11MyAllocatorEEE5eraseERKS1_' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_set.h' line='490' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::set<MemoryRegionMap::Region, MemoryRegionMap::RegionCmp, STL_Allocator<MemoryRegionMap::Region, MemoryRegionMap::MyAllocator> >*' -->
-            <parameter type-id='type-id-997' is-artificial='yes'/>
+            <parameter type-id='type-id-991' is-artificial='yes'/>
             <!-- parameter of type 'const MemoryRegionMap::Region&' -->
             <parameter type-id='type-id-160'/>
             <!-- typedef size_t -->
@@ -25649,7 +25258,7 @@
           <!-- void std::set<MemoryRegionMap::Region, MemoryRegionMap::RegionCmp, STL_Allocator<MemoryRegionMap::Region, MemoryRegionMap::MyAllocator> >::erase(std::_Rb_tree_const_iterator<MemoryRegionMap::Region>, std::_Rb_tree_const_iterator<MemoryRegionMap::Region>) -->
           <function-decl name='erase' mangled-name='_ZNSt3setIN15MemoryRegionMap6RegionENS0_9RegionCmpE13STL_AllocatorIS1_NS0_11MyAllocatorEEE5eraseESt23_Rb_tree_const_iteratorIS1_ES8_' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_set.h' line='505' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::set<MemoryRegionMap::Region, MemoryRegionMap::RegionCmp, STL_Allocator<MemoryRegionMap::Region, MemoryRegionMap::MyAllocator> >*' -->
-            <parameter type-id='type-id-997' is-artificial='yes'/>
+            <parameter type-id='type-id-991' is-artificial='yes'/>
             <!-- parameter of type 'struct std::_Rb_tree_const_iterator<MemoryRegionMap::Region>' -->
             <parameter type-id='type-id-175'/>
             <!-- parameter of type 'struct std::_Rb_tree_const_iterator<MemoryRegionMap::Region>' -->
@@ -25662,7 +25271,7 @@
           <!-- void std::set<MemoryRegionMap::Region, MemoryRegionMap::RegionCmp, STL_Allocator<MemoryRegionMap::Region, MemoryRegionMap::MyAllocator> >::clear() -->
           <function-decl name='clear' mangled-name='_ZNSt3setIN15MemoryRegionMap6RegionENS0_9RegionCmpE13STL_AllocatorIS1_NS0_11MyAllocatorEEE5clearEv' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_set.h' line='515' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::set<MemoryRegionMap::Region, MemoryRegionMap::RegionCmp, STL_Allocator<MemoryRegionMap::Region, MemoryRegionMap::MyAllocator> >*' -->
-            <parameter type-id='type-id-997' is-artificial='yes'/>
+            <parameter type-id='type-id-991' is-artificial='yes'/>
             <!-- void -->
             <return type-id='type-id-56'/>
           </function-decl>
@@ -25671,7 +25280,7 @@
           <!-- size_t std::set<MemoryRegionMap::Region, MemoryRegionMap::RegionCmp, STL_Allocator<MemoryRegionMap::Region, MemoryRegionMap::MyAllocator> >::count(const MemoryRegionMap::Region&) -->
           <function-decl name='count' mangled-name='_ZNKSt3setIN15MemoryRegionMap6RegionENS0_9RegionCmpE13STL_AllocatorIS1_NS0_11MyAllocatorEEE5countERKS1_' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_set.h' line='529' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const std::set<MemoryRegionMap::Region, MemoryRegionMap::RegionCmp, STL_Allocator<MemoryRegionMap::Region, MemoryRegionMap::MyAllocator> >*' -->
-            <parameter type-id='type-id-985' is-artificial='yes'/>
+            <parameter type-id='type-id-979' is-artificial='yes'/>
             <!-- parameter of type 'const MemoryRegionMap::Region&' -->
             <parameter type-id='type-id-160'/>
             <!-- typedef size_t -->
@@ -25682,7 +25291,7 @@
           <!-- std::_Rb_tree_const_iterator<MemoryRegionMap::Region> std::set<MemoryRegionMap::Region, MemoryRegionMap::RegionCmp, STL_Allocator<MemoryRegionMap::Region, MemoryRegionMap::MyAllocator> >::find(const MemoryRegionMap::Region&) -->
           <function-decl name='find' mangled-name='_ZNSt3setIN15MemoryRegionMap6RegionENS0_9RegionCmpE13STL_AllocatorIS1_NS0_11MyAllocatorEEE4findERKS1_' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_set.h' line='547' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::set<MemoryRegionMap::Region, MemoryRegionMap::RegionCmp, STL_Allocator<MemoryRegionMap::Region, MemoryRegionMap::MyAllocator> >*' -->
-            <parameter type-id='type-id-997' is-artificial='yes'/>
+            <parameter type-id='type-id-991' is-artificial='yes'/>
             <!-- parameter of type 'const MemoryRegionMap::Region&' -->
             <parameter type-id='type-id-160'/>
             <!-- struct std::_Rb_tree_const_iterator<MemoryRegionMap::Region> -->
@@ -25693,7 +25302,7 @@
           <!-- std::_Rb_tree_const_iterator<MemoryRegionMap::Region> std::set<MemoryRegionMap::Region, MemoryRegionMap::RegionCmp, STL_Allocator<MemoryRegionMap::Region, MemoryRegionMap::MyAllocator> >::find(const MemoryRegionMap::Region&) -->
           <function-decl name='find' mangled-name='_ZNKSt3setIN15MemoryRegionMap6RegionENS0_9RegionCmpE13STL_AllocatorIS1_NS0_11MyAllocatorEEE4findERKS1_' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_set.h' line='551' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const std::set<MemoryRegionMap::Region, MemoryRegionMap::RegionCmp, STL_Allocator<MemoryRegionMap::Region, MemoryRegionMap::MyAllocator> >*' -->
-            <parameter type-id='type-id-985' is-artificial='yes'/>
+            <parameter type-id='type-id-979' is-artificial='yes'/>
             <!-- parameter of type 'const MemoryRegionMap::Region&' -->
             <parameter type-id='type-id-160'/>
             <!-- struct std::_Rb_tree_const_iterator<MemoryRegionMap::Region> -->
@@ -25704,7 +25313,7 @@
           <!-- std::_Rb_tree_const_iterator<MemoryRegionMap::Region> std::set<MemoryRegionMap::Region, MemoryRegionMap::RegionCmp, STL_Allocator<MemoryRegionMap::Region, MemoryRegionMap::MyAllocator> >::lower_bound(const MemoryRegionMap::Region&) -->
           <function-decl name='lower_bound' mangled-name='_ZNSt3setIN15MemoryRegionMap6RegionENS0_9RegionCmpE13STL_AllocatorIS1_NS0_11MyAllocatorEEE11lower_boundERKS1_' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_set.h' line='568' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::set<MemoryRegionMap::Region, MemoryRegionMap::RegionCmp, STL_Allocator<MemoryRegionMap::Region, MemoryRegionMap::MyAllocator> >*' -->
-            <parameter type-id='type-id-997' is-artificial='yes'/>
+            <parameter type-id='type-id-991' is-artificial='yes'/>
             <!-- parameter of type 'const MemoryRegionMap::Region&' -->
             <parameter type-id='type-id-160'/>
             <!-- struct std::_Rb_tree_const_iterator<MemoryRegionMap::Region> -->
@@ -25715,7 +25324,7 @@
           <!-- std::_Rb_tree_const_iterator<MemoryRegionMap::Region> std::set<MemoryRegionMap::Region, MemoryRegionMap::RegionCmp, STL_Allocator<MemoryRegionMap::Region, MemoryRegionMap::MyAllocator> >::lower_bound(const MemoryRegionMap::Region&) -->
           <function-decl name='lower_bound' mangled-name='_ZNKSt3setIN15MemoryRegionMap6RegionENS0_9RegionCmpE13STL_AllocatorIS1_NS0_11MyAllocatorEEE11lower_boundERKS1_' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_set.h' line='572' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const std::set<MemoryRegionMap::Region, MemoryRegionMap::RegionCmp, STL_Allocator<MemoryRegionMap::Region, MemoryRegionMap::MyAllocator> >*' -->
-            <parameter type-id='type-id-985' is-artificial='yes'/>
+            <parameter type-id='type-id-979' is-artificial='yes'/>
             <!-- parameter of type 'const MemoryRegionMap::Region&' -->
             <parameter type-id='type-id-160'/>
             <!-- struct std::_Rb_tree_const_iterator<MemoryRegionMap::Region> -->
@@ -25726,7 +25335,7 @@
           <!-- std::_Rb_tree_const_iterator<MemoryRegionMap::Region> std::set<MemoryRegionMap::Region, MemoryRegionMap::RegionCmp, STL_Allocator<MemoryRegionMap::Region, MemoryRegionMap::MyAllocator> >::upper_bound(const MemoryRegionMap::Region&) -->
           <function-decl name='upper_bound' mangled-name='_ZNSt3setIN15MemoryRegionMap6RegionENS0_9RegionCmpE13STL_AllocatorIS1_NS0_11MyAllocatorEEE11upper_boundERKS1_' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_set.h' line='584' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::set<MemoryRegionMap::Region, MemoryRegionMap::RegionCmp, STL_Allocator<MemoryRegionMap::Region, MemoryRegionMap::MyAllocator> >*' -->
-            <parameter type-id='type-id-997' is-artificial='yes'/>
+            <parameter type-id='type-id-991' is-artificial='yes'/>
             <!-- parameter of type 'const MemoryRegionMap::Region&' -->
             <parameter type-id='type-id-160'/>
             <!-- struct std::_Rb_tree_const_iterator<MemoryRegionMap::Region> -->
@@ -25737,7 +25346,7 @@
           <!-- std::_Rb_tree_const_iterator<MemoryRegionMap::Region> std::set<MemoryRegionMap::Region, MemoryRegionMap::RegionCmp, STL_Allocator<MemoryRegionMap::Region, MemoryRegionMap::MyAllocator> >::upper_bound(const MemoryRegionMap::Region&) -->
           <function-decl name='upper_bound' mangled-name='_ZNKSt3setIN15MemoryRegionMap6RegionENS0_9RegionCmpE13STL_AllocatorIS1_NS0_11MyAllocatorEEE11upper_boundERKS1_' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_set.h' line='588' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const std::set<MemoryRegionMap::Region, MemoryRegionMap::RegionCmp, STL_Allocator<MemoryRegionMap::Region, MemoryRegionMap::MyAllocator> >*' -->
-            <parameter type-id='type-id-985' is-artificial='yes'/>
+            <parameter type-id='type-id-979' is-artificial='yes'/>
             <!-- parameter of type 'const MemoryRegionMap::Region&' -->
             <parameter type-id='type-id-160'/>
             <!-- struct std::_Rb_tree_const_iterator<MemoryRegionMap::Region> -->
@@ -25748,32 +25357,32 @@
           <!-- std::pair<std::_Rb_tree_const_iterator<MemoryRegionMap::Region>, std::_Rb_tree_const_iterator<MemoryRegionMap::Region> > std::set<MemoryRegionMap::Region, MemoryRegionMap::RegionCmp, STL_Allocator<MemoryRegionMap::Region, MemoryRegionMap::MyAllocator> >::equal_range(const MemoryRegionMap::Region&) -->
           <function-decl name='equal_range' mangled-name='_ZNSt3setIN15MemoryRegionMap6RegionENS0_9RegionCmpE13STL_AllocatorIS1_NS0_11MyAllocatorEEE11equal_rangeERKS1_' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_set.h' line='609' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::set<MemoryRegionMap::Region, MemoryRegionMap::RegionCmp, STL_Allocator<MemoryRegionMap::Region, MemoryRegionMap::MyAllocator> >*' -->
-            <parameter type-id='type-id-997' is-artificial='yes'/>
+            <parameter type-id='type-id-991' is-artificial='yes'/>
             <!-- parameter of type 'const MemoryRegionMap::Region&' -->
             <parameter type-id='type-id-160'/>
             <!-- struct std::pair<std::_Rb_tree_const_iterator<MemoryRegionMap::Region>, std::_Rb_tree_const_iterator<MemoryRegionMap::Region> > -->
-            <return type-id='type-id-1000'/>
+            <return type-id='type-id-994'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <!-- std::pair<std::_Rb_tree_const_iterator<MemoryRegionMap::Region>, std::_Rb_tree_const_iterator<MemoryRegionMap::Region> > std::set<MemoryRegionMap::Region, MemoryRegionMap::RegionCmp, STL_Allocator<MemoryRegionMap::Region, MemoryRegionMap::MyAllocator> >::equal_range(const MemoryRegionMap::Region&) -->
           <function-decl name='equal_range' mangled-name='_ZNKSt3setIN15MemoryRegionMap6RegionENS0_9RegionCmpE13STL_AllocatorIS1_NS0_11MyAllocatorEEE11equal_rangeERKS1_' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_set.h' line='613' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const std::set<MemoryRegionMap::Region, MemoryRegionMap::RegionCmp, STL_Allocator<MemoryRegionMap::Region, MemoryRegionMap::MyAllocator> >*' -->
-            <parameter type-id='type-id-985' is-artificial='yes'/>
+            <parameter type-id='type-id-979' is-artificial='yes'/>
             <!-- parameter of type 'const MemoryRegionMap::Region&' -->
             <parameter type-id='type-id-160'/>
             <!-- struct std::pair<std::_Rb_tree_const_iterator<MemoryRegionMap::Region>, std::_Rb_tree_const_iterator<MemoryRegionMap::Region> > -->
-            <return type-id='type-id-1000'/>
+            <return type-id='type-id-994'/>
           </function-decl>
         </member-function>
       </class-decl>
       <!-- class std::_Rb_tree<MemoryRegionMap::Region, MemoryRegionMap::Region, std::_Identity<MemoryRegionMap::Region>, MemoryRegionMap::RegionCmp, STL_Allocator<MemoryRegionMap::Region, MemoryRegionMap::MyAllocator> > -->
-      <class-decl name='_Rb_tree&lt;MemoryRegionMap::Region, MemoryRegionMap::Region, std::_Identity&lt;MemoryRegionMap::Region&gt;, MemoryRegionMap::RegionCmp, STL_Allocator&lt;MemoryRegionMap::Region, MemoryRegionMap::MyAllocator&gt; &gt;' size-in-bits='384' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='323' column='1' id='type-id-979'>
+      <class-decl name='_Rb_tree&lt;MemoryRegionMap::Region, MemoryRegionMap::Region, std::_Identity&lt;MemoryRegionMap::Region&gt;, MemoryRegionMap::RegionCmp, STL_Allocator&lt;MemoryRegionMap::Region, MemoryRegionMap::MyAllocator&gt; &gt;' size-in-bits='384' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='323' column='1' id='type-id-973'>
         <member-type access='protected'>
           <!-- struct std::_Rb_tree<MemoryRegionMap::Region, MemoryRegionMap::Region, std::_Identity<MemoryRegionMap::Region>, MemoryRegionMap::RegionCmp, STL_Allocator<MemoryRegionMap::Region, MemoryRegionMap::MyAllocator> >::_Rb_tree_impl<MemoryRegionMap::RegionCmp, true> -->
-          <class-decl name='_Rb_tree_impl&lt;MemoryRegionMap::RegionCmp, true&gt;' size-in-bits='384' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='427' column='1' id='type-id-990'>
+          <class-decl name='_Rb_tree_impl&lt;MemoryRegionMap::RegionCmp, true&gt;' size-in-bits='384' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='427' column='1' id='type-id-984'>
             <!-- class STL_Allocator<std::_Rb_tree_node<MemoryRegionMap::Region>, MemoryRegionMap::MyAllocator> -->
-            <base-class access='public' layout-offset-in-bits='0' type-id='type-id-961'/>
+            <base-class access='public' layout-offset-in-bits='0' type-id='type-id-955'/>
             <data-member access='public' layout-offset-in-bits='0'>
               <!-- MemoryRegionMap::RegionCmp std::_Rb_tree<MemoryRegionMap::Region, MemoryRegionMap::Region, std::_Identity<MemoryRegionMap::Region>, MemoryRegionMap::RegionCmp, STL_Allocator<MemoryRegionMap::Region, MemoryRegionMap::MyAllocator> >::_Rb_tree_impl<MemoryRegionMap::RegionCmp, true>::_M_key_compare -->
               <var-decl name='_M_key_compare' type-id='type-id-158' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='428' column='1'/>
@@ -25790,7 +25399,7 @@
               <!-- void std::_Rb_tree<MemoryRegionMap::Region, MemoryRegionMap::Region, std::_Identity<MemoryRegionMap::Region>, MemoryRegionMap::RegionCmp, STL_Allocator<MemoryRegionMap::Region, MemoryRegionMap::MyAllocator> >::_Rb_tree_impl<MemoryRegionMap::RegionCmp, true>::_Rb_tree_impl() -->
               <function-decl name='_Rb_tree_impl' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='432' column='1' visibility='default' binding='global' size-in-bits='64'>
                 <!-- implicit parameter of type 'std::_Rb_tree<MemoryRegionMap::Region, MemoryRegionMap::Region, std::_Identity<MemoryRegionMap::Region>, MemoryRegionMap::RegionCmp, STL_Allocator<MemoryRegionMap::Region, MemoryRegionMap::MyAllocator> >::_Rb_tree_impl<MemoryRegionMap::RegionCmp, true>*' -->
-                <parameter type-id='type-id-991' is-artificial='yes'/>
+                <parameter type-id='type-id-985' is-artificial='yes'/>
                 <!-- void -->
                 <return type-id='type-id-56'/>
               </function-decl>
@@ -25799,11 +25408,11 @@
               <!-- void std::_Rb_tree<MemoryRegionMap::Region, MemoryRegionMap::Region, std::_Identity<MemoryRegionMap::Region>, MemoryRegionMap::RegionCmp, STL_Allocator<MemoryRegionMap::Region, MemoryRegionMap::MyAllocator> >::_Rb_tree_impl<MemoryRegionMap::RegionCmp, true>::_Rb_tree_impl(const MemoryRegionMap::RegionCmp&, const STL_Allocator<std::_Rb_tree_node<MemoryRegionMap::Region>, MemoryRegionMap::MyAllocator>&) -->
               <function-decl name='_Rb_tree_impl' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='437' column='1' visibility='default' binding='global' size-in-bits='64'>
                 <!-- implicit parameter of type 'std::_Rb_tree<MemoryRegionMap::Region, MemoryRegionMap::Region, std::_Identity<MemoryRegionMap::Region>, MemoryRegionMap::RegionCmp, STL_Allocator<MemoryRegionMap::Region, MemoryRegionMap::MyAllocator> >::_Rb_tree_impl<MemoryRegionMap::RegionCmp, true>*' -->
-                <parameter type-id='type-id-991' is-artificial='yes'/>
+                <parameter type-id='type-id-985' is-artificial='yes'/>
                 <!-- parameter of type 'const MemoryRegionMap::RegionCmp&' -->
-                <parameter type-id='type-id-973'/>
+                <parameter type-id='type-id-967'/>
                 <!-- parameter of type 'const STL_Allocator<std::_Rb_tree_node<MemoryRegionMap::Region>, MemoryRegionMap::MyAllocator>&' -->
-                <parameter type-id='type-id-963'/>
+                <parameter type-id='type-id-957'/>
                 <!-- void -->
                 <return type-id='type-id-56'/>
               </function-decl>
@@ -25812,7 +25421,7 @@
               <!-- void std::_Rb_tree<MemoryRegionMap::Region, MemoryRegionMap::Region, std::_Identity<MemoryRegionMap::Region>, MemoryRegionMap::RegionCmp, STL_Allocator<MemoryRegionMap::Region, MemoryRegionMap::MyAllocator> >::_Rb_tree_impl<MemoryRegionMap::RegionCmp, true>::_M_initialize() -->
               <function-decl name='_M_initialize' mangled-name='_ZNSt8_Rb_treeIN15MemoryRegionMap6RegionES1_St9_IdentityIS1_ENS0_9RegionCmpE13STL_AllocatorIS1_NS0_11MyAllocatorEEE13_Rb_tree_implIS4_Lb1EE13_M_initializeEv' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='444' column='1' visibility='default' binding='global' size-in-bits='64'>
                 <!-- implicit parameter of type 'std::_Rb_tree<MemoryRegionMap::Region, MemoryRegionMap::Region, std::_Identity<MemoryRegionMap::Region>, MemoryRegionMap::RegionCmp, STL_Allocator<MemoryRegionMap::Region, MemoryRegionMap::MyAllocator> >::_Rb_tree_impl<MemoryRegionMap::RegionCmp, true>*' -->
-                <parameter type-id='type-id-991' is-artificial='yes'/>
+                <parameter type-id='type-id-985' is-artificial='yes'/>
                 <!-- void -->
                 <return type-id='type-id-56'/>
               </function-decl>
@@ -25821,40 +25430,40 @@
         </member-type>
         <data-member access='protected' layout-offset-in-bits='0'>
           <!-- std::_Rb_tree<MemoryRegionMap::Region, MemoryRegionMap::Region, std::_Identity<MemoryRegionMap::Region>, MemoryRegionMap::RegionCmp, STL_Allocator<MemoryRegionMap::Region, MemoryRegionMap::MyAllocator> >::_Rb_tree_impl<MemoryRegionMap::RegionCmp, true> std::_Rb_tree<MemoryRegionMap::Region, MemoryRegionMap::Region, std::_Identity<MemoryRegionMap::Region>, MemoryRegionMap::RegionCmp, STL_Allocator<MemoryRegionMap::Region, MemoryRegionMap::MyAllocator> >::_M_impl -->
-          <var-decl name='_M_impl' type-id='type-id-990' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='453' column='1'/>
+          <var-decl name='_M_impl' type-id='type-id-984' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='453' column='1'/>
         </data-member>
         <member-function access='private'>
           <!-- STL_Allocator<std::_Rb_tree_node<MemoryRegionMap::Region>, MemoryRegionMap::MyAllocator>& std::_Rb_tree<MemoryRegionMap::Region, MemoryRegionMap::Region, std::_Identity<MemoryRegionMap::Region>, MemoryRegionMap::RegionCmp, STL_Allocator<MemoryRegionMap::Region, MemoryRegionMap::MyAllocator> >::_M_get_Node_allocator() -->
           <function-decl name='_M_get_Node_allocator' mangled-name='_ZNSt8_Rb_treeIN15MemoryRegionMap6RegionES1_St9_IdentityIS1_ENS0_9RegionCmpE13STL_AllocatorIS1_NS0_11MyAllocatorEEE21_M_get_Node_allocatorEv' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='345' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::_Rb_tree<MemoryRegionMap::Region, MemoryRegionMap::Region, std::_Identity<MemoryRegionMap::Region>, MemoryRegionMap::RegionCmp, STL_Allocator<MemoryRegionMap::Region, MemoryRegionMap::MyAllocator> >*' -->
-            <parameter type-id='type-id-989' is-artificial='yes'/>
+            <parameter type-id='type-id-983' is-artificial='yes'/>
             <!-- STL_Allocator<std::_Rb_tree_node<MemoryRegionMap::Region>, MemoryRegionMap::MyAllocator>& -->
-            <return type-id='type-id-971'/>
+            <return type-id='type-id-965'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <!-- const STL_Allocator<std::_Rb_tree_node<MemoryRegionMap::Region>, MemoryRegionMap::MyAllocator>& std::_Rb_tree<MemoryRegionMap::Region, MemoryRegionMap::Region, std::_Identity<MemoryRegionMap::Region>, MemoryRegionMap::RegionCmp, STL_Allocator<MemoryRegionMap::Region, MemoryRegionMap::MyAllocator> >::_M_get_Node_allocator() -->
           <function-decl name='_M_get_Node_allocator' mangled-name='_ZNKSt8_Rb_treeIN15MemoryRegionMap6RegionES1_St9_IdentityIS1_ENS0_9RegionCmpE13STL_AllocatorIS1_NS0_11MyAllocatorEEE21_M_get_Node_allocatorEv' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='349' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const std::_Rb_tree<MemoryRegionMap::Region, MemoryRegionMap::Region, std::_Identity<MemoryRegionMap::Region>, MemoryRegionMap::RegionCmp, STL_Allocator<MemoryRegionMap::Region, MemoryRegionMap::MyAllocator> >*' -->
-            <parameter type-id='type-id-982' is-artificial='yes'/>
+            <parameter type-id='type-id-976' is-artificial='yes'/>
             <!-- const STL_Allocator<std::_Rb_tree_node<MemoryRegionMap::Region>, MemoryRegionMap::MyAllocator>& -->
-            <return type-id='type-id-963'/>
+            <return type-id='type-id-957'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <!-- STL_Allocator<MemoryRegionMap::Region, MemoryRegionMap::MyAllocator> std::_Rb_tree<MemoryRegionMap::Region, MemoryRegionMap::Region, std::_Identity<MemoryRegionMap::Region>, MemoryRegionMap::RegionCmp, STL_Allocator<MemoryRegionMap::Region, MemoryRegionMap::MyAllocator> >::get_allocator() -->
           <function-decl name='get_allocator' mangled-name='_ZNKSt8_Rb_treeIN15MemoryRegionMap6RegionES1_St9_IdentityIS1_ENS0_9RegionCmpE13STL_AllocatorIS1_NS0_11MyAllocatorEEE13get_allocatorEv' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='353' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const std::_Rb_tree<MemoryRegionMap::Region, MemoryRegionMap::Region, std::_Identity<MemoryRegionMap::Region>, MemoryRegionMap::RegionCmp, STL_Allocator<MemoryRegionMap::Region, MemoryRegionMap::MyAllocator> >*' -->
-            <parameter type-id='type-id-982' is-artificial='yes'/>
+            <parameter type-id='type-id-976' is-artificial='yes'/>
             <!-- class STL_Allocator<MemoryRegionMap::Region, MemoryRegionMap::MyAllocator> -->
-            <return type-id='type-id-967'/>
+            <return type-id='type-id-961'/>
           </function-decl>
         </member-function>
         <member-function access='protected'>
           <!-- std::_Rb_tree_node<MemoryRegionMap::Region>* std::_Rb_tree<MemoryRegionMap::Region, MemoryRegionMap::Region, std::_Identity<MemoryRegionMap::Region>, MemoryRegionMap::RegionCmp, STL_Allocator<MemoryRegionMap::Region, MemoryRegionMap::MyAllocator> >::_M_get_node() -->
           <function-decl name='_M_get_node' mangled-name='_ZNSt8_Rb_treeIN15MemoryRegionMap6RegionES1_St9_IdentityIS1_ENS0_9RegionCmpE13STL_AllocatorIS1_NS0_11MyAllocatorEEE11_M_get_nodeEv' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='358' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::_Rb_tree<MemoryRegionMap::Region, MemoryRegionMap::Region, std::_Identity<MemoryRegionMap::Region>, MemoryRegionMap::RegionCmp, STL_Allocator<MemoryRegionMap::Region, MemoryRegionMap::MyAllocator> >*' -->
-            <parameter type-id='type-id-989' is-artificial='yes'/>
+            <parameter type-id='type-id-983' is-artificial='yes'/>
             <!-- std::_Rb_tree_node<MemoryRegionMap::Region>* -->
             <return type-id='type-id-776'/>
           </function-decl>
@@ -25863,7 +25472,7 @@
           <!-- void std::_Rb_tree<MemoryRegionMap::Region, MemoryRegionMap::Region, std::_Identity<MemoryRegionMap::Region>, MemoryRegionMap::RegionCmp, STL_Allocator<MemoryRegionMap::Region, MemoryRegionMap::MyAllocator> >::_M_put_node(std::_Rb_tree_node<MemoryRegionMap::Region>*) -->
           <function-decl name='_M_put_node' mangled-name='_ZNSt8_Rb_treeIN15MemoryRegionMap6RegionES1_St9_IdentityIS1_ENS0_9RegionCmpE13STL_AllocatorIS1_NS0_11MyAllocatorEEE11_M_put_nodeEPSt13_Rb_tree_nodeIS1_E' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='362' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::_Rb_tree<MemoryRegionMap::Region, MemoryRegionMap::Region, std::_Identity<MemoryRegionMap::Region>, MemoryRegionMap::RegionCmp, STL_Allocator<MemoryRegionMap::Region, MemoryRegionMap::MyAllocator> >*' -->
-            <parameter type-id='type-id-989' is-artificial='yes'/>
+            <parameter type-id='type-id-983' is-artificial='yes'/>
             <!-- parameter of type 'std::_Rb_tree_node<MemoryRegionMap::Region>*' -->
             <parameter type-id='type-id-776'/>
             <!-- void -->
@@ -25874,7 +25483,7 @@
           <!-- std::_Rb_tree_node<MemoryRegionMap::Region>* std::_Rb_tree<MemoryRegionMap::Region, MemoryRegionMap::Region, std::_Identity<MemoryRegionMap::Region>, MemoryRegionMap::RegionCmp, STL_Allocator<MemoryRegionMap::Region, MemoryRegionMap::MyAllocator> >::_M_create_node(const MemoryRegionMap::Region&) -->
           <function-decl name='_M_create_node' mangled-name='_ZNSt8_Rb_treeIN15MemoryRegionMap6RegionES1_St9_IdentityIS1_ENS0_9RegionCmpE13STL_AllocatorIS1_NS0_11MyAllocatorEEE14_M_create_nodeERKS1_' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='367' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::_Rb_tree<MemoryRegionMap::Region, MemoryRegionMap::Region, std::_Identity<MemoryRegionMap::Region>, MemoryRegionMap::RegionCmp, STL_Allocator<MemoryRegionMap::Region, MemoryRegionMap::MyAllocator> >*' -->
-            <parameter type-id='type-id-989' is-artificial='yes'/>
+            <parameter type-id='type-id-983' is-artificial='yes'/>
             <!-- parameter of type 'const MemoryRegionMap::Region&' -->
             <parameter type-id='type-id-160'/>
             <!-- std::_Rb_tree_node<MemoryRegionMap::Region>* -->
@@ -25885,7 +25494,7 @@
           <!-- void std::_Rb_tree<MemoryRegionMap::Region, MemoryRegionMap::Region, std::_Identity<MemoryRegionMap::Region>, MemoryRegionMap::RegionCmp, STL_Allocator<MemoryRegionMap::Region, MemoryRegionMap::MyAllocator> >::_M_destroy_node(std::_Rb_tree_node<MemoryRegionMap::Region>*) -->
           <function-decl name='_M_destroy_node' mangled-name='_ZNSt8_Rb_treeIN15MemoryRegionMap6RegionES1_St9_IdentityIS1_ENS0_9RegionCmpE13STL_AllocatorIS1_NS0_11MyAllocatorEEE15_M_destroy_nodeEPSt13_Rb_tree_nodeIS1_E' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='381' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::_Rb_tree<MemoryRegionMap::Region, MemoryRegionMap::Region, std::_Identity<MemoryRegionMap::Region>, MemoryRegionMap::RegionCmp, STL_Allocator<MemoryRegionMap::Region, MemoryRegionMap::MyAllocator> >*' -->
-            <parameter type-id='type-id-989' is-artificial='yes'/>
+            <parameter type-id='type-id-983' is-artificial='yes'/>
             <!-- parameter of type 'std::_Rb_tree_node<MemoryRegionMap::Region>*' -->
             <parameter type-id='type-id-776'/>
             <!-- void -->
@@ -25896,7 +25505,7 @@
           <!-- std::_Rb_tree_node<MemoryRegionMap::Region>* std::_Rb_tree<MemoryRegionMap::Region, MemoryRegionMap::Region, std::_Identity<MemoryRegionMap::Region>, MemoryRegionMap::RegionCmp, STL_Allocator<MemoryRegionMap::Region, MemoryRegionMap::MyAllocator> >::_M_clone_node(const std::_Rb_tree_node<MemoryRegionMap::Region>*) -->
           <function-decl name='_M_clone_node' mangled-name='_ZNSt8_Rb_treeIN15MemoryRegionMap6RegionES1_St9_IdentityIS1_ENS0_9RegionCmpE13STL_AllocatorIS1_NS0_11MyAllocatorEEE13_M_clone_nodeEPKSt13_Rb_tree_nodeIS1_E' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='414' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::_Rb_tree<MemoryRegionMap::Region, MemoryRegionMap::Region, std::_Identity<MemoryRegionMap::Region>, MemoryRegionMap::RegionCmp, STL_Allocator<MemoryRegionMap::Region, MemoryRegionMap::MyAllocator> >*' -->
-            <parameter type-id='type-id-989' is-artificial='yes'/>
+            <parameter type-id='type-id-983' is-artificial='yes'/>
             <!-- parameter of type 'const std::_Rb_tree_node<MemoryRegionMap::Region>*' -->
             <parameter type-id='type-id-522'/>
             <!-- std::_Rb_tree_node<MemoryRegionMap::Region>* -->
@@ -25907,7 +25516,7 @@
           <!-- std::_Rb_tree_node_base*& std::_Rb_tree<MemoryRegionMap::Region, MemoryRegionMap::Region, std::_Identity<MemoryRegionMap::Region>, MemoryRegionMap::RegionCmp, STL_Allocator<MemoryRegionMap::Region, MemoryRegionMap::MyAllocator> >::_M_root() -->
           <function-decl name='_M_root' mangled-name='_ZNSt8_Rb_treeIN15MemoryRegionMap6RegionES1_St9_IdentityIS1_ENS0_9RegionCmpE13STL_AllocatorIS1_NS0_11MyAllocatorEEE7_M_rootEv' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='457' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::_Rb_tree<MemoryRegionMap::Region, MemoryRegionMap::Region, std::_Identity<MemoryRegionMap::Region>, MemoryRegionMap::RegionCmp, STL_Allocator<MemoryRegionMap::Region, MemoryRegionMap::MyAllocator> >*' -->
-            <parameter type-id='type-id-989' is-artificial='yes'/>
+            <parameter type-id='type-id-983' is-artificial='yes'/>
             <!-- std::_Rb_tree_node_base*& -->
             <return type-id='type-id-651'/>
           </function-decl>
@@ -25916,7 +25525,7 @@
           <!-- const std::_Rb_tree_node_base* std::_Rb_tree<MemoryRegionMap::Region, MemoryRegionMap::Region, std::_Identity<MemoryRegionMap::Region>, MemoryRegionMap::RegionCmp, STL_Allocator<MemoryRegionMap::Region, MemoryRegionMap::MyAllocator> >::_M_root() -->
           <function-decl name='_M_root' mangled-name='_ZNKSt8_Rb_treeIN15MemoryRegionMap6RegionES1_St9_IdentityIS1_ENS0_9RegionCmpE13STL_AllocatorIS1_NS0_11MyAllocatorEEE7_M_rootEv' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='461' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const std::_Rb_tree<MemoryRegionMap::Region, MemoryRegionMap::Region, std::_Identity<MemoryRegionMap::Region>, MemoryRegionMap::RegionCmp, STL_Allocator<MemoryRegionMap::Region, MemoryRegionMap::MyAllocator> >*' -->
-            <parameter type-id='type-id-982' is-artificial='yes'/>
+            <parameter type-id='type-id-976' is-artificial='yes'/>
             <!-- const std::_Rb_tree_node_base* -->
             <return type-id='type-id-533'/>
           </function-decl>
@@ -25925,7 +25534,7 @@
           <!-- std::_Rb_tree_node_base*& std::_Rb_tree<MemoryRegionMap::Region, MemoryRegionMap::Region, std::_Identity<MemoryRegionMap::Region>, MemoryRegionMap::RegionCmp, STL_Allocator<MemoryRegionMap::Region, MemoryRegionMap::MyAllocator> >::_M_leftmost() -->
           <function-decl name='_M_leftmost' mangled-name='_ZNSt8_Rb_treeIN15MemoryRegionMap6RegionES1_St9_IdentityIS1_ENS0_9RegionCmpE13STL_AllocatorIS1_NS0_11MyAllocatorEEE11_M_leftmostEv' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='465' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::_Rb_tree<MemoryRegionMap::Region, MemoryRegionMap::Region, std::_Identity<MemoryRegionMap::Region>, MemoryRegionMap::RegionCmp, STL_Allocator<MemoryRegionMap::Region, MemoryRegionMap::MyAllocator> >*' -->
-            <parameter type-id='type-id-989' is-artificial='yes'/>
+            <parameter type-id='type-id-983' is-artificial='yes'/>
             <!-- std::_Rb_tree_node_base*& -->
             <return type-id='type-id-651'/>
           </function-decl>
@@ -25934,7 +25543,7 @@
           <!-- const std::_Rb_tree_node_base* std::_Rb_tree<MemoryRegionMap::Region, MemoryRegionMap::Region, std::_Identity<MemoryRegionMap::Region>, MemoryRegionMap::RegionCmp, STL_Allocator<MemoryRegionMap::Region, MemoryRegionMap::MyAllocator> >::_M_leftmost() -->
           <function-decl name='_M_leftmost' mangled-name='_ZNKSt8_Rb_treeIN15MemoryRegionMap6RegionES1_St9_IdentityIS1_ENS0_9RegionCmpE13STL_AllocatorIS1_NS0_11MyAllocatorEEE11_M_leftmostEv' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='469' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const std::_Rb_tree<MemoryRegionMap::Region, MemoryRegionMap::Region, std::_Identity<MemoryRegionMap::Region>, MemoryRegionMap::RegionCmp, STL_Allocator<MemoryRegionMap::Region, MemoryRegionMap::MyAllocator> >*' -->
-            <parameter type-id='type-id-982' is-artificial='yes'/>
+            <parameter type-id='type-id-976' is-artificial='yes'/>
             <!-- const std::_Rb_tree_node_base* -->
             <return type-id='type-id-533'/>
           </function-decl>
@@ -25943,7 +25552,7 @@
           <!-- std::_Rb_tree_node_base*& std::_Rb_tree<MemoryRegionMap::Region, MemoryRegionMap::Region, std::_Identity<MemoryRegionMap::Region>, MemoryRegionMap::RegionCmp, STL_Allocator<MemoryRegionMap::Region, MemoryRegionMap::MyAllocator> >::_M_rightmost() -->
           <function-decl name='_M_rightmost' mangled-name='_ZNSt8_Rb_treeIN15MemoryRegionMap6RegionES1_St9_IdentityIS1_ENS0_9RegionCmpE13STL_AllocatorIS1_NS0_11MyAllocatorEEE12_M_rightmostEv' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='473' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::_Rb_tree<MemoryRegionMap::Region, MemoryRegionMap::Region, std::_Identity<MemoryRegionMap::Region>, MemoryRegionMap::RegionCmp, STL_Allocator<MemoryRegionMap::Region, MemoryRegionMap::MyAllocator> >*' -->
-            <parameter type-id='type-id-989' is-artificial='yes'/>
+            <parameter type-id='type-id-983' is-artificial='yes'/>
             <!-- std::_Rb_tree_node_base*& -->
             <return type-id='type-id-651'/>
           </function-decl>
@@ -25952,7 +25561,7 @@
           <!-- const std::_Rb_tree_node_base* std::_Rb_tree<MemoryRegionMap::Region, MemoryRegionMap::Region, std::_Identity<MemoryRegionMap::Region>, MemoryRegionMap::RegionCmp, STL_Allocator<MemoryRegionMap::Region, MemoryRegionMap::MyAllocator> >::_M_rightmost() -->
           <function-decl name='_M_rightmost' mangled-name='_ZNKSt8_Rb_treeIN15MemoryRegionMap6RegionES1_St9_IdentityIS1_ENS0_9RegionCmpE13STL_AllocatorIS1_NS0_11MyAllocatorEEE12_M_rightmostEv' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='477' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const std::_Rb_tree<MemoryRegionMap::Region, MemoryRegionMap::Region, std::_Identity<MemoryRegionMap::Region>, MemoryRegionMap::RegionCmp, STL_Allocator<MemoryRegionMap::Region, MemoryRegionMap::MyAllocator> >*' -->
-            <parameter type-id='type-id-982' is-artificial='yes'/>
+            <parameter type-id='type-id-976' is-artificial='yes'/>
             <!-- const std::_Rb_tree_node_base* -->
             <return type-id='type-id-533'/>
           </function-decl>
@@ -25961,7 +25570,7 @@
           <!-- std::_Rb_tree_node<MemoryRegionMap::Region>* std::_Rb_tree<MemoryRegionMap::Region, MemoryRegionMap::Region, std::_Identity<MemoryRegionMap::Region>, MemoryRegionMap::RegionCmp, STL_Allocator<MemoryRegionMap::Region, MemoryRegionMap::MyAllocator> >::_M_begin() -->
           <function-decl name='_M_begin' mangled-name='_ZNSt8_Rb_treeIN15MemoryRegionMap6RegionES1_St9_IdentityIS1_ENS0_9RegionCmpE13STL_AllocatorIS1_NS0_11MyAllocatorEEE8_M_beginEv' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='481' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::_Rb_tree<MemoryRegionMap::Region, MemoryRegionMap::Region, std::_Identity<MemoryRegionMap::Region>, MemoryRegionMap::RegionCmp, STL_Allocator<MemoryRegionMap::Region, MemoryRegionMap::MyAllocator> >*' -->
-            <parameter type-id='type-id-989' is-artificial='yes'/>
+            <parameter type-id='type-id-983' is-artificial='yes'/>
             <!-- std::_Rb_tree_node<MemoryRegionMap::Region>* -->
             <return type-id='type-id-776'/>
           </function-decl>
@@ -25970,7 +25579,7 @@
           <!-- const std::_Rb_tree_node<MemoryRegionMap::Region>* std::_Rb_tree<MemoryRegionMap::Region, MemoryRegionMap::Region, std::_Identity<MemoryRegionMap::Region>, MemoryRegionMap::RegionCmp, STL_Allocator<MemoryRegionMap::Region, MemoryRegionMap::MyAllocator> >::_M_begin() -->
           <function-decl name='_M_begin' mangled-name='_ZNKSt8_Rb_treeIN15MemoryRegionMap6RegionES1_St9_IdentityIS1_ENS0_9RegionCmpE13STL_AllocatorIS1_NS0_11MyAllocatorEEE8_M_beginEv' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='485' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const std::_Rb_tree<MemoryRegionMap::Region, MemoryRegionMap::Region, std::_Identity<MemoryRegionMap::Region>, MemoryRegionMap::RegionCmp, STL_Allocator<MemoryRegionMap::Region, MemoryRegionMap::MyAllocator> >*' -->
-            <parameter type-id='type-id-982' is-artificial='yes'/>
+            <parameter type-id='type-id-976' is-artificial='yes'/>
             <!-- const std::_Rb_tree_node<MemoryRegionMap::Region>* -->
             <return type-id='type-id-522'/>
           </function-decl>
@@ -25979,7 +25588,7 @@
           <!-- std::_Rb_tree_node<MemoryRegionMap::Region>* std::_Rb_tree<MemoryRegionMap::Region, MemoryRegionMap::Region, std::_Identity<MemoryRegionMap::Region>, MemoryRegionMap::RegionCmp, STL_Allocator<MemoryRegionMap::Region, MemoryRegionMap::MyAllocator> >::_M_end() -->
           <function-decl name='_M_end' mangled-name='_ZNSt8_Rb_treeIN15MemoryRegionMap6RegionES1_St9_IdentityIS1_ENS0_9RegionCmpE13STL_AllocatorIS1_NS0_11MyAllocatorEEE6_M_endEv' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='492' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::_Rb_tree<MemoryRegionMap::Region, MemoryRegionMap::Region, std::_Identity<MemoryRegionMap::Region>, MemoryRegionMap::RegionCmp, STL_Allocator<MemoryRegionMap::Region, MemoryRegionMap::MyAllocator> >*' -->
-            <parameter type-id='type-id-989' is-artificial='yes'/>
+            <parameter type-id='type-id-983' is-artificial='yes'/>
             <!-- std::_Rb_tree_node<MemoryRegionMap::Region>* -->
             <return type-id='type-id-776'/>
           </function-decl>
@@ -25988,7 +25597,7 @@
           <!-- const std::_Rb_tree_node<MemoryRegionMap::Region>* std::_Rb_tree<MemoryRegionMap::Region, MemoryRegionMap::Region, std::_Identity<MemoryRegionMap::Region>, MemoryRegionMap::RegionCmp, STL_Allocator<MemoryRegionMap::Region, MemoryRegionMap::MyAllocator> >::_M_end() -->
           <function-decl name='_M_end' mangled-name='_ZNKSt8_Rb_treeIN15MemoryRegionMap6RegionES1_St9_IdentityIS1_ENS0_9RegionCmpE13STL_AllocatorIS1_NS0_11MyAllocatorEEE6_M_endEv' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='496' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const std::_Rb_tree<MemoryRegionMap::Region, MemoryRegionMap::Region, std::_Identity<MemoryRegionMap::Region>, MemoryRegionMap::RegionCmp, STL_Allocator<MemoryRegionMap::Region, MemoryRegionMap::MyAllocator> >*' -->
-            <parameter type-id='type-id-982' is-artificial='yes'/>
+            <parameter type-id='type-id-976' is-artificial='yes'/>
             <!-- const std::_Rb_tree_node<MemoryRegionMap::Region>* -->
             <return type-id='type-id-522'/>
           </function-decl>
@@ -26105,7 +25714,7 @@
           <!-- std::_Rb_tree_iterator<MemoryRegionMap::Region> std::_Rb_tree<MemoryRegionMap::Region, MemoryRegionMap::Region, std::_Identity<MemoryRegionMap::Region>, MemoryRegionMap::RegionCmp, STL_Allocator<MemoryRegionMap::Region, MemoryRegionMap::MyAllocator> >::_M_insert_(const std::_Rb_tree_node_base*, const std::_Rb_tree_node_base*, const MemoryRegionMap::Region&) -->
           <function-decl name='_M_insert_' mangled-name='_ZNSt8_Rb_treeIN15MemoryRegionMap6RegionES1_St9_IdentityIS1_ENS0_9RegionCmpE13STL_AllocatorIS1_NS0_11MyAllocatorEEE10_M_insert_EPKSt18_Rb_tree_node_baseSB_RKS1_' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='874' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt8_Rb_treeIN15MemoryRegionMap6RegionES1_St9_IdentityIS1_ENS0_9RegionCmpE13STL_AllocatorIS1_NS0_11MyAllocatorEEE10_M_insert_EPKSt18_Rb_tree_node_baseSB_RKS1_'>
             <!-- implicit parameter of type 'std::_Rb_tree<MemoryRegionMap::Region, MemoryRegionMap::Region, std::_Identity<MemoryRegionMap::Region>, MemoryRegionMap::RegionCmp, STL_Allocator<MemoryRegionMap::Region, MemoryRegionMap::MyAllocator> >*' -->
-            <parameter type-id='type-id-989' is-artificial='yes'/>
+            <parameter type-id='type-id-983' is-artificial='yes'/>
             <!-- parameter of type 'const std::_Rb_tree_node_base*' -->
             <parameter type-id='type-id-533'/>
             <!-- parameter of type 'const std::_Rb_tree_node_base*' -->
@@ -26120,7 +25729,7 @@
           <!-- std::_Rb_tree_iterator<MemoryRegionMap::Region> std::_Rb_tree<MemoryRegionMap::Region, MemoryRegionMap::Region, std::_Identity<MemoryRegionMap::Region>, MemoryRegionMap::RegionCmp, STL_Allocator<MemoryRegionMap::Region, MemoryRegionMap::MyAllocator> >::_M_insert_lower(std::_Rb_tree_node_base*, std::_Rb_tree_node_base*, const MemoryRegionMap::Region&) -->
           <function-decl name='_M_insert_lower' mangled-name='_ZNSt8_Rb_treeIN15MemoryRegionMap6RegionES1_St9_IdentityIS1_ENS0_9RegionCmpE13STL_AllocatorIS1_NS0_11MyAllocatorEEE15_M_insert_lowerEPSt18_Rb_tree_node_baseSA_RKS1_' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='893' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::_Rb_tree<MemoryRegionMap::Region, MemoryRegionMap::Region, std::_Identity<MemoryRegionMap::Region>, MemoryRegionMap::RegionCmp, STL_Allocator<MemoryRegionMap::Region, MemoryRegionMap::MyAllocator> >*' -->
-            <parameter type-id='type-id-989' is-artificial='yes'/>
+            <parameter type-id='type-id-983' is-artificial='yes'/>
             <!-- parameter of type 'std::_Rb_tree_node_base*' -->
             <parameter type-id='type-id-650'/>
             <!-- parameter of type 'std::_Rb_tree_node_base*' -->
@@ -26135,7 +25744,7 @@
           <!-- std::_Rb_tree_iterator<MemoryRegionMap::Region> std::_Rb_tree<MemoryRegionMap::Region, MemoryRegionMap::Region, std::_Identity<MemoryRegionMap::Region>, MemoryRegionMap::RegionCmp, STL_Allocator<MemoryRegionMap::Region, MemoryRegionMap::MyAllocator> >::_M_insert_equal_lower(const MemoryRegionMap::Region&) -->
           <function-decl name='_M_insert_equal_lower' mangled-name='_ZNSt8_Rb_treeIN15MemoryRegionMap6RegionES1_St9_IdentityIS1_ENS0_9RegionCmpE13STL_AllocatorIS1_NS0_11MyAllocatorEEE21_M_insert_equal_lowerERKS1_' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='911' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::_Rb_tree<MemoryRegionMap::Region, MemoryRegionMap::Region, std::_Identity<MemoryRegionMap::Region>, MemoryRegionMap::RegionCmp, STL_Allocator<MemoryRegionMap::Region, MemoryRegionMap::MyAllocator> >*' -->
-            <parameter type-id='type-id-989' is-artificial='yes'/>
+            <parameter type-id='type-id-983' is-artificial='yes'/>
             <!-- parameter of type 'const MemoryRegionMap::Region&' -->
             <parameter type-id='type-id-160'/>
             <!-- struct std::_Rb_tree_iterator<MemoryRegionMap::Region> -->
@@ -26146,7 +25755,7 @@
           <!-- std::_Rb_tree_node<MemoryRegionMap::Region>* std::_Rb_tree<MemoryRegionMap::Region, MemoryRegionMap::Region, std::_Identity<MemoryRegionMap::Region>, MemoryRegionMap::RegionCmp, STL_Allocator<MemoryRegionMap::Region, MemoryRegionMap::MyAllocator> >::_M_copy(const std::_Rb_tree_node<MemoryRegionMap::Region>*, std::_Rb_tree_node<MemoryRegionMap::Region>*) -->
           <function-decl name='_M_copy' mangled-name='_ZNSt8_Rb_treeIN15MemoryRegionMap6RegionES1_St9_IdentityIS1_ENS0_9RegionCmpE13STL_AllocatorIS1_NS0_11MyAllocatorEEE7_M_copyEPKSt13_Rb_tree_nodeIS1_EPSA_' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='928' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::_Rb_tree<MemoryRegionMap::Region, MemoryRegionMap::Region, std::_Identity<MemoryRegionMap::Region>, MemoryRegionMap::RegionCmp, STL_Allocator<MemoryRegionMap::Region, MemoryRegionMap::MyAllocator> >*' -->
-            <parameter type-id='type-id-989' is-artificial='yes'/>
+            <parameter type-id='type-id-983' is-artificial='yes'/>
             <!-- parameter of type 'const std::_Rb_tree_node<MemoryRegionMap::Region>*' -->
             <parameter type-id='type-id-522'/>
             <!-- parameter of type 'std::_Rb_tree_node<MemoryRegionMap::Region>*' -->
@@ -26159,7 +25768,7 @@
           <!-- void std::_Rb_tree<MemoryRegionMap::Region, MemoryRegionMap::Region, std::_Identity<MemoryRegionMap::Region>, MemoryRegionMap::RegionCmp, STL_Allocator<MemoryRegionMap::Region, MemoryRegionMap::MyAllocator> >::_M_erase(std::_Rb_tree_node<MemoryRegionMap::Region>*) -->
           <function-decl name='_M_erase' mangled-name='_ZNSt8_Rb_treeIN15MemoryRegionMap6RegionES1_St9_IdentityIS1_ENS0_9RegionCmpE13STL_AllocatorIS1_NS0_11MyAllocatorEEE8_M_eraseEPSt13_Rb_tree_nodeIS1_E' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='964' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt8_Rb_treeIN15MemoryRegionMap6RegionES1_St9_IdentityIS1_ENS0_9RegionCmpE13STL_AllocatorIS1_NS0_11MyAllocatorEEE8_M_eraseEPSt13_Rb_tree_nodeIS1_E'>
             <!-- implicit parameter of type 'std::_Rb_tree<MemoryRegionMap::Region, MemoryRegionMap::Region, std::_Identity<MemoryRegionMap::Region>, MemoryRegionMap::RegionCmp, STL_Allocator<MemoryRegionMap::Region, MemoryRegionMap::MyAllocator> >*' -->
-            <parameter type-id='type-id-989' is-artificial='yes'/>
+            <parameter type-id='type-id-983' is-artificial='yes'/>
             <!-- parameter of type 'std::_Rb_tree_node<MemoryRegionMap::Region>*' -->
             <parameter type-id='type-id-776'/>
             <!-- void -->
@@ -26170,7 +25779,7 @@
           <!-- std::_Rb_tree_iterator<MemoryRegionMap::Region> std::_Rb_tree<MemoryRegionMap::Region, MemoryRegionMap::Region, std::_Identity<MemoryRegionMap::Region>, MemoryRegionMap::RegionCmp, STL_Allocator<MemoryRegionMap::Region, MemoryRegionMap::MyAllocator> >::_M_lower_bound(std::_Rb_tree_node<MemoryRegionMap::Region>*, std::_Rb_tree_node<MemoryRegionMap::Region>*, const MemoryRegionMap::Region&) -->
           <function-decl name='_M_lower_bound' mangled-name='_ZNSt8_Rb_treeIN15MemoryRegionMap6RegionES1_St9_IdentityIS1_ENS0_9RegionCmpE13STL_AllocatorIS1_NS0_11MyAllocatorEEE14_M_lower_boundEPSt13_Rb_tree_nodeIS1_ESB_RKS1_' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='981' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::_Rb_tree<MemoryRegionMap::Region, MemoryRegionMap::Region, std::_Identity<MemoryRegionMap::Region>, MemoryRegionMap::RegionCmp, STL_Allocator<MemoryRegionMap::Region, MemoryRegionMap::MyAllocator> >*' -->
-            <parameter type-id='type-id-989' is-artificial='yes'/>
+            <parameter type-id='type-id-983' is-artificial='yes'/>
             <!-- parameter of type 'std::_Rb_tree_node<MemoryRegionMap::Region>*' -->
             <parameter type-id='type-id-776'/>
             <!-- parameter of type 'std::_Rb_tree_node<MemoryRegionMap::Region>*' -->
@@ -26185,7 +25794,7 @@
           <!-- std::_Rb_tree_const_iterator<MemoryRegionMap::Region> std::_Rb_tree<MemoryRegionMap::Region, MemoryRegionMap::Region, std::_Identity<MemoryRegionMap::Region>, MemoryRegionMap::RegionCmp, STL_Allocator<MemoryRegionMap::Region, MemoryRegionMap::MyAllocator> >::_M_lower_bound(const std::_Rb_tree_node<MemoryRegionMap::Region>*, const std::_Rb_tree_node<MemoryRegionMap::Region>*, const MemoryRegionMap::Region&) -->
           <function-decl name='_M_lower_bound' mangled-name='_ZNKSt8_Rb_treeIN15MemoryRegionMap6RegionES1_St9_IdentityIS1_ENS0_9RegionCmpE13STL_AllocatorIS1_NS0_11MyAllocatorEEE14_M_lower_boundEPKSt13_Rb_tree_nodeIS1_ESC_RKS1_' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='997' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const std::_Rb_tree<MemoryRegionMap::Region, MemoryRegionMap::Region, std::_Identity<MemoryRegionMap::Region>, MemoryRegionMap::RegionCmp, STL_Allocator<MemoryRegionMap::Region, MemoryRegionMap::MyAllocator> >*' -->
-            <parameter type-id='type-id-982' is-artificial='yes'/>
+            <parameter type-id='type-id-976' is-artificial='yes'/>
             <!-- parameter of type 'const std::_Rb_tree_node<MemoryRegionMap::Region>*' -->
             <parameter type-id='type-id-522'/>
             <!-- parameter of type 'const std::_Rb_tree_node<MemoryRegionMap::Region>*' -->
@@ -26200,7 +25809,7 @@
           <!-- std::_Rb_tree_iterator<MemoryRegionMap::Region> std::_Rb_tree<MemoryRegionMap::Region, MemoryRegionMap::Region, std::_Identity<MemoryRegionMap::Region>, MemoryRegionMap::RegionCmp, STL_Allocator<MemoryRegionMap::Region, MemoryRegionMap::MyAllocator> >::_M_upper_bound(std::_Rb_tree_node<MemoryRegionMap::Region>*, std::_Rb_tree_node<MemoryRegionMap::Region>*, const MemoryRegionMap::Region&) -->
           <function-decl name='_M_upper_bound' mangled-name='_ZNSt8_Rb_treeIN15MemoryRegionMap6RegionES1_St9_IdentityIS1_ENS0_9RegionCmpE13STL_AllocatorIS1_NS0_11MyAllocatorEEE14_M_upper_boundEPSt13_Rb_tree_nodeIS1_ESB_RKS1_' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='1013' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::_Rb_tree<MemoryRegionMap::Region, MemoryRegionMap::Region, std::_Identity<MemoryRegionMap::Region>, MemoryRegionMap::RegionCmp, STL_Allocator<MemoryRegionMap::Region, MemoryRegionMap::MyAllocator> >*' -->
-            <parameter type-id='type-id-989' is-artificial='yes'/>
+            <parameter type-id='type-id-983' is-artificial='yes'/>
             <!-- parameter of type 'std::_Rb_tree_node<MemoryRegionMap::Region>*' -->
             <parameter type-id='type-id-776'/>
             <!-- parameter of type 'std::_Rb_tree_node<MemoryRegionMap::Region>*' -->
@@ -26215,7 +25824,7 @@
           <!-- std::_Rb_tree_const_iterator<MemoryRegionMap::Region> std::_Rb_tree<MemoryRegionMap::Region, MemoryRegionMap::Region, std::_Identity<MemoryRegionMap::Region>, MemoryRegionMap::RegionCmp, STL_Allocator<MemoryRegionMap::Region, MemoryRegionMap::MyAllocator> >::_M_upper_bound(const std::_Rb_tree_node<MemoryRegionMap::Region>*, const std::_Rb_tree_node<MemoryRegionMap::Region>*, const MemoryRegionMap::Region&) -->
           <function-decl name='_M_upper_bound' mangled-name='_ZNKSt8_Rb_treeIN15MemoryRegionMap6RegionES1_St9_IdentityIS1_ENS0_9RegionCmpE13STL_AllocatorIS1_NS0_11MyAllocatorEEE14_M_upper_boundEPKSt13_Rb_tree_nodeIS1_ESC_RKS1_' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='1029' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const std::_Rb_tree<MemoryRegionMap::Region, MemoryRegionMap::Region, std::_Identity<MemoryRegionMap::Region>, MemoryRegionMap::RegionCmp, STL_Allocator<MemoryRegionMap::Region, MemoryRegionMap::MyAllocator> >*' -->
-            <parameter type-id='type-id-982' is-artificial='yes'/>
+            <parameter type-id='type-id-976' is-artificial='yes'/>
             <!-- parameter of type 'const std::_Rb_tree_node<MemoryRegionMap::Region>*' -->
             <parameter type-id='type-id-522'/>
             <!-- parameter of type 'const std::_Rb_tree_node<MemoryRegionMap::Region>*' -->
@@ -26230,7 +25839,7 @@
           <!-- void std::_Rb_tree<MemoryRegionMap::Region, MemoryRegionMap::Region, std::_Identity<MemoryRegionMap::Region>, MemoryRegionMap::RegionCmp, STL_Allocator<MemoryRegionMap::Region, MemoryRegionMap::MyAllocator> >::_Rb_tree() -->
           <function-decl name='_Rb_tree' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='591' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::_Rb_tree<MemoryRegionMap::Region, MemoryRegionMap::Region, std::_Identity<MemoryRegionMap::Region>, MemoryRegionMap::RegionCmp, STL_Allocator<MemoryRegionMap::Region, MemoryRegionMap::MyAllocator> >*' -->
-            <parameter type-id='type-id-989' is-artificial='yes'/>
+            <parameter type-id='type-id-983' is-artificial='yes'/>
             <!-- void -->
             <return type-id='type-id-56'/>
           </function-decl>
@@ -26239,11 +25848,11 @@
           <!-- void std::_Rb_tree<MemoryRegionMap::Region, MemoryRegionMap::Region, std::_Identity<MemoryRegionMap::Region>, MemoryRegionMap::RegionCmp, STL_Allocator<MemoryRegionMap::Region, MemoryRegionMap::MyAllocator> >::_Rb_tree(const MemoryRegionMap::RegionCmp&, const STL_Allocator<MemoryRegionMap::Region, MemoryRegionMap::MyAllocator>&) -->
           <function-decl name='_Rb_tree' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='593' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::_Rb_tree<MemoryRegionMap::Region, MemoryRegionMap::Region, std::_Identity<MemoryRegionMap::Region>, MemoryRegionMap::RegionCmp, STL_Allocator<MemoryRegionMap::Region, MemoryRegionMap::MyAllocator> >*' -->
-            <parameter type-id='type-id-989' is-artificial='yes'/>
+            <parameter type-id='type-id-983' is-artificial='yes'/>
             <!-- parameter of type 'const MemoryRegionMap::RegionCmp&' -->
-            <parameter type-id='type-id-973'/>
+            <parameter type-id='type-id-967'/>
             <!-- parameter of type 'const STL_Allocator<MemoryRegionMap::Region, MemoryRegionMap::MyAllocator>&' -->
-            <parameter type-id='type-id-969'/>
+            <parameter type-id='type-id-963'/>
             <!-- void -->
             <return type-id='type-id-56'/>
           </function-decl>
@@ -26252,9 +25861,9 @@
           <!-- void std::_Rb_tree<MemoryRegionMap::Region, MemoryRegionMap::Region, std::_Identity<MemoryRegionMap::Region>, MemoryRegionMap::RegionCmp, STL_Allocator<MemoryRegionMap::Region, MemoryRegionMap::MyAllocator> >::_Rb_tree(const std::_Rb_tree<MemoryRegionMap::Region, MemoryRegionMap::Region, std::_Identity<MemoryRegionMap::Region>, MemoryRegionMap::RegionCmp, STL_Allocator<MemoryRegionMap::Region, MemoryRegionMap::MyAllocator> >&) -->
           <function-decl name='_Rb_tree' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='597' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::_Rb_tree<MemoryRegionMap::Region, MemoryRegionMap::Region, std::_Identity<MemoryRegionMap::Region>, MemoryRegionMap::RegionCmp, STL_Allocator<MemoryRegionMap::Region, MemoryRegionMap::MyAllocator> >*' -->
-            <parameter type-id='type-id-989' is-artificial='yes'/>
+            <parameter type-id='type-id-983' is-artificial='yes'/>
             <!-- parameter of type 'const std::_Rb_tree<MemoryRegionMap::Region, MemoryRegionMap::Region, std::_Identity<MemoryRegionMap::Region>, MemoryRegionMap::RegionCmp, STL_Allocator<MemoryRegionMap::Region, MemoryRegionMap::MyAllocator> >&' -->
-            <parameter type-id='type-id-981'/>
+            <parameter type-id='type-id-975'/>
             <!-- void -->
             <return type-id='type-id-56'/>
           </function-decl>
@@ -26263,7 +25872,7 @@
           <!-- std::_Rb_tree<MemoryRegionMap::Region, MemoryRegionMap::Region, std::_Identity<MemoryRegionMap::Region>, MemoryRegionMap::RegionCmp, STL_Allocator<MemoryRegionMap::Region, MemoryRegionMap::MyAllocator> >::~_Rb_tree(int) -->
           <function-decl name='~_Rb_tree' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='613' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::_Rb_tree<MemoryRegionMap::Region, MemoryRegionMap::Region, std::_Identity<MemoryRegionMap::Region>, MemoryRegionMap::RegionCmp, STL_Allocator<MemoryRegionMap::Region, MemoryRegionMap::MyAllocator> >*' -->
-            <parameter type-id='type-id-989' is-artificial='yes'/>
+            <parameter type-id='type-id-983' is-artificial='yes'/>
             <!-- artificial parameter of type 'int' -->
             <parameter type-id='type-id-1' is-artificial='yes'/>
             <!-- void -->
@@ -26274,18 +25883,18 @@
           <!-- std::_Rb_tree<MemoryRegionMap::Region, MemoryRegionMap::Region, std::_Identity<MemoryRegionMap::Region>, MemoryRegionMap::RegionCmp, STL_Allocator<MemoryRegionMap::Region, MemoryRegionMap::MyAllocator> >& std::_Rb_tree<MemoryRegionMap::Region, MemoryRegionMap::Region, std::_Identity<MemoryRegionMap::Region>, MemoryRegionMap::RegionCmp, STL_Allocator<MemoryRegionMap::Region, MemoryRegionMap::MyAllocator> >::operator=(const std::_Rb_tree<MemoryRegionMap::Region, MemoryRegionMap::Region, std::_Identity<MemoryRegionMap::Region>, MemoryRegionMap::RegionCmp, STL_Allocator<MemoryRegionMap::Region, MemoryRegionMap::MyAllocator> >&) -->
           <function-decl name='operator=' mangled-name='_ZNSt8_Rb_treeIN15MemoryRegionMap6RegionES1_St9_IdentityIS1_ENS0_9RegionCmpE13STL_AllocatorIS1_NS0_11MyAllocatorEEEaSERKS8_' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='852' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::_Rb_tree<MemoryRegionMap::Region, MemoryRegionMap::Region, std::_Identity<MemoryRegionMap::Region>, MemoryRegionMap::RegionCmp, STL_Allocator<MemoryRegionMap::Region, MemoryRegionMap::MyAllocator> >*' -->
-            <parameter type-id='type-id-989' is-artificial='yes'/>
+            <parameter type-id='type-id-983' is-artificial='yes'/>
             <!-- parameter of type 'const std::_Rb_tree<MemoryRegionMap::Region, MemoryRegionMap::Region, std::_Identity<MemoryRegionMap::Region>, MemoryRegionMap::RegionCmp, STL_Allocator<MemoryRegionMap::Region, MemoryRegionMap::MyAllocator> >&' -->
-            <parameter type-id='type-id-981'/>
+            <parameter type-id='type-id-975'/>
             <!-- std::_Rb_tree<MemoryRegionMap::Region, MemoryRegionMap::Region, std::_Identity<MemoryRegionMap::Region>, MemoryRegionMap::RegionCmp, STL_Allocator<MemoryRegionMap::Region, MemoryRegionMap::MyAllocator> >& -->
-            <return type-id='type-id-988'/>
+            <return type-id='type-id-982'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <!-- MemoryRegionMap::RegionCmp std::_Rb_tree<MemoryRegionMap::Region, MemoryRegionMap::Region, std::_Identity<MemoryRegionMap::Region>, MemoryRegionMap::RegionCmp, STL_Allocator<MemoryRegionMap::Region, MemoryRegionMap::MyAllocator> >::key_comp() -->
           <function-decl name='key_comp' mangled-name='_ZNKSt8_Rb_treeIN15MemoryRegionMap6RegionES1_St9_IdentityIS1_ENS0_9RegionCmpE13STL_AllocatorIS1_NS0_11MyAllocatorEEE8key_compEv' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='621' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const std::_Rb_tree<MemoryRegionMap::Region, MemoryRegionMap::Region, std::_Identity<MemoryRegionMap::Region>, MemoryRegionMap::RegionCmp, STL_Allocator<MemoryRegionMap::Region, MemoryRegionMap::MyAllocator> >*' -->
-            <parameter type-id='type-id-982' is-artificial='yes'/>
+            <parameter type-id='type-id-976' is-artificial='yes'/>
             <!-- struct MemoryRegionMap::RegionCmp -->
             <return type-id='type-id-158'/>
           </function-decl>
@@ -26294,7 +25903,7 @@
           <!-- std::_Rb_tree_iterator<MemoryRegionMap::Region> std::_Rb_tree<MemoryRegionMap::Region, MemoryRegionMap::Region, std::_Identity<MemoryRegionMap::Region>, MemoryRegionMap::RegionCmp, STL_Allocator<MemoryRegionMap::Region, MemoryRegionMap::MyAllocator> >::begin() -->
           <function-decl name='begin' mangled-name='_ZNSt8_Rb_treeIN15MemoryRegionMap6RegionES1_St9_IdentityIS1_ENS0_9RegionCmpE13STL_AllocatorIS1_NS0_11MyAllocatorEEE5beginEv' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='625' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::_Rb_tree<MemoryRegionMap::Region, MemoryRegionMap::Region, std::_Identity<MemoryRegionMap::Region>, MemoryRegionMap::RegionCmp, STL_Allocator<MemoryRegionMap::Region, MemoryRegionMap::MyAllocator> >*' -->
-            <parameter type-id='type-id-989' is-artificial='yes'/>
+            <parameter type-id='type-id-983' is-artificial='yes'/>
             <!-- struct std::_Rb_tree_iterator<MemoryRegionMap::Region> -->
             <return type-id='type-id-501'/>
           </function-decl>
@@ -26303,7 +25912,7 @@
           <!-- std::_Rb_tree_const_iterator<MemoryRegionMap::Region> std::_Rb_tree<MemoryRegionMap::Region, MemoryRegionMap::Region, std::_Identity<MemoryRegionMap::Region>, MemoryRegionMap::RegionCmp, STL_Allocator<MemoryRegionMap::Region, MemoryRegionMap::MyAllocator> >::begin() -->
           <function-decl name='begin' mangled-name='_ZNKSt8_Rb_treeIN15MemoryRegionMap6RegionES1_St9_IdentityIS1_ENS0_9RegionCmpE13STL_AllocatorIS1_NS0_11MyAllocatorEEE5beginEv' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='632' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const std::_Rb_tree<MemoryRegionMap::Region, MemoryRegionMap::Region, std::_Identity<MemoryRegionMap::Region>, MemoryRegionMap::RegionCmp, STL_Allocator<MemoryRegionMap::Region, MemoryRegionMap::MyAllocator> >*' -->
-            <parameter type-id='type-id-982' is-artificial='yes'/>
+            <parameter type-id='type-id-976' is-artificial='yes'/>
             <!-- struct std::_Rb_tree_const_iterator<MemoryRegionMap::Region> -->
             <return type-id='type-id-175'/>
           </function-decl>
@@ -26312,7 +25921,7 @@
           <!-- std::_Rb_tree_iterator<MemoryRegionMap::Region> std::_Rb_tree<MemoryRegionMap::Region, MemoryRegionMap::Region, std::_Identity<MemoryRegionMap::Region>, MemoryRegionMap::RegionCmp, STL_Allocator<MemoryRegionMap::Region, MemoryRegionMap::MyAllocator> >::end() -->
           <function-decl name='end' mangled-name='_ZNSt8_Rb_treeIN15MemoryRegionMap6RegionES1_St9_IdentityIS1_ENS0_9RegionCmpE13STL_AllocatorIS1_NS0_11MyAllocatorEEE3endEv' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='639' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::_Rb_tree<MemoryRegionMap::Region, MemoryRegionMap::Region, std::_Identity<MemoryRegionMap::Region>, MemoryRegionMap::RegionCmp, STL_Allocator<MemoryRegionMap::Region, MemoryRegionMap::MyAllocator> >*' -->
-            <parameter type-id='type-id-989' is-artificial='yes'/>
+            <parameter type-id='type-id-983' is-artificial='yes'/>
             <!-- struct std::_Rb_tree_iterator<MemoryRegionMap::Region> -->
             <return type-id='type-id-501'/>
           </function-decl>
@@ -26321,7 +25930,7 @@
           <!-- std::_Rb_tree_const_iterator<MemoryRegionMap::Region> std::_Rb_tree<MemoryRegionMap::Region, MemoryRegionMap::Region, std::_Identity<MemoryRegionMap::Region>, MemoryRegionMap::RegionCmp, STL_Allocator<MemoryRegionMap::Region, MemoryRegionMap::MyAllocator> >::end() -->
           <function-decl name='end' mangled-name='_ZNKSt8_Rb_treeIN15MemoryRegionMap6RegionES1_St9_IdentityIS1_ENS0_9RegionCmpE13STL_AllocatorIS1_NS0_11MyAllocatorEEE3endEv' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='643' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const std::_Rb_tree<MemoryRegionMap::Region, MemoryRegionMap::Region, std::_Identity<MemoryRegionMap::Region>, MemoryRegionMap::RegionCmp, STL_Allocator<MemoryRegionMap::Region, MemoryRegionMap::MyAllocator> >*' -->
-            <parameter type-id='type-id-982' is-artificial='yes'/>
+            <parameter type-id='type-id-976' is-artificial='yes'/>
             <!-- struct std::_Rb_tree_const_iterator<MemoryRegionMap::Region> -->
             <return type-id='type-id-175'/>
           </function-decl>
@@ -26330,43 +25939,43 @@
           <!-- std::reverse_iterator<std::_Rb_tree_iterator<MemoryRegionMap::Region> > std::_Rb_tree<MemoryRegionMap::Region, MemoryRegionMap::Region, std::_Identity<MemoryRegionMap::Region>, MemoryRegionMap::RegionCmp, STL_Allocator<MemoryRegionMap::Region, MemoryRegionMap::MyAllocator> >::rbegin() -->
           <function-decl name='rbegin' mangled-name='_ZNSt8_Rb_treeIN15MemoryRegionMap6RegionES1_St9_IdentityIS1_ENS0_9RegionCmpE13STL_AllocatorIS1_NS0_11MyAllocatorEEE6rbeginEv' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='650' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::_Rb_tree<MemoryRegionMap::Region, MemoryRegionMap::Region, std::_Identity<MemoryRegionMap::Region>, MemoryRegionMap::RegionCmp, STL_Allocator<MemoryRegionMap::Region, MemoryRegionMap::MyAllocator> >*' -->
-            <parameter type-id='type-id-989' is-artificial='yes'/>
+            <parameter type-id='type-id-983' is-artificial='yes'/>
             <!-- class std::reverse_iterator<std::_Rb_tree_iterator<MemoryRegionMap::Region> > -->
-            <return type-id='type-id-1001'/>
+            <return type-id='type-id-995'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <!-- std::reverse_iterator<std::_Rb_tree_const_iterator<MemoryRegionMap::Region> > std::_Rb_tree<MemoryRegionMap::Region, MemoryRegionMap::Region, std::_Identity<MemoryRegionMap::Region>, MemoryRegionMap::RegionCmp, STL_Allocator<MemoryRegionMap::Region, MemoryRegionMap::MyAllocator> >::rbegin() -->
           <function-decl name='rbegin' mangled-name='_ZNKSt8_Rb_treeIN15MemoryRegionMap6RegionES1_St9_IdentityIS1_ENS0_9RegionCmpE13STL_AllocatorIS1_NS0_11MyAllocatorEEE6rbeginEv' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='654' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const std::_Rb_tree<MemoryRegionMap::Region, MemoryRegionMap::Region, std::_Identity<MemoryRegionMap::Region>, MemoryRegionMap::RegionCmp, STL_Allocator<MemoryRegionMap::Region, MemoryRegionMap::MyAllocator> >*' -->
-            <parameter type-id='type-id-982' is-artificial='yes'/>
+            <parameter type-id='type-id-976' is-artificial='yes'/>
             <!-- class std::reverse_iterator<std::_Rb_tree_const_iterator<MemoryRegionMap::Region> > -->
-            <return type-id='type-id-999'/>
+            <return type-id='type-id-993'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <!-- std::reverse_iterator<std::_Rb_tree_iterator<MemoryRegionMap::Region> > std::_Rb_tree<MemoryRegionMap::Region, MemoryRegionMap::Region, std::_Identity<MemoryRegionMap::Region>, MemoryRegionMap::RegionCmp, STL_Allocator<MemoryRegionMap::Region, MemoryRegionMap::MyAllocator> >::rend() -->
           <function-decl name='rend' mangled-name='_ZNSt8_Rb_treeIN15MemoryRegionMap6RegionES1_St9_IdentityIS1_ENS0_9RegionCmpE13STL_AllocatorIS1_NS0_11MyAllocatorEEE4rendEv' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='658' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::_Rb_tree<MemoryRegionMap::Region, MemoryRegionMap::Region, std::_Identity<MemoryRegionMap::Region>, MemoryRegionMap::RegionCmp, STL_Allocator<MemoryRegionMap::Region, MemoryRegionMap::MyAllocator> >*' -->
-            <parameter type-id='type-id-989' is-artificial='yes'/>
+            <parameter type-id='type-id-983' is-artificial='yes'/>
             <!-- class std::reverse_iterator<std::_Rb_tree_iterator<MemoryRegionMap::Region> > -->
-            <return type-id='type-id-1001'/>
+            <return type-id='type-id-995'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <!-- std::reverse_iterator<std::_Rb_tree_const_iterator<MemoryRegionMap::Region> > std::_Rb_tree<MemoryRegionMap::Region, MemoryRegionMap::Region, std::_Identity<MemoryRegionMap::Region>, MemoryRegionMap::RegionCmp, STL_Allocator<MemoryRegionMap::Region, MemoryRegionMap::MyAllocator> >::rend() -->
           <function-decl name='rend' mangled-name='_ZNKSt8_Rb_treeIN15MemoryRegionMap6RegionES1_St9_IdentityIS1_ENS0_9RegionCmpE13STL_AllocatorIS1_NS0_11MyAllocatorEEE4rendEv' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='662' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const std::_Rb_tree<MemoryRegionMap::Region, MemoryRegionMap::Region, std::_Identity<MemoryRegionMap::Region>, MemoryRegionMap::RegionCmp, STL_Allocator<MemoryRegionMap::Region, MemoryRegionMap::MyAllocator> >*' -->
-            <parameter type-id='type-id-982' is-artificial='yes'/>
+            <parameter type-id='type-id-976' is-artificial='yes'/>
             <!-- class std::reverse_iterator<std::_Rb_tree_const_iterator<MemoryRegionMap::Region> > -->
-            <return type-id='type-id-999'/>
+            <return type-id='type-id-993'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <!-- bool std::_Rb_tree<MemoryRegionMap::Region, MemoryRegionMap::Region, std::_Identity<MemoryRegionMap::Region>, MemoryRegionMap::RegionCmp, STL_Allocator<MemoryRegionMap::Region, MemoryRegionMap::MyAllocator> >::empty() -->
           <function-decl name='empty' mangled-name='_ZNKSt8_Rb_treeIN15MemoryRegionMap6RegionES1_St9_IdentityIS1_ENS0_9RegionCmpE13STL_AllocatorIS1_NS0_11MyAllocatorEEE5emptyEv' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='666' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const std::_Rb_tree<MemoryRegionMap::Region, MemoryRegionMap::Region, std::_Identity<MemoryRegionMap::Region>, MemoryRegionMap::RegionCmp, STL_Allocator<MemoryRegionMap::Region, MemoryRegionMap::MyAllocator> >*' -->
-            <parameter type-id='type-id-982' is-artificial='yes'/>
+            <parameter type-id='type-id-976' is-artificial='yes'/>
             <!-- bool -->
             <return type-id='type-id-55'/>
           </function-decl>
@@ -26375,7 +25984,7 @@
           <!-- size_t std::_Rb_tree<MemoryRegionMap::Region, MemoryRegionMap::Region, std::_Identity<MemoryRegionMap::Region>, MemoryRegionMap::RegionCmp, STL_Allocator<MemoryRegionMap::Region, MemoryRegionMap::MyAllocator> >::size() -->
           <function-decl name='size' mangled-name='_ZNKSt8_Rb_treeIN15MemoryRegionMap6RegionES1_St9_IdentityIS1_ENS0_9RegionCmpE13STL_AllocatorIS1_NS0_11MyAllocatorEEE4sizeEv' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='670' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const std::_Rb_tree<MemoryRegionMap::Region, MemoryRegionMap::Region, std::_Identity<MemoryRegionMap::Region>, MemoryRegionMap::RegionCmp, STL_Allocator<MemoryRegionMap::Region, MemoryRegionMap::MyAllocator> >*' -->
-            <parameter type-id='type-id-982' is-artificial='yes'/>
+            <parameter type-id='type-id-976' is-artificial='yes'/>
             <!-- typedef size_t -->
             <return type-id='type-id-57'/>
           </function-decl>
@@ -26384,7 +25993,7 @@
           <!-- size_t std::_Rb_tree<MemoryRegionMap::Region, MemoryRegionMap::Region, std::_Identity<MemoryRegionMap::Region>, MemoryRegionMap::RegionCmp, STL_Allocator<MemoryRegionMap::Region, MemoryRegionMap::MyAllocator> >::max_size() -->
           <function-decl name='max_size' mangled-name='_ZNKSt8_Rb_treeIN15MemoryRegionMap6RegionES1_St9_IdentityIS1_ENS0_9RegionCmpE13STL_AllocatorIS1_NS0_11MyAllocatorEEE8max_sizeEv' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='674' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const std::_Rb_tree<MemoryRegionMap::Region, MemoryRegionMap::Region, std::_Identity<MemoryRegionMap::Region>, MemoryRegionMap::RegionCmp, STL_Allocator<MemoryRegionMap::Region, MemoryRegionMap::MyAllocator> >*' -->
-            <parameter type-id='type-id-982' is-artificial='yes'/>
+            <parameter type-id='type-id-976' is-artificial='yes'/>
             <!-- typedef size_t -->
             <return type-id='type-id-57'/>
           </function-decl>
@@ -26393,9 +26002,9 @@
           <!-- void std::_Rb_tree<MemoryRegionMap::Region, MemoryRegionMap::Region, std::_Identity<MemoryRegionMap::Region>, MemoryRegionMap::RegionCmp, STL_Allocator<MemoryRegionMap::Region, MemoryRegionMap::MyAllocator> >::swap(std::_Rb_tree<MemoryRegionMap::Region, MemoryRegionMap::Region, std::_Identity<MemoryRegionMap::Region>, MemoryRegionMap::RegionCmp, STL_Allocator<MemoryRegionMap::Region, MemoryRegionMap::MyAllocator> >&) -->
           <function-decl name='swap' mangled-name='_ZNSt8_Rb_treeIN15MemoryRegionMap6RegionES1_St9_IdentityIS1_ENS0_9RegionCmpE13STL_AllocatorIS1_NS0_11MyAllocatorEEE4swapERS8_' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='1106' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::_Rb_tree<MemoryRegionMap::Region, MemoryRegionMap::Region, std::_Identity<MemoryRegionMap::Region>, MemoryRegionMap::RegionCmp, STL_Allocator<MemoryRegionMap::Region, MemoryRegionMap::MyAllocator> >*' -->
-            <parameter type-id='type-id-989' is-artificial='yes'/>
+            <parameter type-id='type-id-983' is-artificial='yes'/>
             <!-- parameter of type 'std::_Rb_tree<MemoryRegionMap::Region, MemoryRegionMap::Region, std::_Identity<MemoryRegionMap::Region>, MemoryRegionMap::RegionCmp, STL_Allocator<MemoryRegionMap::Region, MemoryRegionMap::MyAllocator> >&' -->
-            <parameter type-id='type-id-988'/>
+            <parameter type-id='type-id-982'/>
             <!-- void -->
             <return type-id='type-id-56'/>
           </function-decl>
@@ -26404,18 +26013,18 @@
           <!-- std::pair<std::_Rb_tree_iterator<MemoryRegionMap::Region>, bool> std::_Rb_tree<MemoryRegionMap::Region, MemoryRegionMap::Region, std::_Identity<MemoryRegionMap::Region>, MemoryRegionMap::RegionCmp, STL_Allocator<MemoryRegionMap::Region, MemoryRegionMap::MyAllocator> >::_M_insert_unique(const MemoryRegionMap::Region&) -->
           <function-decl name='_M_insert_unique' mangled-name='_ZNSt8_Rb_treeIN15MemoryRegionMap6RegionES1_St9_IdentityIS1_ENS0_9RegionCmpE13STL_AllocatorIS1_NS0_11MyAllocatorEEE16_M_insert_uniqueERKS1_' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='1161' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::_Rb_tree<MemoryRegionMap::Region, MemoryRegionMap::Region, std::_Identity<MemoryRegionMap::Region>, MemoryRegionMap::RegionCmp, STL_Allocator<MemoryRegionMap::Region, MemoryRegionMap::MyAllocator> >*' -->
-            <parameter type-id='type-id-989' is-artificial='yes'/>
+            <parameter type-id='type-id-983' is-artificial='yes'/>
             <!-- parameter of type 'const MemoryRegionMap::Region&' -->
             <parameter type-id='type-id-160'/>
             <!-- struct std::pair<std::_Rb_tree_iterator<MemoryRegionMap::Region>, bool> -->
-            <return type-id='type-id-994'/>
+            <return type-id='type-id-988'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <!-- std::_Rb_tree_iterator<MemoryRegionMap::Region> std::_Rb_tree<MemoryRegionMap::Region, MemoryRegionMap::Region, std::_Identity<MemoryRegionMap::Region>, MemoryRegionMap::RegionCmp, STL_Allocator<MemoryRegionMap::Region, MemoryRegionMap::MyAllocator> >::_M_insert_equal(const MemoryRegionMap::Region&) -->
           <function-decl name='_M_insert_equal' mangled-name='_ZNSt8_Rb_treeIN15MemoryRegionMap6RegionES1_St9_IdentityIS1_ENS0_9RegionCmpE13STL_AllocatorIS1_NS0_11MyAllocatorEEE15_M_insert_equalERKS1_' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='1189' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::_Rb_tree<MemoryRegionMap::Region, MemoryRegionMap::Region, std::_Identity<MemoryRegionMap::Region>, MemoryRegionMap::RegionCmp, STL_Allocator<MemoryRegionMap::Region, MemoryRegionMap::MyAllocator> >*' -->
-            <parameter type-id='type-id-989' is-artificial='yes'/>
+            <parameter type-id='type-id-983' is-artificial='yes'/>
             <!-- parameter of type 'const MemoryRegionMap::Region&' -->
             <parameter type-id='type-id-160'/>
             <!-- struct std::_Rb_tree_iterator<MemoryRegionMap::Region> -->
@@ -26426,7 +26035,7 @@
           <!-- std::_Rb_tree_iterator<MemoryRegionMap::Region> std::_Rb_tree<MemoryRegionMap::Region, MemoryRegionMap::Region, std::_Identity<MemoryRegionMap::Region>, MemoryRegionMap::RegionCmp, STL_Allocator<MemoryRegionMap::Region, MemoryRegionMap::MyAllocator> >::_M_insert_unique_(std::_Rb_tree_const_iterator<MemoryRegionMap::Region>, const MemoryRegionMap::Region&) -->
           <function-decl name='_M_insert_unique_' mangled-name='_ZNSt8_Rb_treeIN15MemoryRegionMap6RegionES1_St9_IdentityIS1_ENS0_9RegionCmpE13STL_AllocatorIS1_NS0_11MyAllocatorEEE17_M_insert_unique_ESt23_Rb_tree_const_iteratorIS1_ERKS1_' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='1206' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::_Rb_tree<MemoryRegionMap::Region, MemoryRegionMap::Region, std::_Identity<MemoryRegionMap::Region>, MemoryRegionMap::RegionCmp, STL_Allocator<MemoryRegionMap::Region, MemoryRegionMap::MyAllocator> >*' -->
-            <parameter type-id='type-id-989' is-artificial='yes'/>
+            <parameter type-id='type-id-983' is-artificial='yes'/>
             <!-- parameter of type 'struct std::_Rb_tree_const_iterator<MemoryRegionMap::Region>' -->
             <parameter type-id='type-id-175'/>
             <!-- parameter of type 'const MemoryRegionMap::Region&' -->
@@ -26439,7 +26048,7 @@
           <!-- std::_Rb_tree_iterator<MemoryRegionMap::Region> std::_Rb_tree<MemoryRegionMap::Region, MemoryRegionMap::Region, std::_Identity<MemoryRegionMap::Region>, MemoryRegionMap::RegionCmp, STL_Allocator<MemoryRegionMap::Region, MemoryRegionMap::MyAllocator> >::_M_insert_equal_(std::_Rb_tree_const_iterator<MemoryRegionMap::Region>, const MemoryRegionMap::Region&) -->
           <function-decl name='_M_insert_equal_' mangled-name='_ZNSt8_Rb_treeIN15MemoryRegionMap6RegionES1_St9_IdentityIS1_ENS0_9RegionCmpE13STL_AllocatorIS1_NS0_11MyAllocatorEEE16_M_insert_equal_ESt23_Rb_tree_const_iteratorIS1_ERKS1_' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='1265' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::_Rb_tree<MemoryRegionMap::Region, MemoryRegionMap::Region, std::_Identity<MemoryRegionMap::Region>, MemoryRegionMap::RegionCmp, STL_Allocator<MemoryRegionMap::Region, MemoryRegionMap::MyAllocator> >*' -->
-            <parameter type-id='type-id-989' is-artificial='yes'/>
+            <parameter type-id='type-id-983' is-artificial='yes'/>
             <!-- parameter of type 'struct std::_Rb_tree_const_iterator<MemoryRegionMap::Region>' -->
             <parameter type-id='type-id-175'/>
             <!-- parameter of type 'const MemoryRegionMap::Region&' -->
@@ -26452,7 +26061,7 @@
           <!-- void std::_Rb_tree<MemoryRegionMap::Region, MemoryRegionMap::Region, std::_Identity<MemoryRegionMap::Region>, MemoryRegionMap::RegionCmp, STL_Allocator<MemoryRegionMap::Region, MemoryRegionMap::MyAllocator> >::erase(std::_Rb_tree_iterator<MemoryRegionMap::Region>) -->
           <function-decl name='erase' mangled-name='_ZNSt8_Rb_treeIN15MemoryRegionMap6RegionES1_St9_IdentityIS1_ENS0_9RegionCmpE13STL_AllocatorIS1_NS0_11MyAllocatorEEE5eraseESt17_Rb_tree_iteratorIS1_E' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='1341' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::_Rb_tree<MemoryRegionMap::Region, MemoryRegionMap::Region, std::_Identity<MemoryRegionMap::Region>, MemoryRegionMap::RegionCmp, STL_Allocator<MemoryRegionMap::Region, MemoryRegionMap::MyAllocator> >*' -->
-            <parameter type-id='type-id-989' is-artificial='yes'/>
+            <parameter type-id='type-id-983' is-artificial='yes'/>
             <!-- parameter of type 'struct std::_Rb_tree_iterator<MemoryRegionMap::Region>' -->
             <parameter type-id='type-id-501'/>
             <!-- void -->
@@ -26463,7 +26072,7 @@
           <!-- void std::_Rb_tree<MemoryRegionMap::Region, MemoryRegionMap::Region, std::_Identity<MemoryRegionMap::Region>, MemoryRegionMap::RegionCmp, STL_Allocator<MemoryRegionMap::Region, MemoryRegionMap::MyAllocator> >::erase(std::_Rb_tree_const_iterator<MemoryRegionMap::Region>) -->
           <function-decl name='erase' mangled-name='_ZNSt8_Rb_treeIN15MemoryRegionMap6RegionES1_St9_IdentityIS1_ENS0_9RegionCmpE13STL_AllocatorIS1_NS0_11MyAllocatorEEE5eraseESt23_Rb_tree_const_iteratorIS1_E' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='1355' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::_Rb_tree<MemoryRegionMap::Region, MemoryRegionMap::Region, std::_Identity<MemoryRegionMap::Region>, MemoryRegionMap::RegionCmp, STL_Allocator<MemoryRegionMap::Region, MemoryRegionMap::MyAllocator> >*' -->
-            <parameter type-id='type-id-989' is-artificial='yes'/>
+            <parameter type-id='type-id-983' is-artificial='yes'/>
             <!-- parameter of type 'struct std::_Rb_tree_const_iterator<MemoryRegionMap::Region>' -->
             <parameter type-id='type-id-175'/>
             <!-- void -->
@@ -26474,7 +26083,7 @@
           <!-- size_t std::_Rb_tree<MemoryRegionMap::Region, MemoryRegionMap::Region, std::_Identity<MemoryRegionMap::Region>, MemoryRegionMap::RegionCmp, STL_Allocator<MemoryRegionMap::Region, MemoryRegionMap::MyAllocator> >::erase(const MemoryRegionMap::Region&) -->
           <function-decl name='erase' mangled-name='_ZNSt8_Rb_treeIN15MemoryRegionMap6RegionES1_St9_IdentityIS1_ENS0_9RegionCmpE13STL_AllocatorIS1_NS0_11MyAllocatorEEE5eraseERKS1_' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='1369' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::_Rb_tree<MemoryRegionMap::Region, MemoryRegionMap::Region, std::_Identity<MemoryRegionMap::Region>, MemoryRegionMap::RegionCmp, STL_Allocator<MemoryRegionMap::Region, MemoryRegionMap::MyAllocator> >*' -->
-            <parameter type-id='type-id-989' is-artificial='yes'/>
+            <parameter type-id='type-id-983' is-artificial='yes'/>
             <!-- parameter of type 'const MemoryRegionMap::Region&' -->
             <parameter type-id='type-id-160'/>
             <!-- typedef size_t -->
@@ -26485,7 +26094,7 @@
           <!-- void std::_Rb_tree<MemoryRegionMap::Region, MemoryRegionMap::Region, std::_Identity<MemoryRegionMap::Region>, MemoryRegionMap::RegionCmp, STL_Allocator<MemoryRegionMap::Region, MemoryRegionMap::MyAllocator> >::erase(std::_Rb_tree_iterator<MemoryRegionMap::Region>, std::_Rb_tree_iterator<MemoryRegionMap::Region>) -->
           <function-decl name='erase' mangled-name='_ZNSt8_Rb_treeIN15MemoryRegionMap6RegionES1_St9_IdentityIS1_ENS0_9RegionCmpE13STL_AllocatorIS1_NS0_11MyAllocatorEEE5eraseESt17_Rb_tree_iteratorIS1_ESA_' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='1381' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::_Rb_tree<MemoryRegionMap::Region, MemoryRegionMap::Region, std::_Identity<MemoryRegionMap::Region>, MemoryRegionMap::RegionCmp, STL_Allocator<MemoryRegionMap::Region, MemoryRegionMap::MyAllocator> >*' -->
-            <parameter type-id='type-id-989' is-artificial='yes'/>
+            <parameter type-id='type-id-983' is-artificial='yes'/>
             <!-- parameter of type 'struct std::_Rb_tree_iterator<MemoryRegionMap::Region>' -->
             <parameter type-id='type-id-501'/>
             <!-- parameter of type 'struct std::_Rb_tree_iterator<MemoryRegionMap::Region>' -->
@@ -26498,7 +26107,7 @@
           <!-- void std::_Rb_tree<MemoryRegionMap::Region, MemoryRegionMap::Region, std::_Identity<MemoryRegionMap::Region>, MemoryRegionMap::RegionCmp, STL_Allocator<MemoryRegionMap::Region, MemoryRegionMap::MyAllocator> >::erase(std::_Rb_tree_const_iterator<MemoryRegionMap::Region>, std::_Rb_tree_const_iterator<MemoryRegionMap::Region>) -->
           <function-decl name='erase' mangled-name='_ZNSt8_Rb_treeIN15MemoryRegionMap6RegionES1_St9_IdentityIS1_ENS0_9RegionCmpE13STL_AllocatorIS1_NS0_11MyAllocatorEEE5eraseESt23_Rb_tree_const_iteratorIS1_ESA_' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='1394' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::_Rb_tree<MemoryRegionMap::Region, MemoryRegionMap::Region, std::_Identity<MemoryRegionMap::Region>, MemoryRegionMap::RegionCmp, STL_Allocator<MemoryRegionMap::Region, MemoryRegionMap::MyAllocator> >*' -->
-            <parameter type-id='type-id-989' is-artificial='yes'/>
+            <parameter type-id='type-id-983' is-artificial='yes'/>
             <!-- parameter of type 'struct std::_Rb_tree_const_iterator<MemoryRegionMap::Region>' -->
             <parameter type-id='type-id-175'/>
             <!-- parameter of type 'struct std::_Rb_tree_const_iterator<MemoryRegionMap::Region>' -->
@@ -26511,7 +26120,7 @@
           <!-- void std::_Rb_tree<MemoryRegionMap::Region, MemoryRegionMap::Region, std::_Identity<MemoryRegionMap::Region>, MemoryRegionMap::RegionCmp, STL_Allocator<MemoryRegionMap::Region, MemoryRegionMap::MyAllocator> >::erase(const MemoryRegionMap::Region*, const MemoryRegionMap::Region*) -->
           <function-decl name='erase' mangled-name='_ZNSt8_Rb_treeIN15MemoryRegionMap6RegionES1_St9_IdentityIS1_ENS0_9RegionCmpE13STL_AllocatorIS1_NS0_11MyAllocatorEEE5eraseEPKS1_SA_' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='1407' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::_Rb_tree<MemoryRegionMap::Region, MemoryRegionMap::Region, std::_Identity<MemoryRegionMap::Region>, MemoryRegionMap::RegionCmp, STL_Allocator<MemoryRegionMap::Region, MemoryRegionMap::MyAllocator> >*' -->
-            <parameter type-id='type-id-989' is-artificial='yes'/>
+            <parameter type-id='type-id-983' is-artificial='yes'/>
             <!-- parameter of type 'const MemoryRegionMap::Region*' -->
             <parameter type-id='type-id-162'/>
             <!-- parameter of type 'const MemoryRegionMap::Region*' -->
@@ -26524,7 +26133,7 @@
           <!-- void std::_Rb_tree<MemoryRegionMap::Region, MemoryRegionMap::Region, std::_Identity<MemoryRegionMap::Region>, MemoryRegionMap::RegionCmp, STL_Allocator<MemoryRegionMap::Region, MemoryRegionMap::MyAllocator> >::clear() -->
           <function-decl name='clear' mangled-name='_ZNSt8_Rb_treeIN15MemoryRegionMap6RegionES1_St9_IdentityIS1_ENS0_9RegionCmpE13STL_AllocatorIS1_NS0_11MyAllocatorEEE5clearEv' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='724' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::_Rb_tree<MemoryRegionMap::Region, MemoryRegionMap::Region, std::_Identity<MemoryRegionMap::Region>, MemoryRegionMap::RegionCmp, STL_Allocator<MemoryRegionMap::Region, MemoryRegionMap::MyAllocator> >*' -->
-            <parameter type-id='type-id-989' is-artificial='yes'/>
+            <parameter type-id='type-id-983' is-artificial='yes'/>
             <!-- void -->
             <return type-id='type-id-56'/>
           </function-decl>
@@ -26533,7 +26142,7 @@
           <!-- std::_Rb_tree_iterator<MemoryRegionMap::Region> std::_Rb_tree<MemoryRegionMap::Region, MemoryRegionMap::Region, std::_Identity<MemoryRegionMap::Region>, MemoryRegionMap::RegionCmp, STL_Allocator<MemoryRegionMap::Region, MemoryRegionMap::MyAllocator> >::find(const MemoryRegionMap::Region&) -->
           <function-decl name='find' mangled-name='_ZNSt8_Rb_treeIN15MemoryRegionMap6RegionES1_St9_IdentityIS1_ENS0_9RegionCmpE13STL_AllocatorIS1_NS0_11MyAllocatorEEE4findERKS1_' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='1418' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::_Rb_tree<MemoryRegionMap::Region, MemoryRegionMap::Region, std::_Identity<MemoryRegionMap::Region>, MemoryRegionMap::RegionCmp, STL_Allocator<MemoryRegionMap::Region, MemoryRegionMap::MyAllocator> >*' -->
-            <parameter type-id='type-id-989' is-artificial='yes'/>
+            <parameter type-id='type-id-983' is-artificial='yes'/>
             <!-- parameter of type 'const MemoryRegionMap::Region&' -->
             <parameter type-id='type-id-160'/>
             <!-- struct std::_Rb_tree_iterator<MemoryRegionMap::Region> -->
@@ -26544,7 +26153,7 @@
           <!-- std::_Rb_tree_const_iterator<MemoryRegionMap::Region> std::_Rb_tree<MemoryRegionMap::Region, MemoryRegionMap::Region, std::_Identity<MemoryRegionMap::Region>, MemoryRegionMap::RegionCmp, STL_Allocator<MemoryRegionMap::Region, MemoryRegionMap::MyAllocator> >::find(const MemoryRegionMap::Region&) -->
           <function-decl name='find' mangled-name='_ZNKSt8_Rb_treeIN15MemoryRegionMap6RegionES1_St9_IdentityIS1_ENS0_9RegionCmpE13STL_AllocatorIS1_NS0_11MyAllocatorEEE4findERKS1_' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='1431' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const std::_Rb_tree<MemoryRegionMap::Region, MemoryRegionMap::Region, std::_Identity<MemoryRegionMap::Region>, MemoryRegionMap::RegionCmp, STL_Allocator<MemoryRegionMap::Region, MemoryRegionMap::MyAllocator> >*' -->
-            <parameter type-id='type-id-982' is-artificial='yes'/>
+            <parameter type-id='type-id-976' is-artificial='yes'/>
             <!-- parameter of type 'const MemoryRegionMap::Region&' -->
             <parameter type-id='type-id-160'/>
             <!-- struct std::_Rb_tree_const_iterator<MemoryRegionMap::Region> -->
@@ -26555,7 +26164,7 @@
           <!-- size_t std::_Rb_tree<MemoryRegionMap::Region, MemoryRegionMap::Region, std::_Identity<MemoryRegionMap::Region>, MemoryRegionMap::RegionCmp, STL_Allocator<MemoryRegionMap::Region, MemoryRegionMap::MyAllocator> >::count(const MemoryRegionMap::Region&) -->
           <function-decl name='count' mangled-name='_ZNKSt8_Rb_treeIN15MemoryRegionMap6RegionES1_St9_IdentityIS1_ENS0_9RegionCmpE13STL_AllocatorIS1_NS0_11MyAllocatorEEE5countERKS1_' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='1443' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const std::_Rb_tree<MemoryRegionMap::Region, MemoryRegionMap::Region, std::_Identity<MemoryRegionMap::Region>, MemoryRegionMap::RegionCmp, STL_Allocator<MemoryRegionMap::Region, MemoryRegionMap::MyAllocator> >*' -->
-            <parameter type-id='type-id-982' is-artificial='yes'/>
+            <parameter type-id='type-id-976' is-artificial='yes'/>
             <!-- parameter of type 'const MemoryRegionMap::Region&' -->
             <parameter type-id='type-id-160'/>
             <!-- typedef size_t -->
@@ -26566,7 +26175,7 @@
           <!-- std::_Rb_tree_iterator<MemoryRegionMap::Region> std::_Rb_tree<MemoryRegionMap::Region, MemoryRegionMap::Region, std::_Identity<MemoryRegionMap::Region>, MemoryRegionMap::RegionCmp, STL_Allocator<MemoryRegionMap::Region, MemoryRegionMap::MyAllocator> >::lower_bound(const MemoryRegionMap::Region&) -->
           <function-decl name='lower_bound' mangled-name='_ZNSt8_Rb_treeIN15MemoryRegionMap6RegionES1_St9_IdentityIS1_ENS0_9RegionCmpE13STL_AllocatorIS1_NS0_11MyAllocatorEEE11lower_boundERKS1_' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='744' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::_Rb_tree<MemoryRegionMap::Region, MemoryRegionMap::Region, std::_Identity<MemoryRegionMap::Region>, MemoryRegionMap::RegionCmp, STL_Allocator<MemoryRegionMap::Region, MemoryRegionMap::MyAllocator> >*' -->
-            <parameter type-id='type-id-989' is-artificial='yes'/>
+            <parameter type-id='type-id-983' is-artificial='yes'/>
             <!-- parameter of type 'const MemoryRegionMap::Region&' -->
             <parameter type-id='type-id-160'/>
             <!-- struct std::_Rb_tree_iterator<MemoryRegionMap::Region> -->
@@ -26577,7 +26186,7 @@
           <!-- std::_Rb_tree_const_iterator<MemoryRegionMap::Region> std::_Rb_tree<MemoryRegionMap::Region, MemoryRegionMap::Region, std::_Identity<MemoryRegionMap::Region>, MemoryRegionMap::RegionCmp, STL_Allocator<MemoryRegionMap::Region, MemoryRegionMap::MyAllocator> >::lower_bound(const MemoryRegionMap::Region&) -->
           <function-decl name='lower_bound' mangled-name='_ZNKSt8_Rb_treeIN15MemoryRegionMap6RegionES1_St9_IdentityIS1_ENS0_9RegionCmpE13STL_AllocatorIS1_NS0_11MyAllocatorEEE11lower_boundERKS1_' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='748' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const std::_Rb_tree<MemoryRegionMap::Region, MemoryRegionMap::Region, std::_Identity<MemoryRegionMap::Region>, MemoryRegionMap::RegionCmp, STL_Allocator<MemoryRegionMap::Region, MemoryRegionMap::MyAllocator> >*' -->
-            <parameter type-id='type-id-982' is-artificial='yes'/>
+            <parameter type-id='type-id-976' is-artificial='yes'/>
             <!-- parameter of type 'const MemoryRegionMap::Region&' -->
             <parameter type-id='type-id-160'/>
             <!-- struct std::_Rb_tree_const_iterator<MemoryRegionMap::Region> -->
@@ -26588,7 +26197,7 @@
           <!-- std::_Rb_tree_iterator<MemoryRegionMap::Region> std::_Rb_tree<MemoryRegionMap::Region, MemoryRegionMap::Region, std::_Identity<MemoryRegionMap::Region>, MemoryRegionMap::RegionCmp, STL_Allocator<MemoryRegionMap::Region, MemoryRegionMap::MyAllocator> >::upper_bound(const MemoryRegionMap::Region&) -->
           <function-decl name='upper_bound' mangled-name='_ZNSt8_Rb_treeIN15MemoryRegionMap6RegionES1_St9_IdentityIS1_ENS0_9RegionCmpE13STL_AllocatorIS1_NS0_11MyAllocatorEEE11upper_boundERKS1_' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='752' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::_Rb_tree<MemoryRegionMap::Region, MemoryRegionMap::Region, std::_Identity<MemoryRegionMap::Region>, MemoryRegionMap::RegionCmp, STL_Allocator<MemoryRegionMap::Region, MemoryRegionMap::MyAllocator> >*' -->
-            <parameter type-id='type-id-989' is-artificial='yes'/>
+            <parameter type-id='type-id-983' is-artificial='yes'/>
             <!-- parameter of type 'const MemoryRegionMap::Region&' -->
             <parameter type-id='type-id-160'/>
             <!-- struct std::_Rb_tree_iterator<MemoryRegionMap::Region> -->
@@ -26599,7 +26208,7 @@
           <!-- std::_Rb_tree_const_iterator<MemoryRegionMap::Region> std::_Rb_tree<MemoryRegionMap::Region, MemoryRegionMap::Region, std::_Identity<MemoryRegionMap::Region>, MemoryRegionMap::RegionCmp, STL_Allocator<MemoryRegionMap::Region, MemoryRegionMap::MyAllocator> >::upper_bound(const MemoryRegionMap::Region&) -->
           <function-decl name='upper_bound' mangled-name='_ZNKSt8_Rb_treeIN15MemoryRegionMap6RegionES1_St9_IdentityIS1_ENS0_9RegionCmpE13STL_AllocatorIS1_NS0_11MyAllocatorEEE11upper_boundERKS1_' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='756' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const std::_Rb_tree<MemoryRegionMap::Region, MemoryRegionMap::Region, std::_Identity<MemoryRegionMap::Region>, MemoryRegionMap::RegionCmp, STL_Allocator<MemoryRegionMap::Region, MemoryRegionMap::MyAllocator> >*' -->
-            <parameter type-id='type-id-982' is-artificial='yes'/>
+            <parameter type-id='type-id-976' is-artificial='yes'/>
             <!-- parameter of type 'const MemoryRegionMap::Region&' -->
             <parameter type-id='type-id-160'/>
             <!-- struct std::_Rb_tree_const_iterator<MemoryRegionMap::Region> -->
@@ -26610,40 +26219,40 @@
           <!-- std::pair<std::_Rb_tree_iterator<MemoryRegionMap::Region>, std::_Rb_tree_iterator<MemoryRegionMap::Region> > std::_Rb_tree<MemoryRegionMap::Region, MemoryRegionMap::Region, std::_Identity<MemoryRegionMap::Region>, MemoryRegionMap::RegionCmp, STL_Allocator<MemoryRegionMap::Region, MemoryRegionMap::MyAllocator> >::equal_range(const MemoryRegionMap::Region&) -->
           <function-decl name='equal_range' mangled-name='_ZNSt8_Rb_treeIN15MemoryRegionMap6RegionES1_St9_IdentityIS1_ENS0_9RegionCmpE13STL_AllocatorIS1_NS0_11MyAllocatorEEE11equal_rangeERKS1_' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='1047' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::_Rb_tree<MemoryRegionMap::Region, MemoryRegionMap::Region, std::_Identity<MemoryRegionMap::Region>, MemoryRegionMap::RegionCmp, STL_Allocator<MemoryRegionMap::Region, MemoryRegionMap::MyAllocator> >*' -->
-            <parameter type-id='type-id-989' is-artificial='yes'/>
+            <parameter type-id='type-id-983' is-artificial='yes'/>
             <!-- parameter of type 'const MemoryRegionMap::Region&' -->
             <parameter type-id='type-id-160'/>
             <!-- struct std::pair<std::_Rb_tree_iterator<MemoryRegionMap::Region>, std::_Rb_tree_iterator<MemoryRegionMap::Region> > -->
-            <return type-id='type-id-1002'/>
+            <return type-id='type-id-996'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <!-- std::pair<std::_Rb_tree_const_iterator<MemoryRegionMap::Region>, std::_Rb_tree_const_iterator<MemoryRegionMap::Region> > std::_Rb_tree<MemoryRegionMap::Region, MemoryRegionMap::Region, std::_Identity<MemoryRegionMap::Region>, MemoryRegionMap::RegionCmp, STL_Allocator<MemoryRegionMap::Region, MemoryRegionMap::MyAllocator> >::equal_range(const MemoryRegionMap::Region&) -->
           <function-decl name='equal_range' mangled-name='_ZNKSt8_Rb_treeIN15MemoryRegionMap6RegionES1_St9_IdentityIS1_ENS0_9RegionCmpE13STL_AllocatorIS1_NS0_11MyAllocatorEEE11equal_rangeERKS1_' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='1078' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const std::_Rb_tree<MemoryRegionMap::Region, MemoryRegionMap::Region, std::_Identity<MemoryRegionMap::Region>, MemoryRegionMap::RegionCmp, STL_Allocator<MemoryRegionMap::Region, MemoryRegionMap::MyAllocator> >*' -->
-            <parameter type-id='type-id-982' is-artificial='yes'/>
+            <parameter type-id='type-id-976' is-artificial='yes'/>
             <!-- parameter of type 'const MemoryRegionMap::Region&' -->
             <parameter type-id='type-id-160'/>
             <!-- struct std::pair<std::_Rb_tree_const_iterator<MemoryRegionMap::Region>, std::_Rb_tree_const_iterator<MemoryRegionMap::Region> > -->
-            <return type-id='type-id-1000'/>
+            <return type-id='type-id-994'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <!-- bool std::_Rb_tree<MemoryRegionMap::Region, MemoryRegionMap::Region, std::_Identity<MemoryRegionMap::Region>, MemoryRegionMap::RegionCmp, STL_Allocator<MemoryRegionMap::Region, MemoryRegionMap::MyAllocator> >::__rb_verify() -->
           <function-decl name='__rb_verify' mangled-name='_ZNKSt8_Rb_treeIN15MemoryRegionMap6RegionES1_St9_IdentityIS1_ENS0_9RegionCmpE13STL_AllocatorIS1_NS0_11MyAllocatorEEE11__rb_verifyEv' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='1458' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const std::_Rb_tree<MemoryRegionMap::Region, MemoryRegionMap::Region, std::_Identity<MemoryRegionMap::Region>, MemoryRegionMap::RegionCmp, STL_Allocator<MemoryRegionMap::Region, MemoryRegionMap::MyAllocator> >*' -->
-            <parameter type-id='type-id-982' is-artificial='yes'/>
+            <parameter type-id='type-id-976' is-artificial='yes'/>
             <!-- bool -->
             <return type-id='type-id-55'/>
           </function-decl>
         </member-function>
       </class-decl>
       <!-- class std::reverse_iterator<std::_Rb_tree_iterator<MemoryRegionMap::Region> > -->
-      <class-decl name='reverse_iterator&lt;std::_Rb_tree_iterator&lt;MemoryRegionMap::Region&gt; &gt;' visibility='default' is-declaration-only='yes' id='type-id-1001'/>
+      <class-decl name='reverse_iterator&lt;std::_Rb_tree_iterator&lt;MemoryRegionMap::Region&gt; &gt;' visibility='default' is-declaration-only='yes' id='type-id-995'/>
       <!-- class std::reverse_iterator<std::_Rb_tree_const_iterator<MemoryRegionMap::Region> > -->
-      <class-decl name='reverse_iterator&lt;std::_Rb_tree_const_iterator&lt;MemoryRegionMap::Region&gt; &gt;' visibility='default' is-declaration-only='yes' id='type-id-999'/>
+      <class-decl name='reverse_iterator&lt;std::_Rb_tree_const_iterator&lt;MemoryRegionMap::Region&gt; &gt;' visibility='default' is-declaration-only='yes' id='type-id-993'/>
       <!-- struct std::pair<std::_Rb_tree_iterator<MemoryRegionMap::Region>, bool> -->
-      <class-decl name='pair&lt;std::_Rb_tree_iterator&lt;MemoryRegionMap::Region&gt;, bool&gt;' size-in-bits='128' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_pair.h' line='68' column='1' id='type-id-994'>
+      <class-decl name='pair&lt;std::_Rb_tree_iterator&lt;MemoryRegionMap::Region&gt;, bool&gt;' size-in-bits='128' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_pair.h' line='68' column='1' id='type-id-988'>
         <data-member access='public' layout-offset-in-bits='0'>
           <!-- std::_Rb_tree_iterator<MemoryRegionMap::Region> std::pair<std::_Rb_tree_iterator<MemoryRegionMap::Region>, bool>::first -->
           <var-decl name='first' type-id='type-id-501' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_pair.h' line='72' column='1'/>
@@ -26656,7 +26265,7 @@
           <!-- void std::pair<std::_Rb_tree_iterator<MemoryRegionMap::Region>, bool>::pair() -->
           <function-decl name='pair' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_pair.h' line='79' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::pair<std::_Rb_tree_iterator<MemoryRegionMap::Region>, bool>*' -->
-            <parameter type-id='type-id-995' is-artificial='yes'/>
+            <parameter type-id='type-id-989' is-artificial='yes'/>
             <!-- void -->
             <return type-id='type-id-56'/>
           </function-decl>
@@ -26665,7 +26274,7 @@
           <!-- void std::pair<std::_Rb_tree_iterator<MemoryRegionMap::Region>, bool>::pair(const std::_Rb_tree_iterator<MemoryRegionMap::Region>&, const bool&) -->
           <function-decl name='pair' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_pair.h' line='83' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::pair<std::_Rb_tree_iterator<MemoryRegionMap::Region>, bool>*' -->
-            <parameter type-id='type-id-995' is-artificial='yes'/>
+            <parameter type-id='type-id-989' is-artificial='yes'/>
             <!-- parameter of type 'const std::_Rb_tree_iterator<MemoryRegionMap::Region>&' -->
             <parameter type-id='type-id-503'/>
             <!-- parameter of type 'const bool&' -->
@@ -26676,11 +26285,11 @@
         </member-function>
       </class-decl>
       <!-- struct std::pair<std::_Rb_tree_iterator<MemoryRegionMap::Region>, std::_Rb_tree_iterator<MemoryRegionMap::Region> > -->
-      <class-decl name='pair&lt;std::_Rb_tree_iterator&lt;MemoryRegionMap::Region&gt;, std::_Rb_tree_iterator&lt;MemoryRegionMap::Region&gt; &gt;' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-1002'/>
+      <class-decl name='pair&lt;std::_Rb_tree_iterator&lt;MemoryRegionMap::Region&gt;, std::_Rb_tree_iterator&lt;MemoryRegionMap::Region&gt; &gt;' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-996'/>
       <!-- struct std::pair<std::_Rb_tree_const_iterator<MemoryRegionMap::Region>, std::_Rb_tree_const_iterator<MemoryRegionMap::Region> > -->
-      <class-decl name='pair&lt;std::_Rb_tree_const_iterator&lt;MemoryRegionMap::Region&gt;, std::_Rb_tree_const_iterator&lt;MemoryRegionMap::Region&gt; &gt;' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-1000'/>
+      <class-decl name='pair&lt;std::_Rb_tree_const_iterator&lt;MemoryRegionMap::Region&gt;, std::_Rb_tree_const_iterator&lt;MemoryRegionMap::Region&gt; &gt;' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-994'/>
       <!-- struct std::pair<std::_Rb_tree_const_iterator<MemoryRegionMap::Region>, bool> -->
-      <class-decl name='pair&lt;std::_Rb_tree_const_iterator&lt;MemoryRegionMap::Region&gt;, bool&gt;' size-in-bits='128' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_pair.h' line='68' column='1' id='type-id-992'>
+      <class-decl name='pair&lt;std::_Rb_tree_const_iterator&lt;MemoryRegionMap::Region&gt;, bool&gt;' size-in-bits='128' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_pair.h' line='68' column='1' id='type-id-986'>
         <data-member access='public' layout-offset-in-bits='0'>
           <!-- std::_Rb_tree_const_iterator<MemoryRegionMap::Region> std::pair<std::_Rb_tree_const_iterator<MemoryRegionMap::Region>, bool>::first -->
           <var-decl name='first' type-id='type-id-175' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_pair.h' line='72' column='1'/>
@@ -26693,7 +26302,7 @@
           <!-- void std::pair<std::_Rb_tree_const_iterator<MemoryRegionMap::Region>, bool>::pair() -->
           <function-decl name='pair' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_pair.h' line='79' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::pair<std::_Rb_tree_const_iterator<MemoryRegionMap::Region>, bool>*' -->
-            <parameter type-id='type-id-993' is-artificial='yes'/>
+            <parameter type-id='type-id-987' is-artificial='yes'/>
             <!-- void -->
             <return type-id='type-id-56'/>
           </function-decl>
@@ -26702,7 +26311,7 @@
           <!-- void std::pair<std::_Rb_tree_const_iterator<MemoryRegionMap::Region>, bool>::pair(const std::_Rb_tree_const_iterator<MemoryRegionMap::Region>&, const bool&) -->
           <function-decl name='pair' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_pair.h' line='83' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::pair<std::_Rb_tree_const_iterator<MemoryRegionMap::Region>, bool>*' -->
-            <parameter type-id='type-id-993' is-artificial='yes'/>
+            <parameter type-id='type-id-987' is-artificial='yes'/>
             <!-- parameter of type 'const std::_Rb_tree_const_iterator<MemoryRegionMap::Region>&' -->
             <parameter type-id='type-id-483'/>
             <!-- parameter of type 'const bool&' -->
@@ -26713,14 +26322,14 @@
         </member-function>
       </class-decl>
       <!-- struct std::_Identity<MemoryRegionMap::Region> -->
-      <class-decl name='_Identity&lt;MemoryRegionMap::Region&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_function.h' line='469' column='1' id='type-id-976'>
+      <class-decl name='_Identity&lt;MemoryRegionMap::Region&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_function.h' line='469' column='1' id='type-id-970'>
         <!-- struct std::unary_function<MemoryRegionMap::Region, MemoryRegionMap::Region> -->
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1003'/>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-997'/>
         <member-function access='public'>
           <!-- MemoryRegionMap::Region& std::_Identity<MemoryRegionMap::Region>::operator()(MemoryRegionMap::Region&) -->
           <function-decl name='operator()' mangled-name='_ZNKSt9_IdentityIN15MemoryRegionMap6RegionEEclERS1_' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_function.h' line='471' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const std::_Identity<MemoryRegionMap::Region>*' -->
-            <parameter type-id='type-id-978' is-artificial='yes'/>
+            <parameter type-id='type-id-972' is-artificial='yes'/>
             <!-- parameter of type 'MemoryRegionMap::Region&' -->
             <parameter type-id='type-id-778'/>
             <!-- MemoryRegionMap::Region& -->
@@ -26731,7 +26340,7 @@
           <!-- const MemoryRegionMap::Region& std::_Identity<MemoryRegionMap::Region>::operator()(const MemoryRegionMap::Region&) -->
           <function-decl name='operator()' mangled-name='_ZNKSt9_IdentityIN15MemoryRegionMap6RegionEEclERKS1_' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_function.h' line='475' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const std::_Identity<MemoryRegionMap::Region>*' -->
-            <parameter type-id='type-id-978' is-artificial='yes'/>
+            <parameter type-id='type-id-972' is-artificial='yes'/>
             <!-- parameter of type 'const MemoryRegionMap::Region&' -->
             <parameter type-id='type-id-160'/>
             <!-- const MemoryRegionMap::Region& -->
@@ -26740,9 +26349,9 @@
         </member-function>
       </class-decl>
       <!-- struct std::unary_function<MemoryRegionMap::Region, MemoryRegionMap::Region> -->
-      <class-decl name='unary_function&lt;MemoryRegionMap::Region, MemoryRegionMap::Region&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_function.h' line='101' column='1' id='type-id-1003'/>
+      <class-decl name='unary_function&lt;MemoryRegionMap::Region, MemoryRegionMap::Region&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_function.h' line='101' column='1' id='type-id-997'/>
       <!-- struct std::__miter_base<const void**, false> -->
-      <class-decl name='__miter_base&lt;const void**, false&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_algobase.h' line='285' column='1' id='type-id-1004'>
+      <class-decl name='__miter_base&lt;const void**, false&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_algobase.h' line='285' column='1' id='type-id-998'>
         <member-function access='public' static='yes'>
           <!-- void** std::__miter_base<const void**, false>::__b() -->
           <function-decl name='__b' mangled-name='_ZNSt12__miter_baseIPPKvLb0EE3__bES2_' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_algobase.h' line='287' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -26768,7 +26377,7 @@
       </namespace-decl>
     </namespace-decl>
     <!-- void (const MemoryRegionMap::Region&) -->
-    <function-type size-in-bits='64' id='type-id-998'>
+    <function-type size-in-bits='64' id='type-id-992'>
       <!-- parameter of type 'const MemoryRegionMap::Region&' -->
       <parameter type-id='type-id-160'/>
       <!-- void -->
@@ -26808,34 +26417,34 @@
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='src/profile-handler.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-kFgaKP/gperftools-2.4' language='LANG_C_plus_plus'>
     <!-- typedef void (int, siginfo_t*, void*, void*)* ProfileHandlerCallback -->
-    <typedef-decl name='ProfileHandlerCallback' type-id='type-id-1005' filepath='src/profile-handler.h' line='95' column='1' id='type-id-1006'/>
+    <typedef-decl name='ProfileHandlerCallback' type-id='type-id-999' filepath='src/profile-handler.h' line='95' column='1' id='type-id-1000'/>
     <!-- struct timer_id_holder -->
-    <class-decl name='timer_id_holder' size-in-bits='64' is-struct='yes' visibility='default' filepath='src/profile-handler.cc' line='266' column='1' id='type-id-1007'>
+    <class-decl name='timer_id_holder' size-in-bits='64' is-struct='yes' visibility='default' filepath='src/profile-handler.cc' line='266' column='1' id='type-id-1001'>
       <data-member access='public' layout-offset-in-bits='0'>
         <!-- timer_t timer_id_holder::timerid -->
-        <var-decl name='timerid' type-id='type-id-1008' visibility='default' filepath='src/profile-handler.cc' line='267' column='1'/>
+        <var-decl name='timerid' type-id='type-id-1002' visibility='default' filepath='src/profile-handler.cc' line='267' column='1'/>
       </data-member>
       <member-function access='public' constructor='yes'>
         <!-- timer_id_holder::timer_id_holder(timer_t) -->
         <function-decl name='timer_id_holder' filepath='src/profile-handler.cc' line='268' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'timer_id_holder*' -->
-          <parameter type-id='type-id-1009' is-artificial='yes'/>
+          <parameter type-id='type-id-1003' is-artificial='yes'/>
           <!-- parameter of type 'typedef timer_t' -->
-          <parameter type-id='type-id-1008'/>
+          <parameter type-id='type-id-1002'/>
           <!-- void -->
           <return type-id='type-id-56'/>
         </function-decl>
       </member-function>
     </class-decl>
     <!-- typedef __timer_t timer_t -->
-    <typedef-decl name='timer_t' type-id='type-id-1010' filepath='/usr/include/time.h' line='104' column='1' id='type-id-1008'/>
+    <typedef-decl name='timer_t' type-id='type-id-1004' filepath='/usr/include/time.h' line='104' column='1' id='type-id-1002'/>
     <!-- typedef void* __timer_t -->
-    <typedef-decl name='__timer_t' type-id='type-id-53' filepath='/usr/include/bits/types.h' line='161' column='1' id='type-id-1010'/>
+    <typedef-decl name='__timer_t' type-id='type-id-53' filepath='/usr/include/bits/types.h' line='161' column='1' id='type-id-1004'/>
     <!-- class ProfileHandler -->
-    <class-decl name='ProfileHandler' size-in-bits='448' visibility='default' filepath='src/profile-handler.cc' line='84' column='1' id='type-id-1011'>
+    <class-decl name='ProfileHandler' size-in-bits='448' visibility='default' filepath='src/profile-handler.cc' line='84' column='1' id='type-id-1005'>
       <member-type access='private'>
         <!-- enum ProfileHandler::__anonymous_enum__ -->
-        <enum-decl name='__anonymous_enum__' is-anonymous='yes' filepath='src/profile-handler.cc' line='166' column='1' id='type-id-1012'>
+        <enum-decl name='__anonymous_enum__' is-anonymous='yes' filepath='src/profile-handler.cc' line='166' column='1' id='type-id-1006'>
           <underlying-type type-id='type-id-133'/>
           <enumerator name='TIMERS_UNTOUCHED' value='0'/>
           <enumerator name='TIMERS_ONE_SET' value='1'/>
@@ -26845,27 +26454,27 @@
       </member-type>
       <member-type access='private'>
         <!-- typedef std::list<ProfileHandlerToken*, std::allocator<ProfileHandlerToken*> > ProfileHandler::CallbackList -->
-        <typedef-decl name='CallbackList' type-id='type-id-1014' filepath='src/profile-handler.cc' line='199' column='1' id='type-id-1013'/>
+        <typedef-decl name='CallbackList' type-id='type-id-1008' filepath='src/profile-handler.cc' line='199' column='1' id='type-id-1007'/>
       </member-type>
       <member-type access='private'>
         <!-- typedef std::_List_iterator<ProfileHandlerToken*> ProfileHandler::CallbackIterator -->
-        <typedef-decl name='CallbackIterator' type-id='type-id-1016' filepath='src/profile-handler.cc' line='200' column='1' id='type-id-1015'/>
+        <typedef-decl name='CallbackIterator' type-id='type-id-1010' filepath='src/profile-handler.cc' line='200' column='1' id='type-id-1009'/>
       </member-type>
       <data-member access='private' static='yes'>
         <!-- static const int32 ProfileHandler::kMaxFrequency -->
-        <var-decl name='kMaxFrequency' type-id='type-id-1017' mangled-name='_ZN14ProfileHandler13kMaxFrequencyE' visibility='default' filepath='src/profile-handler.cc' line='128' column='1' elf-symbol-id='_ZN14ProfileHandler13kMaxFrequencyE'/>
+        <var-decl name='kMaxFrequency' type-id='type-id-1011' mangled-name='_ZN14ProfileHandler13kMaxFrequencyE' visibility='default' filepath='src/profile-handler.cc' line='128' column='1' elf-symbol-id='_ZN14ProfileHandler13kMaxFrequencyE'/>
       </data-member>
       <data-member access='private' static='yes'>
         <!-- static const int32 ProfileHandler::kDefaultFrequency -->
-        <var-decl name='kDefaultFrequency' type-id='type-id-1017' mangled-name='_ZN14ProfileHandler17kDefaultFrequencyE' visibility='default' filepath='src/profile-handler.cc' line='130' column='1' elf-symbol-id='_ZN14ProfileHandler17kDefaultFrequencyE'/>
+        <var-decl name='kDefaultFrequency' type-id='type-id-1011' mangled-name='_ZN14ProfileHandler17kDefaultFrequencyE' visibility='default' filepath='src/profile-handler.cc' line='130' column='1' elf-symbol-id='_ZN14ProfileHandler17kDefaultFrequencyE'/>
       </data-member>
       <data-member access='private' static='yes'>
         <!-- static ProfileHandler* ProfileHandler::instance_ -->
-        <var-decl name='instance_' type-id='type-id-1018' mangled-name='_ZN14ProfileHandler9instance_E' visibility='default' filepath='src/profile-handler.cc' line='133' column='1' elf-symbol-id='_ZN14ProfileHandler9instance_E'/>
+        <var-decl name='instance_' type-id='type-id-1012' mangled-name='_ZN14ProfileHandler9instance_E' visibility='default' filepath='src/profile-handler.cc' line='133' column='1' elf-symbol-id='_ZN14ProfileHandler9instance_E'/>
       </data-member>
       <data-member access='private' static='yes'>
         <!-- static pthread_once_t ProfileHandler::once_ -->
-        <var-decl name='once_' type-id='type-id-955' mangled-name='_ZN14ProfileHandler5once_E' visibility='default' filepath='src/profile-handler.cc' line='136' column='1' elf-symbol-id='_ZN14ProfileHandler5once_E'/>
+        <var-decl name='once_' type-id='type-id-948' mangled-name='_ZN14ProfileHandler5once_E' visibility='default' filepath='src/profile-handler.cc' line='136' column='1' elf-symbol-id='_ZN14ProfileHandler5once_E'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='0'>
         <!-- int64 ProfileHandler::interrupts_ -->
@@ -26893,11 +26502,11 @@
       </data-member>
       <data-member access='private' layout-offset-in-bits='192'>
         <!-- pthread_key_t ProfileHandler::thread_timer_key -->
-        <var-decl name='thread_timer_key' type-id='type-id-953' visibility='default' filepath='src/profile-handler.cc' line='161' column='1'/>
+        <var-decl name='thread_timer_key' type-id='type-id-946' visibility='default' filepath='src/profile-handler.cc' line='161' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='224'>
         <!-- ProfileHandler::__anonymous_enum__ ProfileHandler::timer_sharing_ -->
-        <var-decl name='timer_sharing_' type-id='type-id-1012' visibility='default' filepath='src/profile-handler.cc' line='175' column='1'/>
+        <var-decl name='timer_sharing_' type-id='type-id-1006' visibility='default' filepath='src/profile-handler.cc' line='175' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='256'>
         <!-- SpinLock ProfileHandler::control_lock_ -->
@@ -26909,13 +26518,13 @@
       </data-member>
       <data-member access='private' layout-offset-in-bits='320'>
         <!-- ProfileHandler::CallbackList ProfileHandler::callbacks_ -->
-        <var-decl name='callbacks_' type-id='type-id-1013' visibility='default' filepath='src/profile-handler.cc' line='201' column='1'/>
+        <var-decl name='callbacks_' type-id='type-id-1007' visibility='default' filepath='src/profile-handler.cc' line='201' column='1'/>
       </data-member>
       <member-function access='private'>
         <!-- void ProfileHandler::RegisterThread() -->
         <function-decl name='RegisterThread' mangled-name='_ZN14ProfileHandler14RegisterThreadEv' filepath='src/profile-handler.cc' line='98' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN14ProfileHandler14RegisterThreadEv'>
           <!-- implicit parameter of type 'ProfileHandler*' -->
-          <parameter type-id='type-id-1018' is-artificial='yes'/>
+          <parameter type-id='type-id-1012' is-artificial='yes'/>
           <!-- void -->
           <return type-id='type-id-56'/>
         </function-decl>
@@ -26924,22 +26533,22 @@
         <!-- ProfileHandlerToken* ProfileHandler::RegisterCallback(ProfileHandlerCallback, void*) -->
         <function-decl name='RegisterCallback' mangled-name='_ZN14ProfileHandler16RegisterCallbackEPFviP7siginfoPvS2_ES2_' filepath='src/profile-handler.cc' line='104' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN14ProfileHandler16RegisterCallbackEPFviP7siginfoPvS2_ES2_'>
           <!-- implicit parameter of type 'ProfileHandler*' -->
-          <parameter type-id='type-id-1018' is-artificial='yes'/>
+          <parameter type-id='type-id-1012' is-artificial='yes'/>
           <!-- parameter of type 'typedef ProfileHandlerCallback' -->
-          <parameter type-id='type-id-1006'/>
+          <parameter type-id='type-id-1000'/>
           <!-- parameter of type 'void*' -->
           <parameter type-id='type-id-53'/>
           <!-- ProfileHandlerToken* -->
-          <return type-id='type-id-1019'/>
+          <return type-id='type-id-1013'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
         <!-- void ProfileHandler::UnregisterCallback(ProfileHandlerToken*) -->
         <function-decl name='UnregisterCallback' mangled-name='_ZN14ProfileHandler18UnregisterCallbackEP19ProfileHandlerToken' filepath='src/profile-handler.cc' line='110' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN14ProfileHandler18UnregisterCallbackEP19ProfileHandlerToken'>
           <!-- implicit parameter of type 'ProfileHandler*' -->
-          <parameter type-id='type-id-1018' is-artificial='yes'/>
+          <parameter type-id='type-id-1012' is-artificial='yes'/>
           <!-- parameter of type 'ProfileHandlerToken*' -->
-          <parameter type-id='type-id-1019'/>
+          <parameter type-id='type-id-1013'/>
           <!-- void -->
           <return type-id='type-id-56'/>
         </function-decl>
@@ -26948,7 +26557,7 @@
         <!-- void ProfileHandler::Reset() -->
         <function-decl name='Reset' mangled-name='_ZN14ProfileHandler5ResetEv' filepath='src/profile-handler.cc' line='115' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN14ProfileHandler5ResetEv'>
           <!-- implicit parameter of type 'ProfileHandler*' -->
-          <parameter type-id='type-id-1018' is-artificial='yes'/>
+          <parameter type-id='type-id-1012' is-artificial='yes'/>
           <!-- void -->
           <return type-id='type-id-56'/>
         </function-decl>
@@ -26957,9 +26566,9 @@
         <!-- void ProfileHandler::GetState(ProfileHandlerState*) -->
         <function-decl name='GetState' mangled-name='_ZN14ProfileHandler8GetStateEP19ProfileHandlerState' filepath='src/profile-handler.cc' line='118' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN14ProfileHandler8GetStateEP19ProfileHandlerState'>
           <!-- implicit parameter of type 'ProfileHandler*' -->
-          <parameter type-id='type-id-1018' is-artificial='yes'/>
+          <parameter type-id='type-id-1012' is-artificial='yes'/>
           <!-- parameter of type 'ProfileHandlerState*' -->
-          <parameter type-id='type-id-1020'/>
+          <parameter type-id='type-id-1014'/>
           <!-- void -->
           <return type-id='type-id-56'/>
         </function-decl>
@@ -26968,14 +26577,14 @@
         <!-- ProfileHandler* ProfileHandler::Instance() -->
         <function-decl name='Instance' mangled-name='_ZN14ProfileHandler8InstanceEv' filepath='src/profile-handler.cc' line='121' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN14ProfileHandler8InstanceEv'>
           <!-- ProfileHandler* -->
-          <return type-id='type-id-1018'/>
+          <return type-id='type-id-1012'/>
         </function-decl>
       </member-function>
       <member-function access='private' constructor='yes'>
         <!-- ProfileHandler::ProfileHandler() -->
         <function-decl name='ProfileHandler' mangled-name='_ZN14ProfileHandlerC1Ev' filepath='src/profile-handler.cc' line='124' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN14ProfileHandlerC1Ev'>
           <!-- implicit parameter of type 'ProfileHandler*' -->
-          <parameter type-id='type-id-1018' is-artificial='yes'/>
+          <parameter type-id='type-id-1012' is-artificial='yes'/>
           <!-- void -->
           <return type-id='type-id-56'/>
         </function-decl>
@@ -26984,7 +26593,7 @@
         <!-- ProfileHandler::~ProfileHandler(int) -->
         <function-decl name='~ProfileHandler' mangled-name='_ZN14ProfileHandlerD1Ev' filepath='src/profile-handler.cc' line='125' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN14ProfileHandlerD1Ev'>
           <!-- implicit parameter of type 'ProfileHandler*' -->
-          <parameter type-id='type-id-1018' is-artificial='yes'/>
+          <parameter type-id='type-id-1012' is-artificial='yes'/>
           <!-- artificial parameter of type 'int' -->
           <parameter type-id='type-id-1' is-artificial='yes'/>
           <!-- void -->
@@ -27002,7 +26611,7 @@
         <!-- void ProfileHandler::StartTimer() -->
         <function-decl name='StartTimer' mangled-name='_ZN14ProfileHandler10StartTimerEv' filepath='src/profile-handler.cc' line='206' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN14ProfileHandler10StartTimerEv'>
           <!-- implicit parameter of type 'ProfileHandler*' -->
-          <parameter type-id='type-id-1018' is-artificial='yes'/>
+          <parameter type-id='type-id-1012' is-artificial='yes'/>
           <!-- void -->
           <return type-id='type-id-56'/>
         </function-decl>
@@ -27011,7 +26620,7 @@
         <!-- void ProfileHandler::StopTimer() -->
         <function-decl name='StopTimer' mangled-name='_ZN14ProfileHandler9StopTimerEv' filepath='src/profile-handler.cc' line='211' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN14ProfileHandler9StopTimerEv'>
           <!-- implicit parameter of type 'ProfileHandler*' -->
-          <parameter type-id='type-id-1018' is-artificial='yes'/>
+          <parameter type-id='type-id-1012' is-artificial='yes'/>
           <!-- void -->
           <return type-id='type-id-56'/>
         </function-decl>
@@ -27020,7 +26629,7 @@
         <!-- bool ProfileHandler::IsTimerRunning() -->
         <function-decl name='IsTimerRunning' mangled-name='_ZN14ProfileHandler14IsTimerRunningEv' filepath='src/profile-handler.cc' line='216' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN14ProfileHandler14IsTimerRunningEv'>
           <!-- implicit parameter of type 'ProfileHandler*' -->
-          <parameter type-id='type-id-1018' is-artificial='yes'/>
+          <parameter type-id='type-id-1012' is-artificial='yes'/>
           <!-- bool -->
           <return type-id='type-id-55'/>
         </function-decl>
@@ -27029,7 +26638,7 @@
         <!-- void ProfileHandler::EnableHandler() -->
         <function-decl name='EnableHandler' mangled-name='_ZN14ProfileHandler13EnableHandlerEv' filepath='src/profile-handler.cc' line='219' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN14ProfileHandler13EnableHandlerEv'>
           <!-- implicit parameter of type 'ProfileHandler*' -->
-          <parameter type-id='type-id-1018' is-artificial='yes'/>
+          <parameter type-id='type-id-1012' is-artificial='yes'/>
           <!-- void -->
           <return type-id='type-id-56'/>
         </function-decl>
@@ -27038,7 +26647,7 @@
         <!-- void ProfileHandler::DisableHandler() -->
         <function-decl name='DisableHandler' mangled-name='_ZN14ProfileHandler14DisableHandlerEv' filepath='src/profile-handler.cc' line='222' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN14ProfileHandler14DisableHandlerEv'>
           <!-- implicit parameter of type 'ProfileHandler*' -->
-          <parameter type-id='type-id-1018' is-artificial='yes'/>
+          <parameter type-id='type-id-1012' is-artificial='yes'/>
           <!-- void -->
           <return type-id='type-id-56'/>
         </function-decl>
@@ -27047,7 +26656,7 @@
         <!-- bool ProfileHandler::IsSignalHandlerAvailable() -->
         <function-decl name='IsSignalHandlerAvailable' mangled-name='_ZN14ProfileHandler24IsSignalHandlerAvailableEv' filepath='src/profile-handler.cc' line='226' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN14ProfileHandler24IsSignalHandlerAvailableEv'>
           <!-- implicit parameter of type 'ProfileHandler*' -->
-          <parameter type-id='type-id-1018' is-artificial='yes'/>
+          <parameter type-id='type-id-1012' is-artificial='yes'/>
           <!-- bool -->
           <return type-id='type-id-55'/>
         </function-decl>
@@ -27058,7 +26667,7 @@
           <!-- parameter of type 'int' -->
           <parameter type-id='type-id-1'/>
           <!-- parameter of type 'siginfo_t*' -->
-          <parameter type-id='type-id-1021'/>
+          <parameter type-id='type-id-1015'/>
           <!-- parameter of type 'void*' -->
           <parameter type-id='type-id-53'/>
           <!-- void -->
@@ -27069,9 +26678,9 @@
         <!-- ProfileHandler::ProfileHandler(const ProfileHandler&) -->
         <function-decl name='ProfileHandler' filepath='src/profile-handler.cc' line='231' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'ProfileHandler*' -->
-          <parameter type-id='type-id-1018' is-artificial='yes'/>
+          <parameter type-id='type-id-1012' is-artificial='yes'/>
           <!-- parameter of type 'const ProfileHandler&' -->
-          <parameter type-id='type-id-1022'/>
+          <parameter type-id='type-id-1016'/>
           <!-- void -->
           <return type-id='type-id-56'/>
         </function-decl>
@@ -27080,18 +26689,18 @@
         <!-- void ProfileHandler::operator=(const ProfileHandler&) -->
         <function-decl name='operator=' mangled-name='_ZN14ProfileHandleraSERKS_' filepath='src/profile-handler.cc' line='231' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'ProfileHandler*' -->
-          <parameter type-id='type-id-1018' is-artificial='yes'/>
+          <parameter type-id='type-id-1012' is-artificial='yes'/>
           <!-- parameter of type 'const ProfileHandler&' -->
-          <parameter type-id='type-id-1022'/>
+          <parameter type-id='type-id-1016'/>
           <!-- void -->
           <return type-id='type-id-56'/>
         </function-decl>
       </member-function>
     </class-decl>
     <!-- typedef int pthread_once_t -->
-    <typedef-decl name='pthread_once_t' type-id='type-id-1' filepath='/usr/include/bits/pthreadtypes.h' line='144' column='1' id='type-id-955'/>
+    <typedef-decl name='pthread_once_t' type-id='type-id-1' filepath='/usr/include/bits/pthreadtypes.h' line='144' column='1' id='type-id-948'/>
     <!-- struct ProfileHandlerState -->
-    <class-decl name='ProfileHandlerState' size-in-bits='192' is-struct='yes' visibility='default' filepath='src/profile-handler.h' line='137' column='1' id='type-id-1023'>
+    <class-decl name='ProfileHandlerState' size-in-bits='192' is-struct='yes' visibility='default' filepath='src/profile-handler.h' line='137' column='1' id='type-id-1017'>
       <data-member access='public' layout-offset-in-bits='0'>
         <!-- int32 ProfileHandlerState::frequency -->
         <var-decl name='frequency' type-id='type-id-65' visibility='default' filepath='src/profile-handler.h' line='138' column='1'/>
@@ -27110,114 +26719,114 @@
       </data-member>
     </class-decl>
     <!-- ProfileHandler* -->
-    <pointer-type-def type-id='type-id-1011' size-in-bits='64' id='type-id-1018'/>
+    <pointer-type-def type-id='type-id-1005' size-in-bits='64' id='type-id-1012'/>
     <!-- ProfileHandlerState* -->
-    <pointer-type-def type-id='type-id-1023' size-in-bits='64' id='type-id-1020'/>
+    <pointer-type-def type-id='type-id-1017' size-in-bits='64' id='type-id-1014'/>
     <!-- ProfileHandlerToken* const -->
-    <qualified-type-def type-id='type-id-1019' const='yes' id='type-id-1024'/>
+    <qualified-type-def type-id='type-id-1013' const='yes' id='type-id-1018'/>
     <!-- ProfileHandlerToken* const& -->
-    <reference-type-def kind='lvalue' type-id='type-id-1024' size-in-bits='64' id='type-id-1025'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1018' size-in-bits='64' id='type-id-1019'/>
     <!-- ProfileHandlerToken* const* -->
-    <pointer-type-def type-id='type-id-1024' size-in-bits='64' id='type-id-1026'/>
+    <pointer-type-def type-id='type-id-1018' size-in-bits='64' id='type-id-1020'/>
     <!-- ProfileHandlerToken*& -->
-    <reference-type-def kind='lvalue' type-id='type-id-1019' size-in-bits='64' id='type-id-1027'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1013' size-in-bits='64' id='type-id-1021'/>
     <!-- ProfileHandlerToken** -->
-    <pointer-type-def type-id='type-id-1019' size-in-bits='64' id='type-id-1028'/>
+    <pointer-type-def type-id='type-id-1013' size-in-bits='64' id='type-id-1022'/>
     <!-- __gnu_cxx::new_allocator<ProfileHandlerToken*>* -->
-    <pointer-type-def type-id='type-id-1029' size-in-bits='64' id='type-id-1030'/>
+    <pointer-type-def type-id='type-id-1023' size-in-bits='64' id='type-id-1024'/>
     <!-- __gnu_cxx::new_allocator<std::_List_node<ProfileHandlerToken*> >* -->
-    <pointer-type-def type-id='type-id-1031' size-in-bits='64' id='type-id-1032'/>
+    <pointer-type-def type-id='type-id-1025' size-in-bits='64' id='type-id-1026'/>
     <!-- const ProfileHandler -->
-    <qualified-type-def type-id='type-id-1011' const='yes' id='type-id-1033'/>
+    <qualified-type-def type-id='type-id-1005' const='yes' id='type-id-1027'/>
     <!-- const ProfileHandler& -->
-    <reference-type-def kind='lvalue' type-id='type-id-1033' size-in-bits='64' id='type-id-1022'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1027' size-in-bits='64' id='type-id-1016'/>
     <!-- const __gnu_cxx::new_allocator<ProfileHandlerToken*> -->
-    <qualified-type-def type-id='type-id-1029' const='yes' id='type-id-1034'/>
+    <qualified-type-def type-id='type-id-1023' const='yes' id='type-id-1028'/>
     <!-- const __gnu_cxx::new_allocator<ProfileHandlerToken*>& -->
-    <reference-type-def kind='lvalue' type-id='type-id-1034' size-in-bits='64' id='type-id-1035'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1028' size-in-bits='64' id='type-id-1029'/>
     <!-- const __gnu_cxx::new_allocator<ProfileHandlerToken*>* -->
-    <pointer-type-def type-id='type-id-1034' size-in-bits='64' id='type-id-1036'/>
+    <pointer-type-def type-id='type-id-1028' size-in-bits='64' id='type-id-1030'/>
     <!-- const __gnu_cxx::new_allocator<std::_List_node<ProfileHandlerToken*> > -->
-    <qualified-type-def type-id='type-id-1031' const='yes' id='type-id-1037'/>
+    <qualified-type-def type-id='type-id-1025' const='yes' id='type-id-1031'/>
     <!-- const __gnu_cxx::new_allocator<std::_List_node<ProfileHandlerToken*> >& -->
-    <reference-type-def kind='lvalue' type-id='type-id-1037' size-in-bits='64' id='type-id-1038'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1031' size-in-bits='64' id='type-id-1032'/>
     <!-- const __gnu_cxx::new_allocator<std::_List_node<ProfileHandlerToken*> >* -->
-    <pointer-type-def type-id='type-id-1037' size-in-bits='64' id='type-id-1039'/>
+    <pointer-type-def type-id='type-id-1031' size-in-bits='64' id='type-id-1033'/>
     <!-- const int32 -->
-    <qualified-type-def type-id='type-id-65' const='yes' id='type-id-1017'/>
+    <qualified-type-def type-id='type-id-65' const='yes' id='type-id-1011'/>
     <!-- const std::_List_base<ProfileHandlerToken*, std::allocator<ProfileHandlerToken*> > -->
-    <qualified-type-def type-id='type-id-1040' const='yes' id='type-id-1041'/>
+    <qualified-type-def type-id='type-id-1034' const='yes' id='type-id-1035'/>
     <!-- const std::_List_base<ProfileHandlerToken*, std::allocator<ProfileHandlerToken*> >* -->
-    <pointer-type-def type-id='type-id-1041' size-in-bits='64' id='type-id-1042'/>
+    <pointer-type-def type-id='type-id-1035' size-in-bits='64' id='type-id-1036'/>
     <!-- const std::_List_iterator<ProfileHandlerToken*> -->
-    <qualified-type-def type-id='type-id-1016' const='yes' id='type-id-1043'/>
+    <qualified-type-def type-id='type-id-1010' const='yes' id='type-id-1037'/>
     <!-- const std::_List_iterator<ProfileHandlerToken*>& -->
-    <reference-type-def kind='lvalue' type-id='type-id-1043' size-in-bits='64' id='type-id-1044'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1037' size-in-bits='64' id='type-id-1038'/>
     <!-- const std::_List_iterator<ProfileHandlerToken*>* -->
-    <pointer-type-def type-id='type-id-1043' size-in-bits='64' id='type-id-1045'/>
+    <pointer-type-def type-id='type-id-1037' size-in-bits='64' id='type-id-1039'/>
     <!-- const std::_List_node<ProfileHandlerToken*> -->
-    <qualified-type-def type-id='type-id-1046' const='yes' id='type-id-1047'/>
+    <qualified-type-def type-id='type-id-1040' const='yes' id='type-id-1041'/>
     <!-- const std::_List_node<ProfileHandlerToken*>& -->
-    <reference-type-def kind='lvalue' type-id='type-id-1047' size-in-bits='64' id='type-id-1048'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1041' size-in-bits='64' id='type-id-1042'/>
     <!-- const std::_List_node<ProfileHandlerToken*>* -->
-    <pointer-type-def type-id='type-id-1047' size-in-bits='64' id='type-id-1049'/>
+    <pointer-type-def type-id='type-id-1041' size-in-bits='64' id='type-id-1043'/>
     <!-- const std::allocator<ProfileHandlerToken*> -->
-    <qualified-type-def type-id='type-id-1050' const='yes' id='type-id-1051'/>
+    <qualified-type-def type-id='type-id-1044' const='yes' id='type-id-1045'/>
     <!-- const std::allocator<ProfileHandlerToken*>& -->
-    <reference-type-def kind='lvalue' type-id='type-id-1051' size-in-bits='64' id='type-id-1052'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1045' size-in-bits='64' id='type-id-1046'/>
     <!-- const std::allocator<std::_List_node<ProfileHandlerToken*> > -->
-    <qualified-type-def type-id='type-id-1053' const='yes' id='type-id-1054'/>
+    <qualified-type-def type-id='type-id-1047' const='yes' id='type-id-1048'/>
     <!-- const std::allocator<std::_List_node<ProfileHandlerToken*> >& -->
-    <reference-type-def kind='lvalue' type-id='type-id-1054' size-in-bits='64' id='type-id-1055'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1048' size-in-bits='64' id='type-id-1049'/>
     <!-- const std::list<ProfileHandlerToken*, std::allocator<ProfileHandlerToken*> > -->
-    <qualified-type-def type-id='type-id-1014' const='yes' id='type-id-1056'/>
+    <qualified-type-def type-id='type-id-1008' const='yes' id='type-id-1050'/>
     <!-- const std::list<ProfileHandlerToken*, std::allocator<ProfileHandlerToken*> >& -->
-    <reference-type-def kind='lvalue' type-id='type-id-1056' size-in-bits='64' id='type-id-1057'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1050' size-in-bits='64' id='type-id-1051'/>
     <!-- const std::list<ProfileHandlerToken*, std::allocator<ProfileHandlerToken*> >* -->
-    <pointer-type-def type-id='type-id-1056' size-in-bits='64' id='type-id-1058'/>
+    <pointer-type-def type-id='type-id-1050' size-in-bits='64' id='type-id-1052'/>
     <!-- std::_List_base<ProfileHandlerToken*, std::allocator<ProfileHandlerToken*> >* -->
-    <pointer-type-def type-id='type-id-1040' size-in-bits='64' id='type-id-1059'/>
+    <pointer-type-def type-id='type-id-1034' size-in-bits='64' id='type-id-1053'/>
     <!-- std::_List_base<ProfileHandlerToken*, std::allocator<ProfileHandlerToken*> >::_List_impl* -->
-    <pointer-type-def type-id='type-id-1060' size-in-bits='64' id='type-id-1061'/>
+    <pointer-type-def type-id='type-id-1054' size-in-bits='64' id='type-id-1055'/>
     <!-- std::_List_iterator<ProfileHandlerToken*>& -->
-    <reference-type-def kind='lvalue' type-id='type-id-1016' size-in-bits='64' id='type-id-1062'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1010' size-in-bits='64' id='type-id-1056'/>
     <!-- std::_List_iterator<ProfileHandlerToken*>* -->
-    <pointer-type-def type-id='type-id-1016' size-in-bits='64' id='type-id-1063'/>
+    <pointer-type-def type-id='type-id-1010' size-in-bits='64' id='type-id-1057'/>
     <!-- std::_List_node<ProfileHandlerToken*>& -->
-    <reference-type-def kind='lvalue' type-id='type-id-1046' size-in-bits='64' id='type-id-1064'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1040' size-in-bits='64' id='type-id-1058'/>
     <!-- std::_List_node<ProfileHandlerToken*>* -->
-    <pointer-type-def type-id='type-id-1046' size-in-bits='64' id='type-id-1065'/>
+    <pointer-type-def type-id='type-id-1040' size-in-bits='64' id='type-id-1059'/>
     <!-- std::_List_node_base& -->
-    <reference-type-def kind='lvalue' type-id='type-id-1066' size-in-bits='64' id='type-id-1067'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1060' size-in-bits='64' id='type-id-1061'/>
     <!-- std::_List_node_base* -->
-    <pointer-type-def type-id='type-id-1066' size-in-bits='64' id='type-id-1068'/>
+    <pointer-type-def type-id='type-id-1060' size-in-bits='64' id='type-id-1062'/>
     <!-- std::allocator<ProfileHandlerToken*>* -->
-    <pointer-type-def type-id='type-id-1050' size-in-bits='64' id='type-id-1069'/>
+    <pointer-type-def type-id='type-id-1044' size-in-bits='64' id='type-id-1063'/>
     <!-- std::allocator<std::_List_node<ProfileHandlerToken*> >& -->
-    <reference-type-def kind='lvalue' type-id='type-id-1053' size-in-bits='64' id='type-id-1070'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1047' size-in-bits='64' id='type-id-1064'/>
     <!-- std::allocator<std::_List_node<ProfileHandlerToken*> >* -->
-    <pointer-type-def type-id='type-id-1053' size-in-bits='64' id='type-id-1071'/>
+    <pointer-type-def type-id='type-id-1047' size-in-bits='64' id='type-id-1065'/>
     <!-- std::list<ProfileHandlerToken*, std::allocator<ProfileHandlerToken*> >& -->
-    <reference-type-def kind='lvalue' type-id='type-id-1014' size-in-bits='64' id='type-id-1072'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1008' size-in-bits='64' id='type-id-1066'/>
     <!-- std::list<ProfileHandlerToken*, std::allocator<ProfileHandlerToken*> >* -->
-    <pointer-type-def type-id='type-id-1014' size-in-bits='64' id='type-id-1073'/>
+    <pointer-type-def type-id='type-id-1008' size-in-bits='64' id='type-id-1067'/>
     <!-- timer_id_holder* -->
-    <pointer-type-def type-id='type-id-1007' size-in-bits='64' id='type-id-1009'/>
+    <pointer-type-def type-id='type-id-1001' size-in-bits='64' id='type-id-1003'/>
     <!-- void (int, siginfo_t*, void*, void*)* -->
-    <pointer-type-def type-id='type-id-1074' size-in-bits='64' id='type-id-1005'/>
+    <pointer-type-def type-id='type-id-1068' size-in-bits='64' id='type-id-999'/>
     <!-- namespace std -->
     <namespace-decl name='std'>
       <!-- struct std::_List_iterator<ProfileHandlerToken*> -->
-      <class-decl name='_List_iterator&lt;ProfileHandlerToken*&gt;' size-in-bits='64' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_list.h' line='114' column='1' id='type-id-1016'>
+      <class-decl name='_List_iterator&lt;ProfileHandlerToken*&gt;' size-in-bits='64' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_list.h' line='114' column='1' id='type-id-1010'>
         <data-member access='public' layout-offset-in-bits='0'>
           <!-- std::_List_node_base* std::_List_iterator<ProfileHandlerToken*>::_M_node -->
-          <var-decl name='_M_node' type-id='type-id-1068' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_list.h' line='179' column='1'/>
+          <var-decl name='_M_node' type-id='type-id-1062' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_list.h' line='179' column='1'/>
         </data-member>
         <member-function access='public'>
           <!-- void std::_List_iterator<ProfileHandlerToken*>::_List_iterator() -->
           <function-decl name='_List_iterator' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_list.h' line='124' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::_List_iterator<ProfileHandlerToken*>*' -->
-            <parameter type-id='type-id-1063' is-artificial='yes'/>
+            <parameter type-id='type-id-1057' is-artificial='yes'/>
             <!-- void -->
             <return type-id='type-id-56'/>
           </function-decl>
@@ -27226,9 +26835,9 @@
           <!-- void std::_List_iterator<ProfileHandlerToken*>::_List_iterator(std::_List_node_base*) -->
           <function-decl name='_List_iterator' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_list.h' line='128' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::_List_iterator<ProfileHandlerToken*>*' -->
-            <parameter type-id='type-id-1063' is-artificial='yes'/>
+            <parameter type-id='type-id-1057' is-artificial='yes'/>
             <!-- parameter of type 'std::_List_node_base*' -->
-            <parameter type-id='type-id-1068'/>
+            <parameter type-id='type-id-1062'/>
             <!-- void -->
             <return type-id='type-id-56'/>
           </function-decl>
@@ -27237,67 +26846,67 @@
           <!-- ProfileHandlerToken*& std::_List_iterator<ProfileHandlerToken*>::operator*() -->
           <function-decl name='operator*' mangled-name='_ZNKSt14_List_iteratorIP19ProfileHandlerTokenEdeEv' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_list.h' line='133' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const std::_List_iterator<ProfileHandlerToken*>*' -->
-            <parameter type-id='type-id-1045' is-artificial='yes'/>
+            <parameter type-id='type-id-1039' is-artificial='yes'/>
             <!-- ProfileHandlerToken*& -->
-            <return type-id='type-id-1027'/>
+            <return type-id='type-id-1021'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <!-- ProfileHandlerToken** std::_List_iterator<ProfileHandlerToken*>::operator&#45;>() -->
           <function-decl name='operator-&gt;' mangled-name='_ZNKSt14_List_iteratorIP19ProfileHandlerTokenEptEv' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_list.h' line='137' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const std::_List_iterator<ProfileHandlerToken*>*' -->
-            <parameter type-id='type-id-1045' is-artificial='yes'/>
+            <parameter type-id='type-id-1039' is-artificial='yes'/>
             <!-- ProfileHandlerToken** -->
-            <return type-id='type-id-1028'/>
+            <return type-id='type-id-1022'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <!-- std::_List_iterator<ProfileHandlerToken*>& std::_List_iterator<ProfileHandlerToken*>::operator++() -->
           <function-decl name='operator++' mangled-name='_ZNSt14_List_iteratorIP19ProfileHandlerTokenEppEv' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_list.h' line='141' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::_List_iterator<ProfileHandlerToken*>*' -->
-            <parameter type-id='type-id-1063' is-artificial='yes'/>
+            <parameter type-id='type-id-1057' is-artificial='yes'/>
             <!-- std::_List_iterator<ProfileHandlerToken*>& -->
-            <return type-id='type-id-1062'/>
+            <return type-id='type-id-1056'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <!-- std::_List_iterator<ProfileHandlerToken*> std::_List_iterator<ProfileHandlerToken*>::operator++(int) -->
           <function-decl name='operator++' mangled-name='_ZNSt14_List_iteratorIP19ProfileHandlerTokenEppEi' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_list.h' line='148' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::_List_iterator<ProfileHandlerToken*>*' -->
-            <parameter type-id='type-id-1063' is-artificial='yes'/>
+            <parameter type-id='type-id-1057' is-artificial='yes'/>
             <!-- parameter of type 'int' -->
             <parameter type-id='type-id-1'/>
             <!-- struct std::_List_iterator<ProfileHandlerToken*> -->
-            <return type-id='type-id-1016'/>
+            <return type-id='type-id-1010'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <!-- std::_List_iterator<ProfileHandlerToken*>& std::_List_iterator<ProfileHandlerToken*>::operator&#45;&#45;() -->
           <function-decl name='operator--' mangled-name='_ZNSt14_List_iteratorIP19ProfileHandlerTokenEmmEv' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_list.h' line='156' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::_List_iterator<ProfileHandlerToken*>*' -->
-            <parameter type-id='type-id-1063' is-artificial='yes'/>
+            <parameter type-id='type-id-1057' is-artificial='yes'/>
             <!-- std::_List_iterator<ProfileHandlerToken*>& -->
-            <return type-id='type-id-1062'/>
+            <return type-id='type-id-1056'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <!-- std::_List_iterator<ProfileHandlerToken*> std::_List_iterator<ProfileHandlerToken*>::operator&#45;&#45;(int) -->
           <function-decl name='operator--' mangled-name='_ZNSt14_List_iteratorIP19ProfileHandlerTokenEmmEi' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_list.h' line='163' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::_List_iterator<ProfileHandlerToken*>*' -->
-            <parameter type-id='type-id-1063' is-artificial='yes'/>
+            <parameter type-id='type-id-1057' is-artificial='yes'/>
             <!-- parameter of type 'int' -->
             <parameter type-id='type-id-1'/>
             <!-- struct std::_List_iterator<ProfileHandlerToken*> -->
-            <return type-id='type-id-1016'/>
+            <return type-id='type-id-1010'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <!-- bool std::_List_iterator<ProfileHandlerToken*>::operator==(const std::_List_iterator<ProfileHandlerToken*>&) -->
           <function-decl name='operator==' mangled-name='_ZNKSt14_List_iteratorIP19ProfileHandlerTokenEeqERKS2_' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_list.h' line='171' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const std::_List_iterator<ProfileHandlerToken*>*' -->
-            <parameter type-id='type-id-1045' is-artificial='yes'/>
+            <parameter type-id='type-id-1039' is-artificial='yes'/>
             <!-- parameter of type 'const std::_List_iterator<ProfileHandlerToken*>&' -->
-            <parameter type-id='type-id-1044'/>
+            <parameter type-id='type-id-1038'/>
             <!-- bool -->
             <return type-id='type-id-55'/>
           </function-decl>
@@ -27306,31 +26915,31 @@
           <!-- bool std::_List_iterator<ProfileHandlerToken*>::operator!=(const std::_List_iterator<ProfileHandlerToken*>&) -->
           <function-decl name='operator!=' mangled-name='_ZNKSt14_List_iteratorIP19ProfileHandlerTokenEneERKS2_' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_list.h' line='175' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const std::_List_iterator<ProfileHandlerToken*>*' -->
-            <parameter type-id='type-id-1045' is-artificial='yes'/>
+            <parameter type-id='type-id-1039' is-artificial='yes'/>
             <!-- parameter of type 'const std::_List_iterator<ProfileHandlerToken*>&' -->
-            <parameter type-id='type-id-1044'/>
+            <parameter type-id='type-id-1038'/>
             <!-- bool -->
             <return type-id='type-id-55'/>
           </function-decl>
         </member-function>
       </class-decl>
       <!-- struct std::_List_node_base -->
-      <class-decl name='_List_node_base' size-in-bits='128' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_list.h' line='72' column='1' id='type-id-1066'>
+      <class-decl name='_List_node_base' size-in-bits='128' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_list.h' line='72' column='1' id='type-id-1060'>
         <data-member access='public' layout-offset-in-bits='0'>
           <!-- std::_List_node_base* std::_List_node_base::_M_next -->
-          <var-decl name='_M_next' type-id='type-id-1068' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_list.h' line='73' column='1'/>
+          <var-decl name='_M_next' type-id='type-id-1062' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_list.h' line='73' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='64'>
           <!-- std::_List_node_base* std::_List_node_base::_M_prev -->
-          <var-decl name='_M_prev' type-id='type-id-1068' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_list.h' line='74' column='1'/>
+          <var-decl name='_M_prev' type-id='type-id-1062' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_list.h' line='74' column='1'/>
         </data-member>
         <member-function access='public' static='yes'>
           <!-- void std::_List_node_base::swap(std::_List_node_base&) -->
           <function-decl name='swap' mangled-name='_ZNSt15_List_node_base4swapERS_S0_' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_list.h' line='77' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- parameter of type 'std::_List_node_base&' -->
-            <parameter type-id='type-id-1067'/>
+            <parameter type-id='type-id-1061'/>
             <!-- parameter of type 'std::_List_node_base&' -->
-            <parameter type-id='type-id-1067'/>
+            <parameter type-id='type-id-1061'/>
             <!-- void -->
             <return type-id='type-id-56'/>
           </function-decl>
@@ -27339,11 +26948,11 @@
           <!-- void std::_List_node_base::transfer(std::_List_node_base*, std::_List_node_base*) -->
           <function-decl name='transfer' mangled-name='_ZNSt15_List_node_base8transferEPS_S0_' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_list.h' line='80' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::_List_node_base*' -->
-            <parameter type-id='type-id-1068' is-artificial='yes'/>
+            <parameter type-id='type-id-1062' is-artificial='yes'/>
             <!-- parameter of type 'std::_List_node_base*' -->
-            <parameter type-id='type-id-1068'/>
+            <parameter type-id='type-id-1062'/>
             <!-- parameter of type 'std::_List_node_base*' -->
-            <parameter type-id='type-id-1068'/>
+            <parameter type-id='type-id-1062'/>
             <!-- void -->
             <return type-id='type-id-56'/>
           </function-decl>
@@ -27352,7 +26961,7 @@
           <!-- void std::_List_node_base::reverse() -->
           <function-decl name='reverse' mangled-name='_ZNSt15_List_node_base7reverseEv' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_list.h' line='84' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::_List_node_base*' -->
-            <parameter type-id='type-id-1068' is-artificial='yes'/>
+            <parameter type-id='type-id-1062' is-artificial='yes'/>
             <!-- void -->
             <return type-id='type-id-56'/>
           </function-decl>
@@ -27361,9 +26970,9 @@
           <!-- void std::_List_node_base::hook(std::_List_node_base*) -->
           <function-decl name='hook' mangled-name='_ZNSt15_List_node_base4hookEPS_' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_list.h' line='87' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::_List_node_base*' -->
-            <parameter type-id='type-id-1068' is-artificial='yes'/>
+            <parameter type-id='type-id-1062' is-artificial='yes'/>
             <!-- parameter of type 'std::_List_node_base*' -->
-            <parameter type-id='type-id-1068'/>
+            <parameter type-id='type-id-1062'/>
             <!-- void -->
             <return type-id='type-id-56'/>
           </function-decl>
@@ -27372,32 +26981,32 @@
           <!-- void std::_List_node_base::unhook() -->
           <function-decl name='unhook' mangled-name='_ZNSt15_List_node_base6unhookEv' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_list.h' line='90' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::_List_node_base*' -->
-            <parameter type-id='type-id-1068' is-artificial='yes'/>
+            <parameter type-id='type-id-1062' is-artificial='yes'/>
             <!-- void -->
             <return type-id='type-id-56'/>
           </function-decl>
         </member-function>
       </class-decl>
       <!-- class std::list<ProfileHandlerToken*, std::allocator<ProfileHandlerToken*> > -->
-      <class-decl name='list&lt;ProfileHandlerToken*, std::allocator&lt;ProfileHandlerToken*&gt; &gt;' size-in-bits='128' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_list.h' line='418' column='1' id='type-id-1014'>
+      <class-decl name='list&lt;ProfileHandlerToken*, std::allocator&lt;ProfileHandlerToken*&gt; &gt;' size-in-bits='128' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_list.h' line='418' column='1' id='type-id-1008'>
         <!-- class std::_List_base<ProfileHandlerToken*, std::allocator<ProfileHandlerToken*> > -->
-        <base-class access='protected' layout-offset-in-bits='0' type-id='type-id-1040'/>
+        <base-class access='protected' layout-offset-in-bits='0' type-id='type-id-1034'/>
         <member-function access='protected'>
           <!-- std::_List_node<ProfileHandlerToken*>* std::list<ProfileHandlerToken*, std::allocator<ProfileHandlerToken*> >::_M_create_node(ProfileHandlerToken* const&) -->
           <function-decl name='_M_create_node' mangled-name='_ZNSt4listIP19ProfileHandlerTokenSaIS1_EE14_M_create_nodeERKS1_' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_list.h' line='459' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::list<ProfileHandlerToken*, std::allocator<ProfileHandlerToken*> >*' -->
-            <parameter type-id='type-id-1073' is-artificial='yes'/>
+            <parameter type-id='type-id-1067' is-artificial='yes'/>
             <!-- parameter of type 'ProfileHandlerToken* const&' -->
-            <parameter type-id='type-id-1025'/>
+            <parameter type-id='type-id-1019'/>
             <!-- std::_List_node<ProfileHandlerToken*>* -->
-            <return type-id='type-id-1065'/>
+            <return type-id='type-id-1059'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <!-- void std::list<ProfileHandlerToken*, std::allocator<ProfileHandlerToken*> >::list() -->
           <function-decl name='list' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_list.h' line='499' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::list<ProfileHandlerToken*, std::allocator<ProfileHandlerToken*> >*' -->
-            <parameter type-id='type-id-1073' is-artificial='yes'/>
+            <parameter type-id='type-id-1067' is-artificial='yes'/>
             <!-- void -->
             <return type-id='type-id-56'/>
           </function-decl>
@@ -27406,9 +27015,9 @@
           <!-- void std::list<ProfileHandlerToken*, std::allocator<ProfileHandlerToken*> >::list(const std::allocator<ProfileHandlerToken*>&) -->
           <function-decl name='list' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_list.h' line='507' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::list<ProfileHandlerToken*, std::allocator<ProfileHandlerToken*> >*' -->
-            <parameter type-id='type-id-1073' is-artificial='yes'/>
+            <parameter type-id='type-id-1067' is-artificial='yes'/>
             <!-- parameter of type 'const std::allocator<ProfileHandlerToken*>&' -->
-            <parameter type-id='type-id-1052'/>
+            <parameter type-id='type-id-1046'/>
             <!-- void -->
             <return type-id='type-id-56'/>
           </function-decl>
@@ -27417,13 +27026,13 @@
           <!-- void std::list<ProfileHandlerToken*, std::allocator<ProfileHandlerToken*> >::list(unsigned long int, ProfileHandlerToken* const&, const std::allocator<ProfileHandlerToken*>&) -->
           <function-decl name='list' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_list.h' line='519' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::list<ProfileHandlerToken*, std::allocator<ProfileHandlerToken*> >*' -->
-            <parameter type-id='type-id-1073' is-artificial='yes'/>
+            <parameter type-id='type-id-1067' is-artificial='yes'/>
             <!-- parameter of type 'unsigned long int' -->
             <parameter type-id='type-id-5'/>
             <!-- parameter of type 'ProfileHandlerToken* const&' -->
-            <parameter type-id='type-id-1025'/>
+            <parameter type-id='type-id-1019'/>
             <!-- parameter of type 'const std::allocator<ProfileHandlerToken*>&' -->
-            <parameter type-id='type-id-1052'/>
+            <parameter type-id='type-id-1046'/>
             <!-- void -->
             <return type-id='type-id-56'/>
           </function-decl>
@@ -27432,9 +27041,9 @@
           <!-- void std::list<ProfileHandlerToken*, std::allocator<ProfileHandlerToken*> >::list(const std::list<ProfileHandlerToken*, std::allocator<ProfileHandlerToken*> >&) -->
           <function-decl name='list' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_list.h' line='531' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::list<ProfileHandlerToken*, std::allocator<ProfileHandlerToken*> >*' -->
-            <parameter type-id='type-id-1073' is-artificial='yes'/>
+            <parameter type-id='type-id-1067' is-artificial='yes'/>
             <!-- parameter of type 'const std::list<ProfileHandlerToken*, std::allocator<ProfileHandlerToken*> >&' -->
-            <parameter type-id='type-id-1057'/>
+            <parameter type-id='type-id-1051'/>
             <!-- void -->
             <return type-id='type-id-56'/>
           </function-decl>
@@ -27443,22 +27052,22 @@
           <!-- std::list<ProfileHandlerToken*, std::allocator<ProfileHandlerToken*> >& std::list<ProfileHandlerToken*, std::allocator<ProfileHandlerToken*> >::operator=(const std::list<ProfileHandlerToken*, std::allocator<ProfileHandlerToken*> >&) -->
           <function-decl name='operator=' mangled-name='_ZNSt4listIP19ProfileHandlerTokenSaIS1_EEaSERKS3_' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/list.tcc' line='132' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::list<ProfileHandlerToken*, std::allocator<ProfileHandlerToken*> >*' -->
-            <parameter type-id='type-id-1073' is-artificial='yes'/>
+            <parameter type-id='type-id-1067' is-artificial='yes'/>
             <!-- parameter of type 'const std::list<ProfileHandlerToken*, std::allocator<ProfileHandlerToken*> >&' -->
-            <parameter type-id='type-id-1057'/>
+            <parameter type-id='type-id-1051'/>
             <!-- std::list<ProfileHandlerToken*, std::allocator<ProfileHandlerToken*> >& -->
-            <return type-id='type-id-1072'/>
+            <return type-id='type-id-1066'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <!-- void std::list<ProfileHandlerToken*, std::allocator<ProfileHandlerToken*> >::assign(unsigned long int, ProfileHandlerToken* const&) -->
           <function-decl name='assign' mangled-name='_ZNSt4listIP19ProfileHandlerTokenSaIS1_EE6assignEmRKS1_' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_list.h' line='641' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::list<ProfileHandlerToken*, std::allocator<ProfileHandlerToken*> >*' -->
-            <parameter type-id='type-id-1073' is-artificial='yes'/>
+            <parameter type-id='type-id-1067' is-artificial='yes'/>
             <!-- parameter of type 'unsigned long int' -->
             <parameter type-id='type-id-5'/>
             <!-- parameter of type 'ProfileHandlerToken* const&' -->
-            <parameter type-id='type-id-1025'/>
+            <parameter type-id='type-id-1019'/>
             <!-- void -->
             <return type-id='type-id-56'/>
           </function-decl>
@@ -27467,88 +27076,88 @@
           <!-- std::allocator<ProfileHandlerToken*> std::list<ProfileHandlerToken*, std::allocator<ProfileHandlerToken*> >::get_allocator() -->
           <function-decl name='get_allocator' mangled-name='_ZNKSt4listIP19ProfileHandlerTokenSaIS1_EE13get_allocatorEv' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_list.h' line='680' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const std::list<ProfileHandlerToken*, std::allocator<ProfileHandlerToken*> >*' -->
-            <parameter type-id='type-id-1058' is-artificial='yes'/>
+            <parameter type-id='type-id-1052' is-artificial='yes'/>
             <!-- class std::allocator<ProfileHandlerToken*> -->
-            <return type-id='type-id-1050'/>
+            <return type-id='type-id-1044'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <!-- std::_List_iterator<ProfileHandlerToken*> std::list<ProfileHandlerToken*, std::allocator<ProfileHandlerToken*> >::begin() -->
           <function-decl name='begin' mangled-name='_ZNSt4listIP19ProfileHandlerTokenSaIS1_EE5beginEv' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_list.h' line='689' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::list<ProfileHandlerToken*, std::allocator<ProfileHandlerToken*> >*' -->
-            <parameter type-id='type-id-1073' is-artificial='yes'/>
+            <parameter type-id='type-id-1067' is-artificial='yes'/>
             <!-- struct std::_List_iterator<ProfileHandlerToken*> -->
-            <return type-id='type-id-1016'/>
+            <return type-id='type-id-1010'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <!-- std::_List_const_iterator<ProfileHandlerToken*> std::list<ProfileHandlerToken*, std::allocator<ProfileHandlerToken*> >::begin() -->
           <function-decl name='begin' mangled-name='_ZNKSt4listIP19ProfileHandlerTokenSaIS1_EE5beginEv' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_list.h' line='698' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const std::list<ProfileHandlerToken*, std::allocator<ProfileHandlerToken*> >*' -->
-            <parameter type-id='type-id-1058' is-artificial='yes'/>
+            <parameter type-id='type-id-1052' is-artificial='yes'/>
             <!-- struct std::_List_const_iterator<ProfileHandlerToken*> -->
-            <return type-id='type-id-1075'/>
+            <return type-id='type-id-1069'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <!-- std::_List_iterator<ProfileHandlerToken*> std::list<ProfileHandlerToken*, std::allocator<ProfileHandlerToken*> >::end() -->
           <function-decl name='end' mangled-name='_ZNSt4listIP19ProfileHandlerTokenSaIS1_EE3endEv' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_list.h' line='707' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::list<ProfileHandlerToken*, std::allocator<ProfileHandlerToken*> >*' -->
-            <parameter type-id='type-id-1073' is-artificial='yes'/>
+            <parameter type-id='type-id-1067' is-artificial='yes'/>
             <!-- struct std::_List_iterator<ProfileHandlerToken*> -->
-            <return type-id='type-id-1016'/>
+            <return type-id='type-id-1010'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <!-- std::_List_const_iterator<ProfileHandlerToken*> std::list<ProfileHandlerToken*, std::allocator<ProfileHandlerToken*> >::end() -->
           <function-decl name='end' mangled-name='_ZNKSt4listIP19ProfileHandlerTokenSaIS1_EE3endEv' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_list.h' line='716' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const std::list<ProfileHandlerToken*, std::allocator<ProfileHandlerToken*> >*' -->
-            <parameter type-id='type-id-1058' is-artificial='yes'/>
+            <parameter type-id='type-id-1052' is-artificial='yes'/>
             <!-- struct std::_List_const_iterator<ProfileHandlerToken*> -->
-            <return type-id='type-id-1075'/>
+            <return type-id='type-id-1069'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <!-- std::reverse_iterator<std::_List_iterator<ProfileHandlerToken*> > std::list<ProfileHandlerToken*, std::allocator<ProfileHandlerToken*> >::rbegin() -->
           <function-decl name='rbegin' mangled-name='_ZNSt4listIP19ProfileHandlerTokenSaIS1_EE6rbeginEv' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_list.h' line='725' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::list<ProfileHandlerToken*, std::allocator<ProfileHandlerToken*> >*' -->
-            <parameter type-id='type-id-1073' is-artificial='yes'/>
+            <parameter type-id='type-id-1067' is-artificial='yes'/>
             <!-- class std::reverse_iterator<std::_List_iterator<ProfileHandlerToken*> > -->
-            <return type-id='type-id-1076'/>
+            <return type-id='type-id-1070'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <!-- std::reverse_iterator<std::_List_const_iterator<ProfileHandlerToken*> > std::list<ProfileHandlerToken*, std::allocator<ProfileHandlerToken*> >::rbegin() -->
           <function-decl name='rbegin' mangled-name='_ZNKSt4listIP19ProfileHandlerTokenSaIS1_EE6rbeginEv' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_list.h' line='734' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const std::list<ProfileHandlerToken*, std::allocator<ProfileHandlerToken*> >*' -->
-            <parameter type-id='type-id-1058' is-artificial='yes'/>
+            <parameter type-id='type-id-1052' is-artificial='yes'/>
             <!-- class std::reverse_iterator<std::_List_const_iterator<ProfileHandlerToken*> > -->
-            <return type-id='type-id-1077'/>
+            <return type-id='type-id-1071'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <!-- std::reverse_iterator<std::_List_iterator<ProfileHandlerToken*> > std::list<ProfileHandlerToken*, std::allocator<ProfileHandlerToken*> >::rend() -->
           <function-decl name='rend' mangled-name='_ZNSt4listIP19ProfileHandlerTokenSaIS1_EE4rendEv' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_list.h' line='743' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::list<ProfileHandlerToken*, std::allocator<ProfileHandlerToken*> >*' -->
-            <parameter type-id='type-id-1073' is-artificial='yes'/>
+            <parameter type-id='type-id-1067' is-artificial='yes'/>
             <!-- class std::reverse_iterator<std::_List_iterator<ProfileHandlerToken*> > -->
-            <return type-id='type-id-1076'/>
+            <return type-id='type-id-1070'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <!-- std::reverse_iterator<std::_List_const_iterator<ProfileHandlerToken*> > std::list<ProfileHandlerToken*, std::allocator<ProfileHandlerToken*> >::rend() -->
           <function-decl name='rend' mangled-name='_ZNKSt4listIP19ProfileHandlerTokenSaIS1_EE4rendEv' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_list.h' line='752' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const std::list<ProfileHandlerToken*, std::allocator<ProfileHandlerToken*> >*' -->
-            <parameter type-id='type-id-1058' is-artificial='yes'/>
+            <parameter type-id='type-id-1052' is-artificial='yes'/>
             <!-- class std::reverse_iterator<std::_List_const_iterator<ProfileHandlerToken*> > -->
-            <return type-id='type-id-1077'/>
+            <return type-id='type-id-1071'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <!-- bool std::list<ProfileHandlerToken*, std::allocator<ProfileHandlerToken*> >::empty() -->
           <function-decl name='empty' mangled-name='_ZNKSt4listIP19ProfileHandlerTokenSaIS1_EE5emptyEv' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_list.h' line='799' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const std::list<ProfileHandlerToken*, std::allocator<ProfileHandlerToken*> >*' -->
-            <parameter type-id='type-id-1058' is-artificial='yes'/>
+            <parameter type-id='type-id-1052' is-artificial='yes'/>
             <!-- bool -->
             <return type-id='type-id-55'/>
           </function-decl>
@@ -27557,7 +27166,7 @@
           <!-- size_t std::list<ProfileHandlerToken*, std::allocator<ProfileHandlerToken*> >::size() -->
           <function-decl name='size' mangled-name='_ZNKSt4listIP19ProfileHandlerTokenSaIS1_EE4sizeEv' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_list.h' line='804' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const std::list<ProfileHandlerToken*, std::allocator<ProfileHandlerToken*> >*' -->
-            <parameter type-id='type-id-1058' is-artificial='yes'/>
+            <parameter type-id='type-id-1052' is-artificial='yes'/>
             <!-- typedef size_t -->
             <return type-id='type-id-57'/>
           </function-decl>
@@ -27566,7 +27175,7 @@
           <!-- size_t std::list<ProfileHandlerToken*, std::allocator<ProfileHandlerToken*> >::max_size() -->
           <function-decl name='max_size' mangled-name='_ZNKSt4listIP19ProfileHandlerTokenSaIS1_EE8max_sizeEv' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_list.h' line='809' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const std::list<ProfileHandlerToken*, std::allocator<ProfileHandlerToken*> >*' -->
-            <parameter type-id='type-id-1058' is-artificial='yes'/>
+            <parameter type-id='type-id-1052' is-artificial='yes'/>
             <!-- typedef size_t -->
             <return type-id='type-id-57'/>
           </function-decl>
@@ -27575,11 +27184,11 @@
           <!-- void std::list<ProfileHandlerToken*, std::allocator<ProfileHandlerToken*> >::resize(unsigned long int, ProfileHandlerToken*) -->
           <function-decl name='resize' mangled-name='_ZNSt4listIP19ProfileHandlerTokenSaIS1_EE6resizeEmS1_' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/list.tcc' line='117' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::list<ProfileHandlerToken*, std::allocator<ProfileHandlerToken*> >*' -->
-            <parameter type-id='type-id-1073' is-artificial='yes'/>
+            <parameter type-id='type-id-1067' is-artificial='yes'/>
             <!-- parameter of type 'unsigned long int' -->
             <parameter type-id='type-id-5'/>
             <!-- parameter of type 'ProfileHandlerToken*' -->
-            <parameter type-id='type-id-1019'/>
+            <parameter type-id='type-id-1013'/>
             <!-- void -->
             <return type-id='type-id-56'/>
           </function-decl>
@@ -27588,45 +27197,45 @@
           <!-- ProfileHandlerToken*& std::list<ProfileHandlerToken*, std::allocator<ProfileHandlerToken*> >::front() -->
           <function-decl name='front' mangled-name='_ZNSt4listIP19ProfileHandlerTokenSaIS1_EE5frontEv' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_list.h' line='831' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::list<ProfileHandlerToken*, std::allocator<ProfileHandlerToken*> >*' -->
-            <parameter type-id='type-id-1073' is-artificial='yes'/>
+            <parameter type-id='type-id-1067' is-artificial='yes'/>
             <!-- ProfileHandlerToken*& -->
-            <return type-id='type-id-1027'/>
+            <return type-id='type-id-1021'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <!-- ProfileHandlerToken* const& std::list<ProfileHandlerToken*, std::allocator<ProfileHandlerToken*> >::front() -->
           <function-decl name='front' mangled-name='_ZNKSt4listIP19ProfileHandlerTokenSaIS1_EE5frontEv' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_list.h' line='839' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const std::list<ProfileHandlerToken*, std::allocator<ProfileHandlerToken*> >*' -->
-            <parameter type-id='type-id-1058' is-artificial='yes'/>
+            <parameter type-id='type-id-1052' is-artificial='yes'/>
             <!-- ProfileHandlerToken* const& -->
-            <return type-id='type-id-1025'/>
+            <return type-id='type-id-1019'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <!-- ProfileHandlerToken*& std::list<ProfileHandlerToken*, std::allocator<ProfileHandlerToken*> >::back() -->
           <function-decl name='back' mangled-name='_ZNSt4listIP19ProfileHandlerTokenSaIS1_EE4backEv' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_list.h' line='847' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::list<ProfileHandlerToken*, std::allocator<ProfileHandlerToken*> >*' -->
-            <parameter type-id='type-id-1073' is-artificial='yes'/>
+            <parameter type-id='type-id-1067' is-artificial='yes'/>
             <!-- ProfileHandlerToken*& -->
-            <return type-id='type-id-1027'/>
+            <return type-id='type-id-1021'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <!-- ProfileHandlerToken* const& std::list<ProfileHandlerToken*, std::allocator<ProfileHandlerToken*> >::back() -->
           <function-decl name='back' mangled-name='_ZNKSt4listIP19ProfileHandlerTokenSaIS1_EE4backEv' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_list.h' line='859' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const std::list<ProfileHandlerToken*, std::allocator<ProfileHandlerToken*> >*' -->
-            <parameter type-id='type-id-1058' is-artificial='yes'/>
+            <parameter type-id='type-id-1052' is-artificial='yes'/>
             <!-- ProfileHandlerToken* const& -->
-            <return type-id='type-id-1025'/>
+            <return type-id='type-id-1019'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <!-- void std::list<ProfileHandlerToken*, std::allocator<ProfileHandlerToken*> >::push_front(ProfileHandlerToken* const&) -->
           <function-decl name='push_front' mangled-name='_ZNSt4listIP19ProfileHandlerTokenSaIS1_EE10push_frontERKS1_' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_list.h' line='878' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::list<ProfileHandlerToken*, std::allocator<ProfileHandlerToken*> >*' -->
-            <parameter type-id='type-id-1073' is-artificial='yes'/>
+            <parameter type-id='type-id-1067' is-artificial='yes'/>
             <!-- parameter of type 'ProfileHandlerToken* const&' -->
-            <parameter type-id='type-id-1025'/>
+            <parameter type-id='type-id-1019'/>
             <!-- void -->
             <return type-id='type-id-56'/>
           </function-decl>
@@ -27635,7 +27244,7 @@
           <!-- void std::list<ProfileHandlerToken*, std::allocator<ProfileHandlerToken*> >::pop_front() -->
           <function-decl name='pop_front' mangled-name='_ZNSt4listIP19ProfileHandlerTokenSaIS1_EE9pop_frontEv' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_list.h' line='905' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::list<ProfileHandlerToken*, std::allocator<ProfileHandlerToken*> >*' -->
-            <parameter type-id='type-id-1073' is-artificial='yes'/>
+            <parameter type-id='type-id-1067' is-artificial='yes'/>
             <!-- void -->
             <return type-id='type-id-56'/>
           </function-decl>
@@ -27644,9 +27253,9 @@
           <!-- void std::list<ProfileHandlerToken*, std::allocator<ProfileHandlerToken*> >::push_back(ProfileHandlerToken* const&) -->
           <function-decl name='push_back' mangled-name='_ZNSt4listIP19ProfileHandlerTokenSaIS1_EE9push_backERKS1_' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_list.h' line='919' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::list<ProfileHandlerToken*, std::allocator<ProfileHandlerToken*> >*' -->
-            <parameter type-id='type-id-1073' is-artificial='yes'/>
+            <parameter type-id='type-id-1067' is-artificial='yes'/>
             <!-- parameter of type 'ProfileHandlerToken* const&' -->
-            <parameter type-id='type-id-1025'/>
+            <parameter type-id='type-id-1019'/>
             <!-- void -->
             <return type-id='type-id-56'/>
           </function-decl>
@@ -27655,7 +27264,7 @@
           <!-- void std::list<ProfileHandlerToken*, std::allocator<ProfileHandlerToken*> >::pop_back() -->
           <function-decl name='pop_back' mangled-name='_ZNSt4listIP19ProfileHandlerTokenSaIS1_EE8pop_backEv' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_list.h' line='945' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::list<ProfileHandlerToken*, std::allocator<ProfileHandlerToken*> >*' -->
-            <parameter type-id='type-id-1073' is-artificial='yes'/>
+            <parameter type-id='type-id-1067' is-artificial='yes'/>
             <!-- void -->
             <return type-id='type-id-56'/>
           </function-decl>
@@ -27664,26 +27273,26 @@
           <!-- std::_List_iterator<ProfileHandlerToken*> std::list<ProfileHandlerToken*, std::allocator<ProfileHandlerToken*> >::insert(std::_List_iterator<ProfileHandlerToken*>, ProfileHandlerToken* const&) -->
           <function-decl name='insert' mangled-name='_ZNSt4listIP19ProfileHandlerTokenSaIS1_EE6insertESt14_List_iteratorIS1_ERKS1_' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/list.tcc' line='97' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::list<ProfileHandlerToken*, std::allocator<ProfileHandlerToken*> >*' -->
-            <parameter type-id='type-id-1073' is-artificial='yes'/>
+            <parameter type-id='type-id-1067' is-artificial='yes'/>
             <!-- parameter of type 'struct std::_List_iterator<ProfileHandlerToken*>' -->
-            <parameter type-id='type-id-1016'/>
+            <parameter type-id='type-id-1010'/>
             <!-- parameter of type 'ProfileHandlerToken* const&' -->
-            <parameter type-id='type-id-1025'/>
+            <parameter type-id='type-id-1019'/>
             <!-- struct std::_List_iterator<ProfileHandlerToken*> -->
-            <return type-id='type-id-1016'/>
+            <return type-id='type-id-1010'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <!-- void std::list<ProfileHandlerToken*, std::allocator<ProfileHandlerToken*> >::insert(std::_List_iterator<ProfileHandlerToken*>, unsigned long int, ProfileHandlerToken* const&) -->
           <function-decl name='insert' mangled-name='_ZNSt4listIP19ProfileHandlerTokenSaIS1_EE6insertESt14_List_iteratorIS1_EmRKS1_' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_list.h' line='1027' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::list<ProfileHandlerToken*, std::allocator<ProfileHandlerToken*> >*' -->
-            <parameter type-id='type-id-1073' is-artificial='yes'/>
+            <parameter type-id='type-id-1067' is-artificial='yes'/>
             <!-- parameter of type 'struct std::_List_iterator<ProfileHandlerToken*>' -->
-            <parameter type-id='type-id-1016'/>
+            <parameter type-id='type-id-1010'/>
             <!-- parameter of type 'unsigned long int' -->
             <parameter type-id='type-id-5'/>
             <!-- parameter of type 'ProfileHandlerToken* const&' -->
-            <parameter type-id='type-id-1025'/>
+            <parameter type-id='type-id-1019'/>
             <!-- void -->
             <return type-id='type-id-56'/>
           </function-decl>
@@ -27692,33 +27301,33 @@
           <!-- std::_List_iterator<ProfileHandlerToken*> std::list<ProfileHandlerToken*, std::allocator<ProfileHandlerToken*> >::erase(std::_List_iterator<ProfileHandlerToken*>) -->
           <function-decl name='erase' mangled-name='_ZNSt4listIP19ProfileHandlerTokenSaIS1_EE5eraseESt14_List_iteratorIS1_E' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/list.tcc' line='107' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::list<ProfileHandlerToken*, std::allocator<ProfileHandlerToken*> >*' -->
-            <parameter type-id='type-id-1073' is-artificial='yes'/>
+            <parameter type-id='type-id-1067' is-artificial='yes'/>
             <!-- parameter of type 'struct std::_List_iterator<ProfileHandlerToken*>' -->
-            <parameter type-id='type-id-1016'/>
+            <parameter type-id='type-id-1010'/>
             <!-- struct std::_List_iterator<ProfileHandlerToken*> -->
-            <return type-id='type-id-1016'/>
+            <return type-id='type-id-1010'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <!-- std::_List_iterator<ProfileHandlerToken*> std::list<ProfileHandlerToken*, std::allocator<ProfileHandlerToken*> >::erase(std::_List_iterator<ProfileHandlerToken*>, std::_List_iterator<ProfileHandlerToken*>) -->
           <function-decl name='erase' mangled-name='_ZNSt4listIP19ProfileHandlerTokenSaIS1_EE5eraseESt14_List_iteratorIS1_ES5_' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_list.h' line='1092' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::list<ProfileHandlerToken*, std::allocator<ProfileHandlerToken*> >*' -->
-            <parameter type-id='type-id-1073' is-artificial='yes'/>
+            <parameter type-id='type-id-1067' is-artificial='yes'/>
             <!-- parameter of type 'struct std::_List_iterator<ProfileHandlerToken*>' -->
-            <parameter type-id='type-id-1016'/>
+            <parameter type-id='type-id-1010'/>
             <!-- parameter of type 'struct std::_List_iterator<ProfileHandlerToken*>' -->
-            <parameter type-id='type-id-1016'/>
+            <parameter type-id='type-id-1010'/>
             <!-- struct std::_List_iterator<ProfileHandlerToken*> -->
-            <return type-id='type-id-1016'/>
+            <return type-id='type-id-1010'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <!-- void std::list<ProfileHandlerToken*, std::allocator<ProfileHandlerToken*> >::swap(std::list<ProfileHandlerToken*, std::allocator<ProfileHandlerToken*> >&) -->
           <function-decl name='swap' mangled-name='_ZNSt4listIP19ProfileHandlerTokenSaIS1_EE4swapERS3_' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_list.h' line='1112' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::list<ProfileHandlerToken*, std::allocator<ProfileHandlerToken*> >*' -->
-            <parameter type-id='type-id-1073' is-artificial='yes'/>
+            <parameter type-id='type-id-1067' is-artificial='yes'/>
             <!-- parameter of type 'std::list<ProfileHandlerToken*, std::allocator<ProfileHandlerToken*> >&' -->
-            <parameter type-id='type-id-1072'/>
+            <parameter type-id='type-id-1066'/>
             <!-- void -->
             <return type-id='type-id-56'/>
           </function-decl>
@@ -27727,7 +27336,7 @@
           <!-- void std::list<ProfileHandlerToken*, std::allocator<ProfileHandlerToken*> >::clear() -->
           <function-decl name='clear' mangled-name='_ZNSt4listIP19ProfileHandlerTokenSaIS1_EE5clearEv' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_list.h' line='1130' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::list<ProfileHandlerToken*, std::allocator<ProfileHandlerToken*> >*' -->
-            <parameter type-id='type-id-1073' is-artificial='yes'/>
+            <parameter type-id='type-id-1067' is-artificial='yes'/>
             <!-- void -->
             <return type-id='type-id-56'/>
           </function-decl>
@@ -27736,11 +27345,11 @@
           <!-- void std::list<ProfileHandlerToken*, std::allocator<ProfileHandlerToken*> >::splice(std::_List_iterator<ProfileHandlerToken*>, std::list<ProfileHandlerToken*, std::allocator<ProfileHandlerToken*> >&) -->
           <function-decl name='splice' mangled-name='_ZNSt4listIP19ProfileHandlerTokenSaIS1_EE6spliceESt14_List_iteratorIS1_ERS3_' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_list.h' line='1152' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::list<ProfileHandlerToken*, std::allocator<ProfileHandlerToken*> >*' -->
-            <parameter type-id='type-id-1073' is-artificial='yes'/>
+            <parameter type-id='type-id-1067' is-artificial='yes'/>
             <!-- parameter of type 'struct std::_List_iterator<ProfileHandlerToken*>' -->
-            <parameter type-id='type-id-1016'/>
+            <parameter type-id='type-id-1010'/>
             <!-- parameter of type 'std::list<ProfileHandlerToken*, std::allocator<ProfileHandlerToken*> >&' -->
-            <parameter type-id='type-id-1072'/>
+            <parameter type-id='type-id-1066'/>
             <!-- void -->
             <return type-id='type-id-56'/>
           </function-decl>
@@ -27749,13 +27358,13 @@
           <!-- void std::list<ProfileHandlerToken*, std::allocator<ProfileHandlerToken*> >::splice(std::_List_iterator<ProfileHandlerToken*>, std::list<ProfileHandlerToken*, std::allocator<ProfileHandlerToken*> >&, std::_List_iterator<ProfileHandlerToken*>) -->
           <function-decl name='splice' mangled-name='_ZNSt4listIP19ProfileHandlerTokenSaIS1_EE6spliceESt14_List_iteratorIS1_ERS3_S5_' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_list.h' line='1176' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::list<ProfileHandlerToken*, std::allocator<ProfileHandlerToken*> >*' -->
-            <parameter type-id='type-id-1073' is-artificial='yes'/>
+            <parameter type-id='type-id-1067' is-artificial='yes'/>
             <!-- parameter of type 'struct std::_List_iterator<ProfileHandlerToken*>' -->
-            <parameter type-id='type-id-1016'/>
+            <parameter type-id='type-id-1010'/>
             <!-- parameter of type 'std::list<ProfileHandlerToken*, std::allocator<ProfileHandlerToken*> >&' -->
-            <parameter type-id='type-id-1072'/>
+            <parameter type-id='type-id-1066'/>
             <!-- parameter of type 'struct std::_List_iterator<ProfileHandlerToken*>' -->
-            <parameter type-id='type-id-1016'/>
+            <parameter type-id='type-id-1010'/>
             <!-- void -->
             <return type-id='type-id-56'/>
           </function-decl>
@@ -27764,15 +27373,15 @@
           <!-- void std::list<ProfileHandlerToken*, std::allocator<ProfileHandlerToken*> >::splice(std::_List_iterator<ProfileHandlerToken*>, std::list<ProfileHandlerToken*, std::allocator<ProfileHandlerToken*> >&, std::_List_iterator<ProfileHandlerToken*>, std::_List_iterator<ProfileHandlerToken*>) -->
           <function-decl name='splice' mangled-name='_ZNSt4listIP19ProfileHandlerTokenSaIS1_EE6spliceESt14_List_iteratorIS1_ERS3_S5_S5_' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_list.h' line='1207' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::list<ProfileHandlerToken*, std::allocator<ProfileHandlerToken*> >*' -->
-            <parameter type-id='type-id-1073' is-artificial='yes'/>
+            <parameter type-id='type-id-1067' is-artificial='yes'/>
             <!-- parameter of type 'struct std::_List_iterator<ProfileHandlerToken*>' -->
-            <parameter type-id='type-id-1016'/>
+            <parameter type-id='type-id-1010'/>
             <!-- parameter of type 'std::list<ProfileHandlerToken*, std::allocator<ProfileHandlerToken*> >&' -->
-            <parameter type-id='type-id-1072'/>
+            <parameter type-id='type-id-1066'/>
             <!-- parameter of type 'struct std::_List_iterator<ProfileHandlerToken*>' -->
-            <parameter type-id='type-id-1016'/>
+            <parameter type-id='type-id-1010'/>
             <!-- parameter of type 'struct std::_List_iterator<ProfileHandlerToken*>' -->
-            <parameter type-id='type-id-1016'/>
+            <parameter type-id='type-id-1010'/>
             <!-- void -->
             <return type-id='type-id-56'/>
           </function-decl>
@@ -27781,9 +27390,9 @@
           <!-- void std::list<ProfileHandlerToken*, std::allocator<ProfileHandlerToken*> >::remove(ProfileHandlerToken* const&) -->
           <function-decl name='remove' mangled-name='_ZNSt4listIP19ProfileHandlerTokenSaIS1_EE6removeERKS1_' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/list.tcc' line='186' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::list<ProfileHandlerToken*, std::allocator<ProfileHandlerToken*> >*' -->
-            <parameter type-id='type-id-1073' is-artificial='yes'/>
+            <parameter type-id='type-id-1067' is-artificial='yes'/>
             <!-- parameter of type 'ProfileHandlerToken* const&' -->
-            <parameter type-id='type-id-1025'/>
+            <parameter type-id='type-id-1019'/>
             <!-- void -->
             <return type-id='type-id-56'/>
           </function-decl>
@@ -27792,7 +27401,7 @@
           <!-- void std::list<ProfileHandlerToken*, std::allocator<ProfileHandlerToken*> >::unique() -->
           <function-decl name='unique' mangled-name='_ZNSt4listIP19ProfileHandlerTokenSaIS1_EE6uniqueEv' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/list.tcc' line='214' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::list<ProfileHandlerToken*, std::allocator<ProfileHandlerToken*> >*' -->
-            <parameter type-id='type-id-1073' is-artificial='yes'/>
+            <parameter type-id='type-id-1067' is-artificial='yes'/>
             <!-- void -->
             <return type-id='type-id-56'/>
           </function-decl>
@@ -27801,9 +27410,9 @@
           <!-- void std::list<ProfileHandlerToken*, std::allocator<ProfileHandlerToken*> >::merge(std::list<ProfileHandlerToken*, std::allocator<ProfileHandlerToken*> >&) -->
           <function-decl name='merge' mangled-name='_ZNSt4listIP19ProfileHandlerTokenSaIS1_EE5mergeERS3_' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/list.tcc' line='234' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::list<ProfileHandlerToken*, std::allocator<ProfileHandlerToken*> >*' -->
-            <parameter type-id='type-id-1073' is-artificial='yes'/>
+            <parameter type-id='type-id-1067' is-artificial='yes'/>
             <!-- parameter of type 'std::list<ProfileHandlerToken*, std::allocator<ProfileHandlerToken*> >&' -->
-            <parameter type-id='type-id-1072'/>
+            <parameter type-id='type-id-1066'/>
             <!-- void -->
             <return type-id='type-id-56'/>
           </function-decl>
@@ -27812,7 +27421,7 @@
           <!-- void std::list<ProfileHandlerToken*, std::allocator<ProfileHandlerToken*> >::reverse() -->
           <function-decl name='reverse' mangled-name='_ZNSt4listIP19ProfileHandlerTokenSaIS1_EE7reverseEv' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_list.h' line='1320' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::list<ProfileHandlerToken*, std::allocator<ProfileHandlerToken*> >*' -->
-            <parameter type-id='type-id-1073' is-artificial='yes'/>
+            <parameter type-id='type-id-1067' is-artificial='yes'/>
             <!-- void -->
             <return type-id='type-id-56'/>
           </function-decl>
@@ -27821,7 +27430,7 @@
           <!-- void std::list<ProfileHandlerToken*, std::allocator<ProfileHandlerToken*> >::sort() -->
           <function-decl name='sort' mangled-name='_ZNSt4listIP19ProfileHandlerTokenSaIS1_EE4sortEv' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/list.tcc' line='301' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::list<ProfileHandlerToken*, std::allocator<ProfileHandlerToken*> >*' -->
-            <parameter type-id='type-id-1073' is-artificial='yes'/>
+            <parameter type-id='type-id-1067' is-artificial='yes'/>
             <!-- void -->
             <return type-id='type-id-56'/>
           </function-decl>
@@ -27830,11 +27439,11 @@
           <!-- void std::list<ProfileHandlerToken*, std::allocator<ProfileHandlerToken*> >::_M_fill_initialize(unsigned long int, ProfileHandlerToken* const&) -->
           <function-decl name='_M_fill_initialize' mangled-name='_ZNSt4listIP19ProfileHandlerTokenSaIS1_EE18_M_fill_initializeEmRKS1_' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_list.h' line='1367' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::list<ProfileHandlerToken*, std::allocator<ProfileHandlerToken*> >*' -->
-            <parameter type-id='type-id-1073' is-artificial='yes'/>
+            <parameter type-id='type-id-1067' is-artificial='yes'/>
             <!-- parameter of type 'unsigned long int' -->
             <parameter type-id='type-id-5'/>
             <!-- parameter of type 'ProfileHandlerToken* const&' -->
-            <parameter type-id='type-id-1025'/>
+            <parameter type-id='type-id-1019'/>
             <!-- void -->
             <return type-id='type-id-56'/>
           </function-decl>
@@ -27843,11 +27452,11 @@
           <!-- void std::list<ProfileHandlerToken*, std::allocator<ProfileHandlerToken*> >::_M_fill_assign(unsigned long int, ProfileHandlerToken* const&) -->
           <function-decl name='_M_fill_assign' mangled-name='_ZNSt4listIP19ProfileHandlerTokenSaIS1_EE14_M_fill_assignEmRKS1_' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/list.tcc' line='154' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::list<ProfileHandlerToken*, std::allocator<ProfileHandlerToken*> >*' -->
-            <parameter type-id='type-id-1073' is-artificial='yes'/>
+            <parameter type-id='type-id-1067' is-artificial='yes'/>
             <!-- parameter of type 'unsigned long int' -->
             <parameter type-id='type-id-5'/>
             <!-- parameter of type 'ProfileHandlerToken* const&' -->
-            <parameter type-id='type-id-1025'/>
+            <parameter type-id='type-id-1019'/>
             <!-- void -->
             <return type-id='type-id-56'/>
           </function-decl>
@@ -27856,13 +27465,13 @@
           <!-- void std::list<ProfileHandlerToken*, std::allocator<ProfileHandlerToken*> >::_M_transfer(std::_List_iterator<ProfileHandlerToken*>, std::_List_iterator<ProfileHandlerToken*>, std::_List_iterator<ProfileHandlerToken*>) -->
           <function-decl name='_M_transfer' mangled-name='_ZNSt4listIP19ProfileHandlerTokenSaIS1_EE11_M_transferESt14_List_iteratorIS1_ES5_S5_' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_list.h' line='1399' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::list<ProfileHandlerToken*, std::allocator<ProfileHandlerToken*> >*' -->
-            <parameter type-id='type-id-1073' is-artificial='yes'/>
+            <parameter type-id='type-id-1067' is-artificial='yes'/>
             <!-- parameter of type 'struct std::_List_iterator<ProfileHandlerToken*>' -->
-            <parameter type-id='type-id-1016'/>
+            <parameter type-id='type-id-1010'/>
             <!-- parameter of type 'struct std::_List_iterator<ProfileHandlerToken*>' -->
-            <parameter type-id='type-id-1016'/>
+            <parameter type-id='type-id-1010'/>
             <!-- parameter of type 'struct std::_List_iterator<ProfileHandlerToken*>' -->
-            <parameter type-id='type-id-1016'/>
+            <parameter type-id='type-id-1010'/>
             <!-- void -->
             <return type-id='type-id-56'/>
           </function-decl>
@@ -27871,11 +27480,11 @@
           <!-- void std::list<ProfileHandlerToken*, std::allocator<ProfileHandlerToken*> >::_M_insert(std::_List_iterator<ProfileHandlerToken*>, ProfileHandlerToken* const&) -->
           <function-decl name='_M_insert' mangled-name='_ZNSt4listIP19ProfileHandlerTokenSaIS1_EE9_M_insertESt14_List_iteratorIS1_ERKS1_' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_list.h' line='1405' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::list<ProfileHandlerToken*, std::allocator<ProfileHandlerToken*> >*' -->
-            <parameter type-id='type-id-1073' is-artificial='yes'/>
+            <parameter type-id='type-id-1067' is-artificial='yes'/>
             <!-- parameter of type 'struct std::_List_iterator<ProfileHandlerToken*>' -->
-            <parameter type-id='type-id-1016'/>
+            <parameter type-id='type-id-1010'/>
             <!-- parameter of type 'ProfileHandlerToken* const&' -->
-            <parameter type-id='type-id-1025'/>
+            <parameter type-id='type-id-1019'/>
             <!-- void -->
             <return type-id='type-id-56'/>
           </function-decl>
@@ -27884,9 +27493,9 @@
           <!-- void std::list<ProfileHandlerToken*, std::allocator<ProfileHandlerToken*> >::_M_erase(std::_List_iterator<ProfileHandlerToken*>) -->
           <function-decl name='_M_erase' mangled-name='_ZNSt4listIP19ProfileHandlerTokenSaIS1_EE8_M_eraseESt14_List_iteratorIS1_E' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_list.h' line='1422' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::list<ProfileHandlerToken*, std::allocator<ProfileHandlerToken*> >*' -->
-            <parameter type-id='type-id-1073' is-artificial='yes'/>
+            <parameter type-id='type-id-1067' is-artificial='yes'/>
             <!-- parameter of type 'struct std::_List_iterator<ProfileHandlerToken*>' -->
-            <parameter type-id='type-id-1016'/>
+            <parameter type-id='type-id-1010'/>
             <!-- void -->
             <return type-id='type-id-56'/>
           </function-decl>
@@ -27895,30 +27504,30 @@
           <!-- void std::list<ProfileHandlerToken*, std::allocator<ProfileHandlerToken*> >::_M_check_equal_allocators(std::list<ProfileHandlerToken*, std::allocator<ProfileHandlerToken*> >&) -->
           <function-decl name='_M_check_equal_allocators' mangled-name='_ZNSt4listIP19ProfileHandlerTokenSaIS1_EE25_M_check_equal_allocatorsERS3_' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_list.h' line='1436' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::list<ProfileHandlerToken*, std::allocator<ProfileHandlerToken*> >*' -->
-            <parameter type-id='type-id-1073' is-artificial='yes'/>
+            <parameter type-id='type-id-1067' is-artificial='yes'/>
             <!-- parameter of type 'std::list<ProfileHandlerToken*, std::allocator<ProfileHandlerToken*> >&' -->
-            <parameter type-id='type-id-1072'/>
+            <parameter type-id='type-id-1066'/>
             <!-- void -->
             <return type-id='type-id-56'/>
           </function-decl>
         </member-function>
       </class-decl>
       <!-- class std::_List_base<ProfileHandlerToken*, std::allocator<ProfileHandlerToken*> > -->
-      <class-decl name='_List_base&lt;ProfileHandlerToken*, std::allocator&lt;ProfileHandlerToken*&gt; &gt;' size-in-bits='128' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_list.h' line='278' column='1' id='type-id-1040'>
+      <class-decl name='_List_base&lt;ProfileHandlerToken*, std::allocator&lt;ProfileHandlerToken*&gt; &gt;' size-in-bits='128' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_list.h' line='278' column='1' id='type-id-1034'>
         <member-type access='protected'>
           <!-- struct std::_List_base<ProfileHandlerToken*, std::allocator<ProfileHandlerToken*> >::_List_impl -->
-          <class-decl name='_List_impl' size-in-bits='128' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_list.h' line='300' column='1' id='type-id-1060'>
+          <class-decl name='_List_impl' size-in-bits='128' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_list.h' line='300' column='1' id='type-id-1054'>
             <!-- class std::allocator<std::_List_node<ProfileHandlerToken*> > -->
-            <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1053'/>
+            <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1047'/>
             <data-member access='public' layout-offset-in-bits='0'>
               <!-- std::_List_node_base std::_List_base<ProfileHandlerToken*, std::allocator<ProfileHandlerToken*> >::_List_impl::_M_node -->
-              <var-decl name='_M_node' type-id='type-id-1066' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_list.h' line='301' column='1'/>
+              <var-decl name='_M_node' type-id='type-id-1060' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_list.h' line='301' column='1'/>
             </data-member>
             <member-function access='public' constructor='yes'>
               <!-- std::_List_base<ProfileHandlerToken*, std::allocator<ProfileHandlerToken*> >::_List_impl::_List_impl() -->
               <function-decl name='_List_impl' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_list.h' line='303' column='1' visibility='default' binding='global' size-in-bits='64'>
                 <!-- implicit parameter of type 'std::_List_base<ProfileHandlerToken*, std::allocator<ProfileHandlerToken*> >::_List_impl*' -->
-                <parameter type-id='type-id-1061' is-artificial='yes'/>
+                <parameter type-id='type-id-1055' is-artificial='yes'/>
                 <!-- void -->
                 <return type-id='type-id-56'/>
               </function-decl>
@@ -27927,9 +27536,9 @@
               <!-- std::_List_base<ProfileHandlerToken*, std::allocator<ProfileHandlerToken*> >::_List_impl::_List_impl(const std::allocator<std::_List_node<ProfileHandlerToken*> >&) -->
               <function-decl name='_List_impl' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_list.h' line='307' column='1' visibility='default' binding='global' size-in-bits='64'>
                 <!-- implicit parameter of type 'std::_List_base<ProfileHandlerToken*, std::allocator<ProfileHandlerToken*> >::_List_impl*' -->
-                <parameter type-id='type-id-1061' is-artificial='yes'/>
+                <parameter type-id='type-id-1055' is-artificial='yes'/>
                 <!-- parameter of type 'const std::allocator<std::_List_node<ProfileHandlerToken*> >&' -->
-                <parameter type-id='type-id-1055'/>
+                <parameter type-id='type-id-1049'/>
                 <!-- void -->
                 <return type-id='type-id-56'/>
               </function-decl>
@@ -27938,24 +27547,24 @@
         </member-type>
         <data-member access='protected' layout-offset-in-bits='0'>
           <!-- std::_List_base<ProfileHandlerToken*, std::allocator<ProfileHandlerToken*> >::_List_impl std::_List_base<ProfileHandlerToken*, std::allocator<ProfileHandlerToken*> >::_M_impl -->
-          <var-decl name='_M_impl' type-id='type-id-1060' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_list.h' line='312' column='1'/>
+          <var-decl name='_M_impl' type-id='type-id-1054' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_list.h' line='312' column='1'/>
         </data-member>
         <member-function access='protected'>
           <!-- std::_List_node<ProfileHandlerToken*>* std::_List_base<ProfileHandlerToken*, std::allocator<ProfileHandlerToken*> >::_M_get_node() -->
           <function-decl name='_M_get_node' mangled-name='_ZNSt10_List_baseIP19ProfileHandlerTokenSaIS1_EE11_M_get_nodeEv' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_list.h' line='315' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::_List_base<ProfileHandlerToken*, std::allocator<ProfileHandlerToken*> >*' -->
-            <parameter type-id='type-id-1059' is-artificial='yes'/>
+            <parameter type-id='type-id-1053' is-artificial='yes'/>
             <!-- std::_List_node<ProfileHandlerToken*>* -->
-            <return type-id='type-id-1065'/>
+            <return type-id='type-id-1059'/>
           </function-decl>
         </member-function>
         <member-function access='protected'>
           <!-- void std::_List_base<ProfileHandlerToken*, std::allocator<ProfileHandlerToken*> >::_M_put_node(std::_List_node<ProfileHandlerToken*>*) -->
           <function-decl name='_M_put_node' mangled-name='_ZNSt10_List_baseIP19ProfileHandlerTokenSaIS1_EE11_M_put_nodeEPSt10_List_nodeIS1_E' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_list.h' line='319' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::_List_base<ProfileHandlerToken*, std::allocator<ProfileHandlerToken*> >*' -->
-            <parameter type-id='type-id-1059' is-artificial='yes'/>
+            <parameter type-id='type-id-1053' is-artificial='yes'/>
             <!-- parameter of type 'std::_List_node<ProfileHandlerToken*>*' -->
-            <parameter type-id='type-id-1065'/>
+            <parameter type-id='type-id-1059'/>
             <!-- void -->
             <return type-id='type-id-56'/>
           </function-decl>
@@ -27964,43 +27573,43 @@
           <!-- std::allocator<std::_List_node<ProfileHandlerToken*> >& std::_List_base<ProfileHandlerToken*, std::allocator<ProfileHandlerToken*> >::_M_get_Node_allocator() -->
           <function-decl name='_M_get_Node_allocator' mangled-name='_ZNSt10_List_baseIP19ProfileHandlerTokenSaIS1_EE21_M_get_Node_allocatorEv' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_list.h' line='326' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::_List_base<ProfileHandlerToken*, std::allocator<ProfileHandlerToken*> >*' -->
-            <parameter type-id='type-id-1059' is-artificial='yes'/>
+            <parameter type-id='type-id-1053' is-artificial='yes'/>
             <!-- std::allocator<std::_List_node<ProfileHandlerToken*> >& -->
-            <return type-id='type-id-1070'/>
+            <return type-id='type-id-1064'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <!-- const std::allocator<std::_List_node<ProfileHandlerToken*> >& std::_List_base<ProfileHandlerToken*, std::allocator<ProfileHandlerToken*> >::_M_get_Node_allocator() -->
           <function-decl name='_M_get_Node_allocator' mangled-name='_ZNKSt10_List_baseIP19ProfileHandlerTokenSaIS1_EE21_M_get_Node_allocatorEv' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_list.h' line='330' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const std::_List_base<ProfileHandlerToken*, std::allocator<ProfileHandlerToken*> >*' -->
-            <parameter type-id='type-id-1042' is-artificial='yes'/>
+            <parameter type-id='type-id-1036' is-artificial='yes'/>
             <!-- const std::allocator<std::_List_node<ProfileHandlerToken*> >& -->
-            <return type-id='type-id-1055'/>
+            <return type-id='type-id-1049'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <!-- std::allocator<ProfileHandlerToken*> std::_List_base<ProfileHandlerToken*, std::allocator<ProfileHandlerToken*> >::_M_get_Tp_allocator() -->
           <function-decl name='_M_get_Tp_allocator' mangled-name='_ZNKSt10_List_baseIP19ProfileHandlerTokenSaIS1_EE19_M_get_Tp_allocatorEv' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_list.h' line='334' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const std::_List_base<ProfileHandlerToken*, std::allocator<ProfileHandlerToken*> >*' -->
-            <parameter type-id='type-id-1042' is-artificial='yes'/>
+            <parameter type-id='type-id-1036' is-artificial='yes'/>
             <!-- class std::allocator<ProfileHandlerToken*> -->
-            <return type-id='type-id-1050'/>
+            <return type-id='type-id-1044'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <!-- std::allocator<ProfileHandlerToken*> std::_List_base<ProfileHandlerToken*, std::allocator<ProfileHandlerToken*> >::get_allocator() -->
           <function-decl name='get_allocator' mangled-name='_ZNKSt10_List_baseIP19ProfileHandlerTokenSaIS1_EE13get_allocatorEv' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_list.h' line='338' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const std::_List_base<ProfileHandlerToken*, std::allocator<ProfileHandlerToken*> >*' -->
-            <parameter type-id='type-id-1042' is-artificial='yes'/>
+            <parameter type-id='type-id-1036' is-artificial='yes'/>
             <!-- class std::allocator<ProfileHandlerToken*> -->
-            <return type-id='type-id-1050'/>
+            <return type-id='type-id-1044'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <!-- void std::_List_base<ProfileHandlerToken*, std::allocator<ProfileHandlerToken*> >::_List_base() -->
           <function-decl name='_List_base' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_list.h' line='341' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::_List_base<ProfileHandlerToken*, std::allocator<ProfileHandlerToken*> >*' -->
-            <parameter type-id='type-id-1059' is-artificial='yes'/>
+            <parameter type-id='type-id-1053' is-artificial='yes'/>
             <!-- void -->
             <return type-id='type-id-56'/>
           </function-decl>
@@ -28009,9 +27618,9 @@
           <!-- void std::_List_base<ProfileHandlerToken*, std::allocator<ProfileHandlerToken*> >::_List_base(const std::allocator<ProfileHandlerToken*>&) -->
           <function-decl name='_List_base' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_list.h' line='345' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::_List_base<ProfileHandlerToken*, std::allocator<ProfileHandlerToken*> >*' -->
-            <parameter type-id='type-id-1059' is-artificial='yes'/>
+            <parameter type-id='type-id-1053' is-artificial='yes'/>
             <!-- parameter of type 'const std::allocator<ProfileHandlerToken*>&' -->
-            <parameter type-id='type-id-1052'/>
+            <parameter type-id='type-id-1046'/>
             <!-- void -->
             <return type-id='type-id-56'/>
           </function-decl>
@@ -28020,7 +27629,7 @@
           <!-- std::_List_base<ProfileHandlerToken*, std::allocator<ProfileHandlerToken*> >::~_List_base(int) -->
           <function-decl name='~_List_base' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_list.h' line='359' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::_List_base<ProfileHandlerToken*, std::allocator<ProfileHandlerToken*> >*' -->
-            <parameter type-id='type-id-1059' is-artificial='yes'/>
+            <parameter type-id='type-id-1053' is-artificial='yes'/>
             <!-- artificial parameter of type 'int' -->
             <parameter type-id='type-id-1' is-artificial='yes'/>
             <!-- void -->
@@ -28031,7 +27640,7 @@
           <!-- void std::_List_base<ProfileHandlerToken*, std::allocator<ProfileHandlerToken*> >::_M_clear() -->
           <function-decl name='_M_clear' mangled-name='_ZNSt10_List_baseIP19ProfileHandlerTokenSaIS1_EE8_M_clearEv' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/list.tcc' line='64' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::_List_base<ProfileHandlerToken*, std::allocator<ProfileHandlerToken*> >*' -->
-            <parameter type-id='type-id-1059' is-artificial='yes'/>
+            <parameter type-id='type-id-1053' is-artificial='yes'/>
             <!-- void -->
             <return type-id='type-id-56'/>
           </function-decl>
@@ -28040,21 +27649,21 @@
           <!-- void std::_List_base<ProfileHandlerToken*, std::allocator<ProfileHandlerToken*> >::_M_init() -->
           <function-decl name='_M_init' mangled-name='_ZNSt10_List_baseIP19ProfileHandlerTokenSaIS1_EE7_M_initEv' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_list.h' line='366' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::_List_base<ProfileHandlerToken*, std::allocator<ProfileHandlerToken*> >*' -->
-            <parameter type-id='type-id-1059' is-artificial='yes'/>
+            <parameter type-id='type-id-1053' is-artificial='yes'/>
             <!-- void -->
             <return type-id='type-id-56'/>
           </function-decl>
         </member-function>
       </class-decl>
       <!-- class std::allocator<std::_List_node<ProfileHandlerToken*> > -->
-      <class-decl name='allocator&lt;std::_List_node&lt;ProfileHandlerToken*&gt; &gt;' size-in-bits='8' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/allocator.h' line='87' column='1' id='type-id-1053'>
+      <class-decl name='allocator&lt;std::_List_node&lt;ProfileHandlerToken*&gt; &gt;' size-in-bits='8' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/allocator.h' line='87' column='1' id='type-id-1047'>
         <!-- class __gnu_cxx::new_allocator<std::_List_node<ProfileHandlerToken*> > -->
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1031'/>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1025'/>
         <member-function access='private'>
           <!-- void std::allocator<std::_List_node<ProfileHandlerToken*> >::allocator() -->
           <function-decl name='allocator' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/allocator.h' line='101' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::allocator<std::_List_node<ProfileHandlerToken*> >*' -->
-            <parameter type-id='type-id-1071' is-artificial='yes'/>
+            <parameter type-id='type-id-1065' is-artificial='yes'/>
             <!-- void -->
             <return type-id='type-id-56'/>
           </function-decl>
@@ -28063,9 +27672,9 @@
           <!-- void std::allocator<std::_List_node<ProfileHandlerToken*> >::allocator(const std::allocator<std::_List_node<ProfileHandlerToken*> >&) -->
           <function-decl name='allocator' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/allocator.h' line='103' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::allocator<std::_List_node<ProfileHandlerToken*> >*' -->
-            <parameter type-id='type-id-1071' is-artificial='yes'/>
+            <parameter type-id='type-id-1065' is-artificial='yes'/>
             <!-- parameter of type 'const std::allocator<std::_List_node<ProfileHandlerToken*> >&' -->
-            <parameter type-id='type-id-1055'/>
+            <parameter type-id='type-id-1049'/>
             <!-- void -->
             <return type-id='type-id-56'/>
           </function-decl>
@@ -28074,7 +27683,7 @@
           <!-- std::allocator<std::_List_node<ProfileHandlerToken*> >::~allocator(int) -->
           <function-decl name='~allocator' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/allocator.h' line='109' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::allocator<std::_List_node<ProfileHandlerToken*> >*' -->
-            <parameter type-id='type-id-1071' is-artificial='yes'/>
+            <parameter type-id='type-id-1065' is-artificial='yes'/>
             <!-- artificial parameter of type 'int' -->
             <parameter type-id='type-id-1' is-artificial='yes'/>
             <!-- void -->
@@ -28083,16 +27692,16 @@
         </member-function>
       </class-decl>
       <!-- struct std::_List_node<ProfileHandlerToken*> -->
-      <class-decl name='_List_node&lt;ProfileHandlerToken*&gt;' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-1046'/>
+      <class-decl name='_List_node&lt;ProfileHandlerToken*&gt;' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-1040'/>
       <!-- class std::allocator<ProfileHandlerToken*> -->
-      <class-decl name='allocator&lt;ProfileHandlerToken*&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-1050'>
+      <class-decl name='allocator&lt;ProfileHandlerToken*&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-1044'>
         <!-- class __gnu_cxx::new_allocator<ProfileHandlerToken*> -->
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1029'/>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1023'/>
         <member-function access='private'>
           <!-- void std::allocator<ProfileHandlerToken*>::allocator() -->
           <function-decl name='allocator' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/allocator.h' line='101' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::allocator<ProfileHandlerToken*>*' -->
-            <parameter type-id='type-id-1069' is-artificial='yes'/>
+            <parameter type-id='type-id-1063' is-artificial='yes'/>
             <!-- void -->
             <return type-id='type-id-56'/>
           </function-decl>
@@ -28101,9 +27710,9 @@
           <!-- void std::allocator<ProfileHandlerToken*>::allocator(const std::allocator<ProfileHandlerToken*>&) -->
           <function-decl name='allocator' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/allocator.h' line='103' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::allocator<ProfileHandlerToken*>*' -->
-            <parameter type-id='type-id-1069' is-artificial='yes'/>
+            <parameter type-id='type-id-1063' is-artificial='yes'/>
             <!-- parameter of type 'const std::allocator<ProfileHandlerToken*>&' -->
-            <parameter type-id='type-id-1052'/>
+            <parameter type-id='type-id-1046'/>
             <!-- void -->
             <return type-id='type-id-56'/>
           </function-decl>
@@ -28112,7 +27721,7 @@
           <!-- std::allocator<ProfileHandlerToken*>::~allocator(int) -->
           <function-decl name='~allocator' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/allocator.h' line='109' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::allocator<ProfileHandlerToken*>*' -->
-            <parameter type-id='type-id-1069' is-artificial='yes'/>
+            <parameter type-id='type-id-1063' is-artificial='yes'/>
             <!-- artificial parameter of type 'int' -->
             <parameter type-id='type-id-1' is-artificial='yes'/>
             <!-- void -->
@@ -28123,30 +27732,30 @@
           <!-- void std::allocator<ProfileHandlerToken*>::allocator<std::_List_node<ProfileHandlerToken*> >(const std::allocator<std::_List_node<ProfileHandlerToken*> >&) -->
           <function-decl name='allocator&lt;std::_List_node&lt;ProfileHandlerToken*&gt; &gt;' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/allocator.h' line='107' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::allocator<ProfileHandlerToken*>*' -->
-            <parameter type-id='type-id-1069' is-artificial='yes'/>
+            <parameter type-id='type-id-1063' is-artificial='yes'/>
             <!-- parameter of type 'const std::allocator<std::_List_node<ProfileHandlerToken*> >&' -->
-            <parameter type-id='type-id-1055'/>
+            <parameter type-id='type-id-1049'/>
             <!-- void -->
             <return type-id='type-id-56'/>
           </function-decl>
         </member-function>
       </class-decl>
       <!-- struct std::_List_const_iterator<ProfileHandlerToken*> -->
-      <class-decl name='_List_const_iterator&lt;ProfileHandlerToken*&gt;' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-1075'/>
+      <class-decl name='_List_const_iterator&lt;ProfileHandlerToken*&gt;' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-1069'/>
       <!-- class std::reverse_iterator<std::_List_iterator<ProfileHandlerToken*> > -->
-      <class-decl name='reverse_iterator&lt;std::_List_iterator&lt;ProfileHandlerToken*&gt; &gt;' visibility='default' is-declaration-only='yes' id='type-id-1076'/>
+      <class-decl name='reverse_iterator&lt;std::_List_iterator&lt;ProfileHandlerToken*&gt; &gt;' visibility='default' is-declaration-only='yes' id='type-id-1070'/>
       <!-- class std::reverse_iterator<std::_List_const_iterator<ProfileHandlerToken*> > -->
-      <class-decl name='reverse_iterator&lt;std::_List_const_iterator&lt;ProfileHandlerToken*&gt; &gt;' visibility='default' is-declaration-only='yes' id='type-id-1077'/>
+      <class-decl name='reverse_iterator&lt;std::_List_const_iterator&lt;ProfileHandlerToken*&gt; &gt;' visibility='default' is-declaration-only='yes' id='type-id-1071'/>
     </namespace-decl>
     <!-- namespace __gnu_cxx -->
     <namespace-decl name='__gnu_cxx'>
       <!-- class __gnu_cxx::new_allocator<std::_List_node<ProfileHandlerToken*> > -->
-      <class-decl name='new_allocator&lt;std::_List_node&lt;ProfileHandlerToken*&gt; &gt;' size-in-bits='8' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/ext/new_allocator.h' line='52' column='1' id='type-id-1031'>
+      <class-decl name='new_allocator&lt;std::_List_node&lt;ProfileHandlerToken*&gt; &gt;' size-in-bits='8' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/ext/new_allocator.h' line='52' column='1' id='type-id-1025'>
         <member-function access='private'>
           <!-- void __gnu_cxx::new_allocator<std::_List_node<ProfileHandlerToken*> >::new_allocator() -->
           <function-decl name='new_allocator' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/ext/new_allocator.h' line='66' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type '__gnu_cxx::new_allocator<std::_List_node<ProfileHandlerToken*> >*' -->
-            <parameter type-id='type-id-1032' is-artificial='yes'/>
+            <parameter type-id='type-id-1026' is-artificial='yes'/>
             <!-- void -->
             <return type-id='type-id-56'/>
           </function-decl>
@@ -28155,9 +27764,9 @@
           <!-- void __gnu_cxx::new_allocator<std::_List_node<ProfileHandlerToken*> >::new_allocator(const __gnu_cxx::new_allocator<std::_List_node<ProfileHandlerToken*> >&) -->
           <function-decl name='new_allocator' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/ext/new_allocator.h' line='68' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type '__gnu_cxx::new_allocator<std::_List_node<ProfileHandlerToken*> >*' -->
-            <parameter type-id='type-id-1032' is-artificial='yes'/>
+            <parameter type-id='type-id-1026' is-artificial='yes'/>
             <!-- parameter of type 'const __gnu_cxx::new_allocator<std::_List_node<ProfileHandlerToken*> >&' -->
-            <parameter type-id='type-id-1038'/>
+            <parameter type-id='type-id-1032'/>
             <!-- void -->
             <return type-id='type-id-56'/>
           </function-decl>
@@ -28166,7 +27775,7 @@
           <!-- __gnu_cxx::new_allocator<std::_List_node<ProfileHandlerToken*> >::~new_allocator(int) -->
           <function-decl name='~new_allocator' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/ext/new_allocator.h' line='73' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type '__gnu_cxx::new_allocator<std::_List_node<ProfileHandlerToken*> >*' -->
-            <parameter type-id='type-id-1032' is-artificial='yes'/>
+            <parameter type-id='type-id-1026' is-artificial='yes'/>
             <!-- artificial parameter of type 'int' -->
             <parameter type-id='type-id-1' is-artificial='yes'/>
             <!-- void -->
@@ -28177,44 +27786,44 @@
           <!-- std::_List_node<ProfileHandlerToken*>* __gnu_cxx::new_allocator<std::_List_node<ProfileHandlerToken*> >::address(std::_List_node<ProfileHandlerToken*>&) -->
           <function-decl name='address' mangled-name='_ZNK9__gnu_cxx13new_allocatorISt10_List_nodeIP19ProfileHandlerTokenEE7addressERS4_' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/ext/new_allocator.h' line='76' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const __gnu_cxx::new_allocator<std::_List_node<ProfileHandlerToken*> >*' -->
-            <parameter type-id='type-id-1039' is-artificial='yes'/>
+            <parameter type-id='type-id-1033' is-artificial='yes'/>
             <!-- parameter of type 'std::_List_node<ProfileHandlerToken*>&' -->
-            <parameter type-id='type-id-1064'/>
+            <parameter type-id='type-id-1058'/>
             <!-- std::_List_node<ProfileHandlerToken*>* -->
-            <return type-id='type-id-1065'/>
+            <return type-id='type-id-1059'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <!-- const std::_List_node<ProfileHandlerToken*>* __gnu_cxx::new_allocator<std::_List_node<ProfileHandlerToken*> >::address(const std::_List_node<ProfileHandlerToken*>&) -->
           <function-decl name='address' mangled-name='_ZNK9__gnu_cxx13new_allocatorISt10_List_nodeIP19ProfileHandlerTokenEE7addressERKS4_' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/ext/new_allocator.h' line='79' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const __gnu_cxx::new_allocator<std::_List_node<ProfileHandlerToken*> >*' -->
-            <parameter type-id='type-id-1039' is-artificial='yes'/>
+            <parameter type-id='type-id-1033' is-artificial='yes'/>
             <!-- parameter of type 'const std::_List_node<ProfileHandlerToken*>&' -->
-            <parameter type-id='type-id-1048'/>
+            <parameter type-id='type-id-1042'/>
             <!-- const std::_List_node<ProfileHandlerToken*>* -->
-            <return type-id='type-id-1049'/>
+            <return type-id='type-id-1043'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <!-- std::_List_node<ProfileHandlerToken*>* __gnu_cxx::new_allocator<std::_List_node<ProfileHandlerToken*> >::allocate(unsigned long int, void*) -->
           <function-decl name='allocate' mangled-name='_ZN9__gnu_cxx13new_allocatorISt10_List_nodeIP19ProfileHandlerTokenEE8allocateEmPKv' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/ext/new_allocator.h' line='84' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type '__gnu_cxx::new_allocator<std::_List_node<ProfileHandlerToken*> >*' -->
-            <parameter type-id='type-id-1032' is-artificial='yes'/>
+            <parameter type-id='type-id-1026' is-artificial='yes'/>
             <!-- parameter of type 'unsigned long int' -->
             <parameter type-id='type-id-5'/>
             <!-- parameter of type 'void*' -->
             <parameter type-id='type-id-53'/>
             <!-- std::_List_node<ProfileHandlerToken*>* -->
-            <return type-id='type-id-1065'/>
+            <return type-id='type-id-1059'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <!-- void __gnu_cxx::new_allocator<std::_List_node<ProfileHandlerToken*> >::deallocate(std::_List_node<ProfileHandlerToken*>*, unsigned long int) -->
           <function-decl name='deallocate' mangled-name='_ZN9__gnu_cxx13new_allocatorISt10_List_nodeIP19ProfileHandlerTokenEE10deallocateEPS4_m' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/ext/new_allocator.h' line='94' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type '__gnu_cxx::new_allocator<std::_List_node<ProfileHandlerToken*> >*' -->
-            <parameter type-id='type-id-1032' is-artificial='yes'/>
+            <parameter type-id='type-id-1026' is-artificial='yes'/>
             <!-- parameter of type 'std::_List_node<ProfileHandlerToken*>*' -->
-            <parameter type-id='type-id-1065'/>
+            <parameter type-id='type-id-1059'/>
             <!-- parameter of type 'unsigned long int' -->
             <parameter type-id='type-id-5'/>
             <!-- void -->
@@ -28225,7 +27834,7 @@
           <!-- size_t __gnu_cxx::new_allocator<std::_List_node<ProfileHandlerToken*> >::max_size() -->
           <function-decl name='max_size' mangled-name='_ZNK9__gnu_cxx13new_allocatorISt10_List_nodeIP19ProfileHandlerTokenEE8max_sizeEv' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/ext/new_allocator.h' line='98' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const __gnu_cxx::new_allocator<std::_List_node<ProfileHandlerToken*> >*' -->
-            <parameter type-id='type-id-1039' is-artificial='yes'/>
+            <parameter type-id='type-id-1033' is-artificial='yes'/>
             <!-- typedef size_t -->
             <return type-id='type-id-57'/>
           </function-decl>
@@ -28234,11 +27843,11 @@
           <!-- void __gnu_cxx::new_allocator<std::_List_node<ProfileHandlerToken*> >::construct(std::_List_node<ProfileHandlerToken*>*, const std::_List_node<ProfileHandlerToken*>&) -->
           <function-decl name='construct' mangled-name='_ZN9__gnu_cxx13new_allocatorISt10_List_nodeIP19ProfileHandlerTokenEE9constructEPS4_RKS4_' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/ext/new_allocator.h' line='104' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type '__gnu_cxx::new_allocator<std::_List_node<ProfileHandlerToken*> >*' -->
-            <parameter type-id='type-id-1032' is-artificial='yes'/>
+            <parameter type-id='type-id-1026' is-artificial='yes'/>
             <!-- parameter of type 'std::_List_node<ProfileHandlerToken*>*' -->
-            <parameter type-id='type-id-1065'/>
+            <parameter type-id='type-id-1059'/>
             <!-- parameter of type 'const std::_List_node<ProfileHandlerToken*>&' -->
-            <parameter type-id='type-id-1048'/>
+            <parameter type-id='type-id-1042'/>
             <!-- void -->
             <return type-id='type-id-56'/>
           </function-decl>
@@ -28247,21 +27856,21 @@
           <!-- void __gnu_cxx::new_allocator<std::_List_node<ProfileHandlerToken*> >::destroy(std::_List_node<ProfileHandlerToken*>*) -->
           <function-decl name='destroy' mangled-name='_ZN9__gnu_cxx13new_allocatorISt10_List_nodeIP19ProfileHandlerTokenEE7destroyEPS4_' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/ext/new_allocator.h' line='115' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type '__gnu_cxx::new_allocator<std::_List_node<ProfileHandlerToken*> >*' -->
-            <parameter type-id='type-id-1032' is-artificial='yes'/>
+            <parameter type-id='type-id-1026' is-artificial='yes'/>
             <!-- parameter of type 'std::_List_node<ProfileHandlerToken*>*' -->
-            <parameter type-id='type-id-1065'/>
+            <parameter type-id='type-id-1059'/>
             <!-- void -->
             <return type-id='type-id-56'/>
           </function-decl>
         </member-function>
       </class-decl>
       <!-- class __gnu_cxx::new_allocator<ProfileHandlerToken*> -->
-      <class-decl name='new_allocator&lt;ProfileHandlerToken*&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-1029'>
+      <class-decl name='new_allocator&lt;ProfileHandlerToken*&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-1023'>
         <member-function access='private'>
           <!-- void __gnu_cxx::new_allocator<ProfileHandlerToken*>::new_allocator() -->
           <function-decl name='new_allocator' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/ext/new_allocator.h' line='66' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type '__gnu_cxx::new_allocator<ProfileHandlerToken*>*' -->
-            <parameter type-id='type-id-1030' is-artificial='yes'/>
+            <parameter type-id='type-id-1024' is-artificial='yes'/>
             <!-- void -->
             <return type-id='type-id-56'/>
           </function-decl>
@@ -28270,9 +27879,9 @@
           <!-- void __gnu_cxx::new_allocator<ProfileHandlerToken*>::new_allocator(const __gnu_cxx::new_allocator<ProfileHandlerToken*>&) -->
           <function-decl name='new_allocator' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/ext/new_allocator.h' line='68' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type '__gnu_cxx::new_allocator<ProfileHandlerToken*>*' -->
-            <parameter type-id='type-id-1030' is-artificial='yes'/>
+            <parameter type-id='type-id-1024' is-artificial='yes'/>
             <!-- parameter of type 'const __gnu_cxx::new_allocator<ProfileHandlerToken*>&' -->
-            <parameter type-id='type-id-1035'/>
+            <parameter type-id='type-id-1029'/>
             <!-- void -->
             <return type-id='type-id-56'/>
           </function-decl>
@@ -28281,7 +27890,7 @@
           <!-- __gnu_cxx::new_allocator<ProfileHandlerToken*>::~new_allocator(int) -->
           <function-decl name='~new_allocator' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/ext/new_allocator.h' line='73' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type '__gnu_cxx::new_allocator<ProfileHandlerToken*>*' -->
-            <parameter type-id='type-id-1030' is-artificial='yes'/>
+            <parameter type-id='type-id-1024' is-artificial='yes'/>
             <!-- artificial parameter of type 'int' -->
             <parameter type-id='type-id-1' is-artificial='yes'/>
             <!-- void -->
@@ -28292,44 +27901,44 @@
           <!-- ProfileHandlerToken** __gnu_cxx::new_allocator<ProfileHandlerToken*>::address(ProfileHandlerToken*&) -->
           <function-decl name='address' mangled-name='_ZNK9__gnu_cxx13new_allocatorIP19ProfileHandlerTokenE7addressERS2_' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/ext/new_allocator.h' line='76' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const __gnu_cxx::new_allocator<ProfileHandlerToken*>*' -->
-            <parameter type-id='type-id-1036' is-artificial='yes'/>
+            <parameter type-id='type-id-1030' is-artificial='yes'/>
             <!-- parameter of type 'ProfileHandlerToken*&' -->
-            <parameter type-id='type-id-1027'/>
+            <parameter type-id='type-id-1021'/>
             <!-- ProfileHandlerToken** -->
-            <return type-id='type-id-1028'/>
+            <return type-id='type-id-1022'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <!-- ProfileHandlerToken* const* __gnu_cxx::new_allocator<ProfileHandlerToken*>::address(ProfileHandlerToken* const&) -->
           <function-decl name='address' mangled-name='_ZNK9__gnu_cxx13new_allocatorIP19ProfileHandlerTokenE7addressERKS2_' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/ext/new_allocator.h' line='79' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const __gnu_cxx::new_allocator<ProfileHandlerToken*>*' -->
-            <parameter type-id='type-id-1036' is-artificial='yes'/>
+            <parameter type-id='type-id-1030' is-artificial='yes'/>
             <!-- parameter of type 'ProfileHandlerToken* const&' -->
-            <parameter type-id='type-id-1025'/>
+            <parameter type-id='type-id-1019'/>
             <!-- ProfileHandlerToken* const* -->
-            <return type-id='type-id-1026'/>
+            <return type-id='type-id-1020'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <!-- ProfileHandlerToken** __gnu_cxx::new_allocator<ProfileHandlerToken*>::allocate(unsigned long int, void*) -->
           <function-decl name='allocate' mangled-name='_ZN9__gnu_cxx13new_allocatorIP19ProfileHandlerTokenE8allocateEmPKv' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/ext/new_allocator.h' line='84' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type '__gnu_cxx::new_allocator<ProfileHandlerToken*>*' -->
-            <parameter type-id='type-id-1030' is-artificial='yes'/>
+            <parameter type-id='type-id-1024' is-artificial='yes'/>
             <!-- parameter of type 'unsigned long int' -->
             <parameter type-id='type-id-5'/>
             <!-- parameter of type 'void*' -->
             <parameter type-id='type-id-53'/>
             <!-- ProfileHandlerToken** -->
-            <return type-id='type-id-1028'/>
+            <return type-id='type-id-1022'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <!-- void __gnu_cxx::new_allocator<ProfileHandlerToken*>::deallocate(ProfileHandlerToken**, unsigned long int) -->
           <function-decl name='deallocate' mangled-name='_ZN9__gnu_cxx13new_allocatorIP19ProfileHandlerTokenE10deallocateEPS2_m' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/ext/new_allocator.h' line='94' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type '__gnu_cxx::new_allocator<ProfileHandlerToken*>*' -->
-            <parameter type-id='type-id-1030' is-artificial='yes'/>
+            <parameter type-id='type-id-1024' is-artificial='yes'/>
             <!-- parameter of type 'ProfileHandlerToken**' -->
-            <parameter type-id='type-id-1028'/>
+            <parameter type-id='type-id-1022'/>
             <!-- parameter of type 'unsigned long int' -->
             <parameter type-id='type-id-5'/>
             <!-- void -->
@@ -28340,7 +27949,7 @@
           <!-- size_t __gnu_cxx::new_allocator<ProfileHandlerToken*>::max_size() -->
           <function-decl name='max_size' mangled-name='_ZNK9__gnu_cxx13new_allocatorIP19ProfileHandlerTokenE8max_sizeEv' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/ext/new_allocator.h' line='98' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const __gnu_cxx::new_allocator<ProfileHandlerToken*>*' -->
-            <parameter type-id='type-id-1036' is-artificial='yes'/>
+            <parameter type-id='type-id-1030' is-artificial='yes'/>
             <!-- typedef size_t -->
             <return type-id='type-id-57'/>
           </function-decl>
@@ -28349,11 +27958,11 @@
           <!-- void __gnu_cxx::new_allocator<ProfileHandlerToken*>::construct(ProfileHandlerToken**, ProfileHandlerToken* const&) -->
           <function-decl name='construct' mangled-name='_ZN9__gnu_cxx13new_allocatorIP19ProfileHandlerTokenE9constructEPS2_RKS2_' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/ext/new_allocator.h' line='104' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type '__gnu_cxx::new_allocator<ProfileHandlerToken*>*' -->
-            <parameter type-id='type-id-1030' is-artificial='yes'/>
+            <parameter type-id='type-id-1024' is-artificial='yes'/>
             <!-- parameter of type 'ProfileHandlerToken**' -->
-            <parameter type-id='type-id-1028'/>
+            <parameter type-id='type-id-1022'/>
             <!-- parameter of type 'ProfileHandlerToken* const&' -->
-            <parameter type-id='type-id-1025'/>
+            <parameter type-id='type-id-1019'/>
             <!-- void -->
             <return type-id='type-id-56'/>
           </function-decl>
@@ -28362,9 +27971,9 @@
           <!-- void __gnu_cxx::new_allocator<ProfileHandlerToken*>::destroy(ProfileHandlerToken**) -->
           <function-decl name='destroy' mangled-name='_ZN9__gnu_cxx13new_allocatorIP19ProfileHandlerTokenE7destroyEPS2_' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/ext/new_allocator.h' line='115' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type '__gnu_cxx::new_allocator<ProfileHandlerToken*>*' -->
-            <parameter type-id='type-id-1030' is-artificial='yes'/>
+            <parameter type-id='type-id-1024' is-artificial='yes'/>
             <!-- parameter of type 'ProfileHandlerToken**' -->
-            <parameter type-id='type-id-1028'/>
+            <parameter type-id='type-id-1022'/>
             <!-- void -->
             <return type-id='type-id-56'/>
           </function-decl>
@@ -28374,7 +27983,7 @@
     <!-- void ProfileHandlerGetState(ProfileHandlerState*) -->
     <function-decl name='ProfileHandlerGetState' mangled-name='ProfileHandlerGetState' filepath='src/profile-handler.cc' line='658' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='ProfileHandlerGetState'>
       <!-- parameter of type 'ProfileHandlerState*' -->
-      <parameter type-id='type-id-1020' name='state' filepath='src/profile-handler.cc' line='658' column='1'/>
+      <parameter type-id='type-id-1014' name='state' filepath='src/profile-handler.cc' line='658' column='1'/>
       <!-- void -->
       <return type-id='type-id-56'/>
     </function-decl>
@@ -28386,18 +27995,18 @@
     <!-- void ProfileHandlerUnregisterCallback(ProfileHandlerToken*) -->
     <function-decl name='ProfileHandlerUnregisterCallback' mangled-name='ProfileHandlerUnregisterCallback' filepath='src/profile-handler.cc' line='650' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='ProfileHandlerUnregisterCallback'>
       <!-- parameter of type 'ProfileHandlerToken*' -->
-      <parameter type-id='type-id-1019' name='token' filepath='src/profile-handler.cc' line='650' column='1'/>
+      <parameter type-id='type-id-1013' name='token' filepath='src/profile-handler.cc' line='650' column='1'/>
       <!-- void -->
       <return type-id='type-id-56'/>
     </function-decl>
     <!-- ProfileHandlerToken* ProfileHandlerRegisterCallback(ProfileHandlerCallback, void*) -->
     <function-decl name='ProfileHandlerRegisterCallback' mangled-name='ProfileHandlerRegisterCallback' filepath='src/profile-handler.cc' line='645' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='ProfileHandlerRegisterCallback'>
       <!-- parameter of type 'typedef ProfileHandlerCallback' -->
-      <parameter type-id='type-id-1006' name='callback' filepath='src/profile-handler.cc' line='646' column='1'/>
+      <parameter type-id='type-id-1000' name='callback' filepath='src/profile-handler.cc' line='646' column='1'/>
       <!-- parameter of type 'void*' -->
       <parameter type-id='type-id-53' name='callback_arg' filepath='src/profile-handler.cc' line='646' column='1'/>
       <!-- ProfileHandlerToken* -->
-      <return type-id='type-id-1019'/>
+      <return type-id='type-id-1013'/>
     </function-decl>
     <!-- void ProfileHandlerRegisterThread() -->
     <function-decl name='ProfileHandlerRegisterThread' mangled-name='ProfileHandlerRegisterThread' filepath='src/profile-handler.cc' line='641' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='ProfileHandlerRegisterThread'>
@@ -28405,11 +28014,11 @@
       <return type-id='type-id-56'/>
     </function-decl>
     <!-- void (int, siginfo_t*, void*, void*) -->
-    <function-type size-in-bits='64' id='type-id-1074'>
+    <function-type size-in-bits='64' id='type-id-1068'>
       <!-- parameter of type 'int' -->
       <parameter type-id='type-id-1'/>
       <!-- parameter of type 'siginfo_t*' -->
-      <parameter type-id='type-id-1021'/>
+      <parameter type-id='type-id-1015'/>
       <!-- parameter of type 'void*' -->
       <parameter type-id='type-id-53'/>
       <!-- parameter of type 'void*' -->
@@ -28422,30 +28031,30 @@
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='src/profiler.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-kFgaKP/gperftools-2.4' language='LANG_C_plus_plus'>
     <!-- Slot[64] -->
-    <array-type-def dimensions='1' type-id='type-id-1078' size-in-bits='4096' id='type-id-1079'>
+    <array-type-def dimensions='1' type-id='type-id-1072' size-in-bits='4096' id='type-id-1073'>
       <!-- <anonymous range>[64] -->
-      <subrange length='64' type-id='type-id-5' id='type-id-1080'/>
+      <subrange length='64' type-id='type-id-5' id='type-id-1074'/>
     </array-type-def>
     <!-- Entry[4] -->
-    <array-type-def dimensions='1' type-id='type-id-1081' size-in-bits='16896' id='type-id-1082'>
+    <array-type-def dimensions='1' type-id='type-id-1075' size-in-bits='16896' id='type-id-1076'>
       <!-- <anonymous range>[4] -->
       <subrange length='4' type-id='type-id-5' id='type-id-126'/>
     </array-type-def>
     <!-- char[1024] -->
-    <array-type-def dimensions='1' type-id='type-id-66' size-in-bits='8192' id='type-id-1083'>
+    <array-type-def dimensions='1' type-id='type-id-66' size-in-bits='8192' id='type-id-1077'>
       <!-- <anonymous range>[1024] -->
-      <subrange length='1024' type-id='type-id-5' id='type-id-1084'/>
+      <subrange length='1024' type-id='type-id-5' id='type-id-1078'/>
     </array-type-def>
     <!-- int[28] -->
-    <array-type-def dimensions='1' type-id='type-id-1' size-in-bits='896' id='type-id-1085'>
+    <array-type-def dimensions='1' type-id='type-id-1' size-in-bits='896' id='type-id-1079'>
       <!-- <anonymous range>[28] -->
-      <subrange length='28' type-id='type-id-5' id='type-id-1086'/>
+      <subrange length='28' type-id='type-id-5' id='type-id-1080'/>
     </array-type-def>
     <!-- class ProfileData -->
-    <class-decl name='ProfileData' size-in-bits='448' visibility='default' filepath='src/profiledata.h' line='79' column='1' id='type-id-1087'>
+    <class-decl name='ProfileData' size-in-bits='448' visibility='default' filepath='src/profiledata.h' line='79' column='1' id='type-id-1081'>
       <member-type access='private'>
         <!-- class ProfileData::Options -->
-        <class-decl name='Options' size-in-bits='32' visibility='default' filepath='src/profiledata.h' line='88' column='1' id='type-id-1088'>
+        <class-decl name='Options' size-in-bits='32' visibility='default' filepath='src/profiledata.h' line='88' column='1' id='type-id-1082'>
           <data-member access='private' layout-offset-in-bits='0'>
             <!-- int ProfileData::Options::frequency_ -->
             <var-decl name='frequency_' type-id='type-id-1' visibility='default' filepath='src/profiledata.h' line='101' column='1'/>
@@ -28454,7 +28063,7 @@
             <!-- ProfileData::Options::Options() -->
             <function-decl name='Options' mangled-name='_ZN11ProfileData7OptionsC1Ev' filepath='src/profiledata.h' line='90' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN11ProfileData7OptionsC1Ev'>
               <!-- implicit parameter of type 'ProfileData::Options*' -->
-              <parameter type-id='type-id-1089' is-artificial='yes'/>
+              <parameter type-id='type-id-1083' is-artificial='yes'/>
               <!-- void -->
               <return type-id='type-id-56'/>
             </function-decl>
@@ -28463,7 +28072,7 @@
             <!-- int ProfileData::Options::frequency() -->
             <function-decl name='frequency' mangled-name='_ZNK11ProfileData7Options9frequencyEv' filepath='src/profiledata.h' line='93' column='1' visibility='default' binding='global' size-in-bits='64'>
               <!-- implicit parameter of type 'const ProfileData::Options*' -->
-              <parameter type-id='type-id-1090' is-artificial='yes'/>
+              <parameter type-id='type-id-1084' is-artificial='yes'/>
               <!-- int -->
               <return type-id='type-id-1'/>
             </function-decl>
@@ -28472,7 +28081,7 @@
             <!-- void ProfileData::Options::set_frequency(int) -->
             <function-decl name='set_frequency' mangled-name='_ZN11ProfileData7Options13set_frequencyEi' filepath='src/profiledata.h' line='96' column='1' visibility='default' binding='global' size-in-bits='64'>
               <!-- implicit parameter of type 'ProfileData::Options*' -->
-              <parameter type-id='type-id-1089' is-artificial='yes'/>
+              <parameter type-id='type-id-1083' is-artificial='yes'/>
               <!-- parameter of type 'int' -->
               <parameter type-id='type-id-1'/>
               <!-- void -->
@@ -28483,18 +28092,18 @@
       </member-type>
       <member-type access='private'>
         <!-- struct ProfileData::State -->
-        <class-decl name='State' size-in-bits='8384' is-struct='yes' visibility='default' filepath='src/profiledata.h' line='81' column='1' id='type-id-1091'>
+        <class-decl name='State' size-in-bits='8384' is-struct='yes' visibility='default' filepath='src/profiledata.h' line='81' column='1' id='type-id-1085'>
           <data-member access='public' layout-offset-in-bits='0'>
             <!-- bool ProfileData::State::enabled -->
             <var-decl name='enabled' type-id='type-id-55' visibility='default' filepath='src/profiledata.h' line='82' column='1'/>
           </data-member>
           <data-member access='public' layout-offset-in-bits='64'>
             <!-- time_t ProfileData::State::start_time -->
-            <var-decl name='start_time' type-id='type-id-1092' visibility='default' filepath='src/profiledata.h' line='83' column='1'/>
+            <var-decl name='start_time' type-id='type-id-1086' visibility='default' filepath='src/profiledata.h' line='83' column='1'/>
           </data-member>
           <data-member access='public' layout-offset-in-bits='128'>
             <!-- char ProfileData::State::profile_name[1024] -->
-            <var-decl name='profile_name' type-id='type-id-1083' visibility='default' filepath='src/profiledata.h' line='84' column='1'/>
+            <var-decl name='profile_name' type-id='type-id-1077' visibility='default' filepath='src/profiledata.h' line='84' column='1'/>
           </data-member>
           <data-member access='public' layout-offset-in-bits='8320'>
             <!-- int ProfileData::State::samples_gathered -->
@@ -28504,31 +28113,31 @@
       </member-type>
       <member-type access='private'>
         <!-- struct ProfileData::Entry -->
-        <class-decl name='Entry' size-in-bits='4224' is-struct='yes' visibility='default' filepath='src/profiledata.h' line='154' column='1' id='type-id-1081'>
+        <class-decl name='Entry' size-in-bits='4224' is-struct='yes' visibility='default' filepath='src/profiledata.h' line='154' column='1' id='type-id-1075'>
           <member-type access='private'>
             <!-- typedef uintptr_t ProfileData::Entry::Slot -->
-            <typedef-decl name='Slot' type-id='type-id-130' filepath='src/profiledata.h' line='151' column='1' id='type-id-1078'/>
+            <typedef-decl name='Slot' type-id='type-id-130' filepath='src/profiledata.h' line='151' column='1' id='type-id-1072'/>
           </member-type>
           <data-member access='public' layout-offset-in-bits='0'>
             <!-- ProfileData::Entry::Slot ProfileData::Entry::count -->
-            <var-decl name='count' type-id='type-id-1078' visibility='default' filepath='src/profiledata.h' line='155' column='1'/>
+            <var-decl name='count' type-id='type-id-1072' visibility='default' filepath='src/profiledata.h' line='155' column='1'/>
           </data-member>
           <data-member access='public' layout-offset-in-bits='64'>
             <!-- ProfileData::Entry::Slot ProfileData::Entry::depth -->
-            <var-decl name='depth' type-id='type-id-1078' visibility='default' filepath='src/profiledata.h' line='156' column='1'/>
+            <var-decl name='depth' type-id='type-id-1072' visibility='default' filepath='src/profiledata.h' line='156' column='1'/>
           </data-member>
           <data-member access='public' layout-offset-in-bits='128'>
             <!-- ProfileData::Entry::Slot ProfileData::Entry::stack[64] -->
-            <var-decl name='stack' type-id='type-id-1079' visibility='default' filepath='src/profiledata.h' line='157' column='1'/>
+            <var-decl name='stack' type-id='type-id-1073' visibility='default' filepath='src/profiledata.h' line='157' column='1'/>
           </data-member>
         </class-decl>
       </member-type>
       <member-type access='private'>
         <!-- struct ProfileData::Bucket -->
-        <class-decl name='Bucket' size-in-bits='16896' is-struct='yes' visibility='default' filepath='src/profiledata.h' line='161' column='1' id='type-id-1093'>
+        <class-decl name='Bucket' size-in-bits='16896' is-struct='yes' visibility='default' filepath='src/profiledata.h' line='161' column='1' id='type-id-1087'>
           <data-member access='public' layout-offset-in-bits='0'>
             <!-- ProfileData::Entry ProfileData::Bucket::entry[4] -->
-            <var-decl name='entry' type-id='type-id-1082' visibility='default' filepath='src/profiledata.h' line='162' column='1'/>
+            <var-decl name='entry' type-id='type-id-1076' visibility='default' filepath='src/profiledata.h' line='162' column='1'/>
           </data-member>
         </class-decl>
       </member-type>
@@ -28550,11 +28159,11 @@
       </data-member>
       <data-member access='private' layout-offset-in-bits='0'>
         <!-- ProfileData::Bucket* ProfileData::hash_ -->
-        <var-decl name='hash_' type-id='type-id-1094' visibility='default' filepath='src/profiledata.h' line='165' column='1'/>
+        <var-decl name='hash_' type-id='type-id-1088' visibility='default' filepath='src/profiledata.h' line='165' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='64'>
         <!-- ProfileData::Entry::Slot* ProfileData::evict_ -->
-        <var-decl name='evict_' type-id='type-id-1095' visibility='default' filepath='src/profiledata.h' line='166' column='1'/>
+        <var-decl name='evict_' type-id='type-id-1089' visibility='default' filepath='src/profiledata.h' line='166' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='128'>
         <!-- int ProfileData::num_evicted_ -->
@@ -28582,13 +28191,13 @@
       </data-member>
       <data-member access='private' layout-offset-in-bits='384'>
         <!-- time_t ProfileData::start_time_ -->
-        <var-decl name='start_time_' type-id='type-id-1092' visibility='default' filepath='src/profiledata.h' line='173' column='1'/>
+        <var-decl name='start_time_' type-id='type-id-1086' visibility='default' filepath='src/profiledata.h' line='173' column='1'/>
       </data-member>
       <member-function access='private' constructor='yes'>
         <!-- ProfileData::ProfileData() -->
         <function-decl name='ProfileData' mangled-name='_ZN11ProfileDataC1Ev' filepath='src/profiledata.h' line='106' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN11ProfileDataC1Ev'>
           <!-- implicit parameter of type 'ProfileData*' -->
-          <parameter type-id='type-id-1096' is-artificial='yes'/>
+          <parameter type-id='type-id-1090' is-artificial='yes'/>
           <!-- void -->
           <return type-id='type-id-56'/>
         </function-decl>
@@ -28597,7 +28206,7 @@
         <!-- ProfileData::~ProfileData(int) -->
         <function-decl name='~ProfileData' mangled-name='_ZN11ProfileDataD1Ev' filepath='src/profiledata.h' line='107' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN11ProfileDataD1Ev'>
           <!-- implicit parameter of type 'ProfileData*' -->
-          <parameter type-id='type-id-1096' is-artificial='yes'/>
+          <parameter type-id='type-id-1090' is-artificial='yes'/>
           <!-- artificial parameter of type 'int' -->
           <parameter type-id='type-id-1' is-artificial='yes'/>
           <!-- void -->
@@ -28608,11 +28217,11 @@
         <!-- bool ProfileData::Start(const char*, const ProfileData::Options&) -->
         <function-decl name='Start' mangled-name='_ZN11ProfileData5StartEPKcRKNS_7OptionsE' filepath='src/profiledata.h' line='116' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN11ProfileData5StartEPKcRKNS_7OptionsE'>
           <!-- implicit parameter of type 'ProfileData*' -->
-          <parameter type-id='type-id-1096' is-artificial='yes'/>
+          <parameter type-id='type-id-1090' is-artificial='yes'/>
           <!-- parameter of type 'const char*' -->
           <parameter type-id='type-id-52'/>
           <!-- parameter of type 'const ProfileData::Options&' -->
-          <parameter type-id='type-id-1097'/>
+          <parameter type-id='type-id-1091'/>
           <!-- bool -->
           <return type-id='type-id-55'/>
         </function-decl>
@@ -28621,7 +28230,7 @@
         <!-- void ProfileData::Stop() -->
         <function-decl name='Stop' mangled-name='_ZN11ProfileData4StopEv' filepath='src/profiledata.h' line='120' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN11ProfileData4StopEv'>
           <!-- implicit parameter of type 'ProfileData*' -->
-          <parameter type-id='type-id-1096' is-artificial='yes'/>
+          <parameter type-id='type-id-1090' is-artificial='yes'/>
           <!-- void -->
           <return type-id='type-id-56'/>
         </function-decl>
@@ -28630,7 +28239,7 @@
         <!-- void ProfileData::Reset() -->
         <function-decl name='Reset' mangled-name='_ZN11ProfileData5ResetEv' filepath='src/profiledata.h' line='124' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN11ProfileData5ResetEv'>
           <!-- implicit parameter of type 'ProfileData*' -->
-          <parameter type-id='type-id-1096' is-artificial='yes'/>
+          <parameter type-id='type-id-1090' is-artificial='yes'/>
           <!-- void -->
           <return type-id='type-id-56'/>
         </function-decl>
@@ -28639,7 +28248,7 @@
         <!-- void ProfileData::Add(int, void* const*) -->
         <function-decl name='Add' mangled-name='_ZN11ProfileData3AddEiPKPKv' filepath='src/profiledata.h' line='133' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN11ProfileData3AddEiPKPKv'>
           <!-- implicit parameter of type 'ProfileData*' -->
-          <parameter type-id='type-id-1096' is-artificial='yes'/>
+          <parameter type-id='type-id-1090' is-artificial='yes'/>
           <!-- parameter of type 'int' -->
           <parameter type-id='type-id-1'/>
           <!-- parameter of type 'void* const*' -->
@@ -28652,7 +28261,7 @@
         <!-- void ProfileData::FlushTable() -->
         <function-decl name='FlushTable' mangled-name='_ZN11ProfileData10FlushTableEv' filepath='src/profiledata.h' line='137' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN11ProfileData10FlushTableEv'>
           <!-- implicit parameter of type 'ProfileData*' -->
-          <parameter type-id='type-id-1096' is-artificial='yes'/>
+          <parameter type-id='type-id-1090' is-artificial='yes'/>
           <!-- void -->
           <return type-id='type-id-56'/>
         </function-decl>
@@ -28661,7 +28270,7 @@
         <!-- bool ProfileData::enabled() -->
         <function-decl name='enabled' mangled-name='_ZNK11ProfileData7enabledEv' filepath='src/profiledata.h' line='140' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'const ProfileData*' -->
-          <parameter type-id='type-id-1098' is-artificial='yes'/>
+          <parameter type-id='type-id-1092' is-artificial='yes'/>
           <!-- bool -->
           <return type-id='type-id-55'/>
         </function-decl>
@@ -28670,9 +28279,9 @@
         <!-- void ProfileData::GetCurrentState(ProfileData::State*) -->
         <function-decl name='GetCurrentState' mangled-name='_ZNK11ProfileData15GetCurrentStateEPNS_5StateE' filepath='src/profiledata.h' line='143' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNK11ProfileData15GetCurrentStateEPNS_5StateE'>
           <!-- implicit parameter of type 'const ProfileData*' -->
-          <parameter type-id='type-id-1098' is-artificial='yes'/>
+          <parameter type-id='type-id-1092' is-artificial='yes'/>
           <!-- parameter of type 'ProfileData::State*' -->
-          <parameter type-id='type-id-1099'/>
+          <parameter type-id='type-id-1093'/>
           <!-- void -->
           <return type-id='type-id-56'/>
         </function-decl>
@@ -28681,9 +28290,9 @@
         <!-- void ProfileData::Evict(const ProfileData::Entry&) -->
         <function-decl name='Evict' mangled-name='_ZN11ProfileData5EvictERKNS_5EntryE' filepath='src/profiledata.h' line='176' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN11ProfileData5EvictERKNS_5EntryE'>
           <!-- implicit parameter of type 'ProfileData*' -->
-          <parameter type-id='type-id-1096' is-artificial='yes'/>
+          <parameter type-id='type-id-1090' is-artificial='yes'/>
           <!-- parameter of type 'const ProfileData::Entry&' -->
-          <parameter type-id='type-id-1100'/>
+          <parameter type-id='type-id-1094'/>
           <!-- void -->
           <return type-id='type-id-56'/>
         </function-decl>
@@ -28692,7 +28301,7 @@
         <!-- void ProfileData::FlushEvicted() -->
         <function-decl name='FlushEvicted' mangled-name='_ZN11ProfileData12FlushEvictedEv' filepath='src/profiledata.h' line='179' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN11ProfileData12FlushEvictedEv'>
           <!-- implicit parameter of type 'ProfileData*' -->
-          <parameter type-id='type-id-1096' is-artificial='yes'/>
+          <parameter type-id='type-id-1090' is-artificial='yes'/>
           <!-- void -->
           <return type-id='type-id-56'/>
         </function-decl>
@@ -28701,9 +28310,9 @@
         <!-- ProfileData::ProfileData(const ProfileData&) -->
         <function-decl name='ProfileData' filepath='src/profiledata.h' line='181' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'ProfileData*' -->
-          <parameter type-id='type-id-1096' is-artificial='yes'/>
+          <parameter type-id='type-id-1090' is-artificial='yes'/>
           <!-- parameter of type 'const ProfileData&' -->
-          <parameter type-id='type-id-1101'/>
+          <parameter type-id='type-id-1095'/>
           <!-- void -->
           <return type-id='type-id-56'/>
         </function-decl>
@@ -28712,19 +28321,19 @@
         <!-- void ProfileData::operator=(const ProfileData&) -->
         <function-decl name='operator=' mangled-name='_ZN11ProfileDataaSERKS_' filepath='src/profiledata.h' line='181' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'ProfileData*' -->
-          <parameter type-id='type-id-1096' is-artificial='yes'/>
+          <parameter type-id='type-id-1090' is-artificial='yes'/>
           <!-- parameter of type 'const ProfileData&' -->
-          <parameter type-id='type-id-1101'/>
+          <parameter type-id='type-id-1095'/>
           <!-- void -->
           <return type-id='type-id-56'/>
         </function-decl>
       </member-function>
     </class-decl>
     <!-- struct ProfileHandlerToken -->
-    <class-decl name='ProfileHandlerToken' size-in-bits='128' is-struct='yes' visibility='default' filepath='src/profile-handler.cc' line='69' column='1' id='type-id-1102'>
+    <class-decl name='ProfileHandlerToken' size-in-bits='128' is-struct='yes' visibility='default' filepath='src/profile-handler.cc' line='69' column='1' id='type-id-1096'>
       <data-member access='public' layout-offset-in-bits='0'>
         <!-- ProfileHandlerCallback ProfileHandlerToken::callback -->
-        <var-decl name='callback' type-id='type-id-1006' visibility='default' filepath='src/profile-handler.cc' line='77' column='1'/>
+        <var-decl name='callback' type-id='type-id-1000' visibility='default' filepath='src/profile-handler.cc' line='77' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
         <!-- void* ProfileHandlerToken::callback_arg -->
@@ -28734,9 +28343,9 @@
         <!-- ProfileHandlerToken::ProfileHandlerToken(ProfileHandlerCallback, void*) -->
         <function-decl name='ProfileHandlerToken' filepath='src/profile-handler.cc' line='71' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'ProfileHandlerToken*' -->
-          <parameter type-id='type-id-1019' is-artificial='yes'/>
+          <parameter type-id='type-id-1013' is-artificial='yes'/>
           <!-- parameter of type 'typedef ProfileHandlerCallback' -->
-          <parameter type-id='type-id-1006'/>
+          <parameter type-id='type-id-1000'/>
           <!-- parameter of type 'void*' -->
           <parameter type-id='type-id-53'/>
           <!-- void -->
@@ -28745,30 +28354,30 @@
       </member-function>
     </class-decl>
     <!-- typedef __time_t time_t -->
-    <typedef-decl name='time_t' type-id='type-id-1103' filepath='/usr/include/time.h' line='76' column='1' id='type-id-1092'/>
+    <typedef-decl name='time_t' type-id='type-id-1097' filepath='/usr/include/time.h' line='76' column='1' id='type-id-1086'/>
     <!-- typedef long int __time_t -->
-    <typedef-decl name='__time_t' type-id='type-id-285' filepath='/usr/include/bits/types.h' line='149' column='1' id='type-id-1103'/>
+    <typedef-decl name='__time_t' type-id='type-id-285' filepath='/usr/include/bits/types.h' line='149' column='1' id='type-id-1097'/>
     <!-- struct siginfo -->
-    <class-decl name='siginfo' size-in-bits='1024' is-struct='yes' visibility='default' filepath='/usr/include/bits/siginfo.h' line='52' column='1' id='type-id-1104'>
+    <class-decl name='siginfo' size-in-bits='1024' is-struct='yes' visibility='default' filepath='/usr/include/bits/siginfo.h' line='52' column='1' id='type-id-1098'>
       <member-type access='public'>
         <!-- union {int _pad[28]; struct {__pid_t si_pid; __uid_t si_uid;} _kill; struct {int si_tid; int si_overrun; sigval_t si_sigval;} _timer; struct {__pid_t si_pid; __uid_t si_uid; sigval_t si_sigval;} _rt; struct {__pid_t si_pid; __uid_t si_uid; int si_status; __clock_t si_utime; __clock_t si_stime;} _sigchld; struct {void* si_addr;} _sigfault; struct {long int si_band; int si_fd;} _sigpoll;} -->
-        <union-decl name='__anonymous_union__' size-in-bits='896' is-anonymous='yes' visibility='default' filepath='/usr/include/bits/siginfo.h' line='59' column='1' id='type-id-1105'>
+        <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-1099'>
           <member-type access='private'>
             <!-- 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-1106'>
+            <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-1100'>
               <data-member access='public' layout-offset-in-bits='0'>
                 <!-- __pid_t si_pid -->
                 <var-decl name='si_pid' type-id='type-id-60' visibility='default' filepath='/usr/include/bits/siginfo.h' line='65' column='1'/>
               </data-member>
               <data-member access='public' layout-offset-in-bits='32'>
                 <!-- __uid_t si_uid -->
-                <var-decl name='si_uid' type-id='type-id-1107' visibility='default' filepath='/usr/include/bits/siginfo.h' line='66' column='1'/>
+                <var-decl name='si_uid' type-id='type-id-1101' visibility='default' filepath='/usr/include/bits/siginfo.h' line='66' column='1'/>
               </data-member>
             </class-decl>
           </member-type>
           <member-type access='private'>
             <!-- 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-1108'>
+            <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-1102'>
               <data-member access='public' layout-offset-in-bits='0'>
                 <!-- int si_tid -->
                 <var-decl name='si_tid' type-id='type-id-1' visibility='default' filepath='/usr/include/bits/siginfo.h' line='72' column='1'/>
@@ -28779,37 +28388,37 @@
               </data-member>
               <data-member access='public' layout-offset-in-bits='64'>
                 <!-- sigval_t si_sigval -->
-                <var-decl name='si_sigval' type-id='type-id-1109' visibility='default' filepath='/usr/include/bits/siginfo.h' line='74' column='1'/>
+                <var-decl name='si_sigval' type-id='type-id-1103' visibility='default' filepath='/usr/include/bits/siginfo.h' line='74' column='1'/>
               </data-member>
             </class-decl>
           </member-type>
           <member-type access='private'>
             <!-- 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-1110'>
+            <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-1104'>
               <data-member access='public' layout-offset-in-bits='0'>
                 <!-- __pid_t si_pid -->
                 <var-decl name='si_pid' type-id='type-id-60' visibility='default' filepath='/usr/include/bits/siginfo.h' line='80' column='1'/>
               </data-member>
               <data-member access='public' layout-offset-in-bits='32'>
                 <!-- __uid_t si_uid -->
-                <var-decl name='si_uid' type-id='type-id-1107' visibility='default' filepath='/usr/include/bits/siginfo.h' line='81' column='1'/>
+                <var-decl name='si_uid' type-id='type-id-1101' visibility='default' filepath='/usr/include/bits/siginfo.h' line='81' column='1'/>
               </data-member>
               <data-member access='public' layout-offset-in-bits='64'>
                 <!-- sigval_t si_sigval -->
-                <var-decl name='si_sigval' type-id='type-id-1109' visibility='default' filepath='/usr/include/bits/siginfo.h' line='82' column='1'/>
+                <var-decl name='si_sigval' type-id='type-id-1103' visibility='default' filepath='/usr/include/bits/siginfo.h' line='82' column='1'/>
               </data-member>
             </class-decl>
           </member-type>
           <member-type access='private'>
             <!-- 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-1111'>
+            <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-1105'>
               <data-member access='public' layout-offset-in-bits='0'>
                 <!-- __pid_t si_pid -->
                 <var-decl name='si_pid' type-id='type-id-60' visibility='default' filepath='/usr/include/bits/siginfo.h' line='88' column='1'/>
               </data-member>
               <data-member access='public' layout-offset-in-bits='32'>
                 <!-- __uid_t si_uid -->
-                <var-decl name='si_uid' type-id='type-id-1107' visibility='default' filepath='/usr/include/bits/siginfo.h' line='89' column='1'/>
+                <var-decl name='si_uid' type-id='type-id-1101' visibility='default' filepath='/usr/include/bits/siginfo.h' line='89' column='1'/>
               </data-member>
               <data-member access='public' layout-offset-in-bits='64'>
                 <!-- int si_status -->
@@ -28817,17 +28426,17 @@
               </data-member>
               <data-member access='public' layout-offset-in-bits='128'>
                 <!-- __clock_t si_utime -->
-                <var-decl name='si_utime' type-id='type-id-1112' visibility='default' filepath='/usr/include/bits/siginfo.h' line='91' column='1'/>
+                <var-decl name='si_utime' type-id='type-id-1106' visibility='default' filepath='/usr/include/bits/siginfo.h' line='91' column='1'/>
               </data-member>
               <data-member access='public' layout-offset-in-bits='192'>
                 <!-- __clock_t si_stime -->
-                <var-decl name='si_stime' type-id='type-id-1112' visibility='default' filepath='/usr/include/bits/siginfo.h' line='92' column='1'/>
+                <var-decl name='si_stime' type-id='type-id-1106' visibility='default' filepath='/usr/include/bits/siginfo.h' line='92' column='1'/>
               </data-member>
             </class-decl>
           </member-type>
           <member-type access='private'>
             <!-- 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-1113'>
+            <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-1107'>
               <data-member access='public' layout-offset-in-bits='0'>
                 <!-- void* si_addr -->
                 <var-decl name='si_addr' type-id='type-id-53' visibility='default' filepath='/usr/include/bits/siginfo.h' line='98' column='1'/>
@@ -28836,7 +28445,7 @@
           </member-type>
           <member-type access='private'>
             <!-- 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-1114'>
+            <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-1108'>
               <data-member access='public' layout-offset-in-bits='0'>
                 <!-- long int si_band -->
                 <var-decl name='si_band' type-id='type-id-285' visibility='default' filepath='/usr/include/bits/siginfo.h' line='104' column='1'/>
@@ -28849,31 +28458,31 @@
           </member-type>
           <data-member access='private'>
             <!-- int _pad[28] -->
-            <var-decl name='_pad' type-id='type-id-1085' visibility='default' filepath='/usr/include/bits/siginfo.h' line='60' column='1'/>
+            <var-decl name='_pad' type-id='type-id-1079' visibility='default' filepath='/usr/include/bits/siginfo.h' line='60' column='1'/>
           </data-member>
           <data-member access='private'>
             <!-- struct {__pid_t si_pid; __uid_t si_uid;} _kill -->
-            <var-decl name='_kill' type-id='type-id-1106' visibility='default' filepath='/usr/include/bits/siginfo.h' line='67' column='1'/>
+            <var-decl name='_kill' type-id='type-id-1100' visibility='default' filepath='/usr/include/bits/siginfo.h' line='67' column='1'/>
           </data-member>
           <data-member access='private'>
             <!-- struct {int si_tid; int si_overrun; sigval_t si_sigval;} _timer -->
-            <var-decl name='_timer' type-id='type-id-1108' visibility='default' filepath='/usr/include/bits/siginfo.h' line='75' column='1'/>
+            <var-decl name='_timer' type-id='type-id-1102' visibility='default' filepath='/usr/include/bits/siginfo.h' line='75' column='1'/>
           </data-member>
           <data-member access='private'>
             <!-- struct {__pid_t si_pid; __uid_t si_uid; sigval_t si_sigval;} _rt -->
-            <var-decl name='_rt' type-id='type-id-1110' visibility='default' filepath='/usr/include/bits/siginfo.h' line='83' column='1'/>
+            <var-decl name='_rt' type-id='type-id-1104' visibility='default' filepath='/usr/include/bits/siginfo.h' line='83' column='1'/>
           </data-member>
           <data-member access='private'>
             <!-- 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-1111' visibility='default' filepath='/usr/include/bits/siginfo.h' line='93' column='1'/>
+            <var-decl name='_sigchld' type-id='type-id-1105' visibility='default' filepath='/usr/include/bits/siginfo.h' line='93' column='1'/>
           </data-member>
           <data-member access='private'>
             <!-- struct {void* si_addr;} _sigfault -->
-            <var-decl name='_sigfault' type-id='type-id-1113' visibility='default' filepath='/usr/include/bits/siginfo.h' line='99' column='1'/>
+            <var-decl name='_sigfault' type-id='type-id-1107' visibility='default' filepath='/usr/include/bits/siginfo.h' line='99' column='1'/>
           </data-member>
           <data-member access='private'>
             <!-- struct {long int si_band; int si_fd;} _sigpoll -->
-            <var-decl name='_sigpoll' type-id='type-id-1114' visibility='default' filepath='/usr/include/bits/siginfo.h' line='106' column='1'/>
+            <var-decl name='_sigpoll' type-id='type-id-1108' visibility='default' filepath='/usr/include/bits/siginfo.h' line='106' column='1'/>
           </data-member>
         </union-decl>
       </member-type>
@@ -28891,14 +28500,14 @@
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
         <!-- 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;} siginfo::_sifields -->
-        <var-decl name='_sifields' type-id='type-id-1105' visibility='default' filepath='/usr/include/bits/siginfo.h' line='107' column='1'/>
+        <var-decl name='_sifields' type-id='type-id-1099' visibility='default' filepath='/usr/include/bits/siginfo.h' line='107' column='1'/>
       </data-member>
     </class-decl>
     <!-- class CpuProfiler -->
-    <class-decl name='CpuProfiler' size-in-bits='704' visibility='default' filepath='src/profiler.cc' line='89' column='1' id='type-id-1115'>
+    <class-decl name='CpuProfiler' size-in-bits='704' visibility='default' filepath='src/profiler.cc' line='89' column='1' id='type-id-1109'>
       <data-member access='private' static='yes'>
         <!-- static CpuProfiler CpuProfiler::instance_ -->
-        <var-decl name='instance_' type-id='type-id-1115' mangled-name='_ZN11CpuProfiler9instance_E' visibility='default' filepath='src/profiler.cc' line='107' column='1' elf-symbol-id='_ZN11CpuProfiler9instance_E'/>
+        <var-decl name='instance_' type-id='type-id-1109' mangled-name='_ZN11CpuProfiler9instance_E' visibility='default' filepath='src/profiler.cc' line='107' column='1' elf-symbol-id='_ZN11CpuProfiler9instance_E'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='0'>
         <!-- SpinLock CpuProfiler::lock_ -->
@@ -28906,11 +28515,11 @@
       </data-member>
       <data-member access='private' layout-offset-in-bits='64'>
         <!-- ProfileData CpuProfiler::collector_ -->
-        <var-decl name='collector_' type-id='type-id-1087' visibility='default' filepath='src/profiler.cc' line='120' column='1'/>
+        <var-decl name='collector_' type-id='type-id-1081' visibility='default' filepath='src/profiler.cc' line='120' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='512'>
         <!-- int (void*)* CpuProfiler::filter_ -->
-        <var-decl name='filter_' type-id='type-id-1116' visibility='default' filepath='src/profiler.cc' line='125' column='1'/>
+        <var-decl name='filter_' type-id='type-id-1110' visibility='default' filepath='src/profiler.cc' line='125' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='576'>
         <!-- void* CpuProfiler::filter_arg_ -->
@@ -28918,13 +28527,13 @@
       </data-member>
       <data-member access='private' layout-offset-in-bits='640'>
         <!-- ProfileHandlerToken* CpuProfiler::prof_handler_token_ -->
-        <var-decl name='prof_handler_token_' type-id='type-id-1019' visibility='default' filepath='src/profiler.cc' line='130' column='1'/>
+        <var-decl name='prof_handler_token_' type-id='type-id-1013' visibility='default' filepath='src/profiler.cc' line='130' column='1'/>
       </data-member>
       <member-function access='private' constructor='yes'>
         <!-- CpuProfiler::CpuProfiler() -->
         <function-decl name='CpuProfiler' mangled-name='_ZN11CpuProfilerC1Ev' filepath='src/profiler.cc' line='91' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN11CpuProfilerC1Ev'>
           <!-- implicit parameter of type 'CpuProfiler*' -->
-          <parameter type-id='type-id-1117' is-artificial='yes'/>
+          <parameter type-id='type-id-1111' is-artificial='yes'/>
           <!-- void -->
           <return type-id='type-id-56'/>
         </function-decl>
@@ -28933,7 +28542,7 @@
         <!-- CpuProfiler::~CpuProfiler(int) -->
         <function-decl name='~CpuProfiler' mangled-name='_ZN11CpuProfilerD1Ev' filepath='src/profiler.cc' line='92' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN11CpuProfilerD1Ev'>
           <!-- implicit parameter of type 'CpuProfiler*' -->
-          <parameter type-id='type-id-1117' is-artificial='yes'/>
+          <parameter type-id='type-id-1111' is-artificial='yes'/>
           <!-- artificial parameter of type 'int' -->
           <parameter type-id='type-id-1' is-artificial='yes'/>
           <!-- void -->
@@ -28944,11 +28553,11 @@
         <!-- bool CpuProfiler::Start(const char*, const ProfilerOptions*) -->
         <function-decl name='Start' mangled-name='_ZN11CpuProfiler5StartEPKcPK15ProfilerOptions' filepath='src/profiler.cc' line='95' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN11CpuProfiler5StartEPKcPK15ProfilerOptions'>
           <!-- implicit parameter of type 'CpuProfiler*' -->
-          <parameter type-id='type-id-1117' is-artificial='yes'/>
+          <parameter type-id='type-id-1111' is-artificial='yes'/>
           <!-- parameter of type 'const char*' -->
           <parameter type-id='type-id-52'/>
           <!-- parameter of type 'const ProfilerOptions*' -->
-          <parameter type-id='type-id-1118'/>
+          <parameter type-id='type-id-1112'/>
           <!-- bool -->
           <return type-id='type-id-55'/>
         </function-decl>
@@ -28957,7 +28566,7 @@
         <!-- void CpuProfiler::Stop() -->
         <function-decl name='Stop' mangled-name='_ZN11CpuProfiler4StopEv' filepath='src/profiler.cc' line='98' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN11CpuProfiler4StopEv'>
           <!-- implicit parameter of type 'CpuProfiler*' -->
-          <parameter type-id='type-id-1117' is-artificial='yes'/>
+          <parameter type-id='type-id-1111' is-artificial='yes'/>
           <!-- void -->
           <return type-id='type-id-56'/>
         </function-decl>
@@ -28966,7 +28575,7 @@
         <!-- void CpuProfiler::FlushTable() -->
         <function-decl name='FlushTable' mangled-name='_ZN11CpuProfiler10FlushTableEv' filepath='src/profiler.cc' line='101' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN11CpuProfiler10FlushTableEv'>
           <!-- implicit parameter of type 'CpuProfiler*' -->
-          <parameter type-id='type-id-1117' is-artificial='yes'/>
+          <parameter type-id='type-id-1111' is-artificial='yes'/>
           <!-- void -->
           <return type-id='type-id-56'/>
         </function-decl>
@@ -28975,7 +28584,7 @@
         <!-- bool CpuProfiler::Enabled() -->
         <function-decl name='Enabled' mangled-name='_ZN11CpuProfiler7EnabledEv' filepath='src/profiler.cc' line='103' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN11CpuProfiler7EnabledEv'>
           <!-- implicit parameter of type 'CpuProfiler*' -->
-          <parameter type-id='type-id-1117' is-artificial='yes'/>
+          <parameter type-id='type-id-1111' is-artificial='yes'/>
           <!-- bool -->
           <return type-id='type-id-55'/>
         </function-decl>
@@ -28984,9 +28593,9 @@
         <!-- void CpuProfiler::GetCurrentState(ProfilerState*) -->
         <function-decl name='GetCurrentState' mangled-name='_ZN11CpuProfiler15GetCurrentStateEP13ProfilerState' filepath='src/profiler.cc' line='105' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN11CpuProfiler15GetCurrentStateEP13ProfilerState'>
           <!-- implicit parameter of type 'CpuProfiler*' -->
-          <parameter type-id='type-id-1117' is-artificial='yes'/>
+          <parameter type-id='type-id-1111' is-artificial='yes'/>
           <!-- parameter of type 'ProfilerState*' -->
-          <parameter type-id='type-id-1119'/>
+          <parameter type-id='type-id-1113'/>
           <!-- void -->
           <return type-id='type-id-56'/>
         </function-decl>
@@ -28995,7 +28604,7 @@
         <!-- void CpuProfiler::EnableHandler() -->
         <function-decl name='EnableHandler' mangled-name='_ZN11CpuProfiler13EnableHandlerEv' filepath='src/profiler.cc' line='133' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN11CpuProfiler13EnableHandlerEv'>
           <!-- implicit parameter of type 'CpuProfiler*' -->
-          <parameter type-id='type-id-1117' is-artificial='yes'/>
+          <parameter type-id='type-id-1111' is-artificial='yes'/>
           <!-- void -->
           <return type-id='type-id-56'/>
         </function-decl>
@@ -29004,7 +28613,7 @@
         <!-- void CpuProfiler::DisableHandler() -->
         <function-decl name='DisableHandler' mangled-name='_ZN11CpuProfiler14DisableHandlerEv' filepath='src/profiler.cc' line='136' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN11CpuProfiler14DisableHandlerEv'>
           <!-- implicit parameter of type 'CpuProfiler*' -->
-          <parameter type-id='type-id-1117' is-artificial='yes'/>
+          <parameter type-id='type-id-1111' is-artificial='yes'/>
           <!-- void -->
           <return type-id='type-id-56'/>
         </function-decl>
@@ -29015,7 +28624,7 @@
           <!-- parameter of type 'int' -->
           <parameter type-id='type-id-1'/>
           <!-- parameter of type 'siginfo_t*' -->
-          <parameter type-id='type-id-1021'/>
+          <parameter type-id='type-id-1015'/>
           <!-- parameter of type 'void*' -->
           <parameter type-id='type-id-53'/>
           <!-- parameter of type 'void*' -->
@@ -29026,10 +28635,10 @@
       </member-function>
     </class-decl>
     <!-- struct ProfilerOptions -->
-    <class-decl name='ProfilerOptions' size-in-bits='128' is-struct='yes' visibility='default' filepath='./src/gperftools/profiler.h' line='89' column='1' id='type-id-1120'>
+    <class-decl name='ProfilerOptions' size-in-bits='128' is-struct='yes' visibility='default' filepath='./src/gperftools/profiler.h' line='89' column='1' id='type-id-1114'>
       <data-member access='public' layout-offset-in-bits='0'>
         <!-- int (void*)* ProfilerOptions::filter_in_thread -->
-        <var-decl name='filter_in_thread' type-id='type-id-1116' visibility='default' filepath='./src/gperftools/profiler.h' line='108' column='1'/>
+        <var-decl name='filter_in_thread' type-id='type-id-1110' visibility='default' filepath='./src/gperftools/profiler.h' line='108' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
         <!-- void* ProfilerOptions::filter_in_thread_arg -->
@@ -29037,18 +28646,18 @@
       </data-member>
     </class-decl>
     <!-- struct ProfilerState -->
-    <class-decl name='ProfilerState' size-in-bits='8384' is-struct='yes' visibility='default' filepath='./src/gperftools/profiler.h' line='157' column='1' id='type-id-1121'>
+    <class-decl name='ProfilerState' size-in-bits='8384' is-struct='yes' visibility='default' filepath='./src/gperftools/profiler.h' line='157' column='1' id='type-id-1115'>
       <data-member access='public' layout-offset-in-bits='0'>
         <!-- int ProfilerState::enabled -->
         <var-decl name='enabled' type-id='type-id-1' visibility='default' filepath='./src/gperftools/profiler.h' line='158' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
         <!-- time_t ProfilerState::start_time -->
-        <var-decl name='start_time' type-id='type-id-1092' visibility='default' filepath='./src/gperftools/profiler.h' line='159' column='1'/>
+        <var-decl name='start_time' type-id='type-id-1086' visibility='default' filepath='./src/gperftools/profiler.h' line='159' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
         <!-- char ProfilerState::profile_name[1024] -->
-        <var-decl name='profile_name' type-id='type-id-1083' visibility='default' filepath='./src/gperftools/profiler.h' line='160' column='1'/>
+        <var-decl name='profile_name' type-id='type-id-1077' visibility='default' filepath='./src/gperftools/profiler.h' line='160' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='8320'>
         <!-- int ProfilerState::samples_gathered -->
@@ -29056,13 +28665,13 @@
       </data-member>
     </class-decl>
     <!-- typedef siginfo siginfo_t -->
-    <typedef-decl name='siginfo_t' type-id='type-id-1104' filepath='/usr/include/bits/siginfo.h' line='108' column='1' id='type-id-1122'/>
+    <typedef-decl name='siginfo_t' type-id='type-id-1098' filepath='/usr/include/bits/siginfo.h' line='108' column='1' id='type-id-1116'/>
     <!-- typedef unsigned int __uid_t -->
-    <typedef-decl name='__uid_t' type-id='type-id-1123' filepath='/usr/include/bits/types.h' line='135' column='1' id='type-id-1107'/>
+    <typedef-decl name='__uid_t' type-id='type-id-1117' filepath='/usr/include/bits/types.h' line='135' column='1' id='type-id-1101'/>
     <!-- typedef sigval sigval_t -->
-    <typedef-decl name='sigval_t' type-id='type-id-1124' filepath='/usr/include/bits/siginfo.h' line='37' column='1' id='type-id-1109'/>
+    <typedef-decl name='sigval_t' type-id='type-id-1118' filepath='/usr/include/bits/siginfo.h' line='37' column='1' id='type-id-1103'/>
     <!-- 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-1124'>
+    <union-decl name='sigval' size-in-bits='64' visibility='default' filepath='/usr/include/bits/siginfo.h' line='34' column='1' id='type-id-1118'>
       <data-member access='private'>
         <!-- 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'/>
@@ -29073,47 +28682,47 @@
       </data-member>
     </union-decl>
     <!-- typedef long int __clock_t -->
-    <typedef-decl name='__clock_t' type-id='type-id-285' filepath='/usr/include/bits/types.h' line='145' column='1' id='type-id-1112'/>
+    <typedef-decl name='__clock_t' type-id='type-id-285' filepath='/usr/include/bits/types.h' line='145' column='1' id='type-id-1106'/>
     <!-- CpuProfiler* -->
-    <pointer-type-def type-id='type-id-1115' size-in-bits='64' id='type-id-1117'/>
+    <pointer-type-def type-id='type-id-1109' size-in-bits='64' id='type-id-1111'/>
     <!-- ProfileData* -->
-    <pointer-type-def type-id='type-id-1087' size-in-bits='64' id='type-id-1096'/>
+    <pointer-type-def type-id='type-id-1081' size-in-bits='64' id='type-id-1090'/>
     <!-- ProfileData::Bucket* -->
-    <pointer-type-def type-id='type-id-1093' size-in-bits='64' id='type-id-1094'/>
+    <pointer-type-def type-id='type-id-1087' size-in-bits='64' id='type-id-1088'/>
     <!-- ProfileData::Entry::Slot* -->
-    <pointer-type-def type-id='type-id-1078' size-in-bits='64' id='type-id-1095'/>
+    <pointer-type-def type-id='type-id-1072' size-in-bits='64' id='type-id-1089'/>
     <!-- ProfileData::Options* -->
-    <pointer-type-def type-id='type-id-1088' size-in-bits='64' id='type-id-1089'/>
+    <pointer-type-def type-id='type-id-1082' size-in-bits='64' id='type-id-1083'/>
     <!-- ProfileData::State* -->
-    <pointer-type-def type-id='type-id-1091' size-in-bits='64' id='type-id-1099'/>
+    <pointer-type-def type-id='type-id-1085' size-in-bits='64' id='type-id-1093'/>
     <!-- ProfileHandlerToken* -->
-    <pointer-type-def type-id='type-id-1102' size-in-bits='64' id='type-id-1019'/>
+    <pointer-type-def type-id='type-id-1096' size-in-bits='64' id='type-id-1013'/>
     <!-- ProfilerState* -->
-    <pointer-type-def type-id='type-id-1121' size-in-bits='64' id='type-id-1119'/>
+    <pointer-type-def type-id='type-id-1115' size-in-bits='64' id='type-id-1113'/>
     <!-- const ProfileData -->
-    <qualified-type-def type-id='type-id-1087' const='yes' id='type-id-1125'/>
+    <qualified-type-def type-id='type-id-1081' const='yes' id='type-id-1119'/>
     <!-- const ProfileData& -->
-    <reference-type-def kind='lvalue' type-id='type-id-1125' size-in-bits='64' id='type-id-1101'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1119' size-in-bits='64' id='type-id-1095'/>
     <!-- const ProfileData* -->
-    <pointer-type-def type-id='type-id-1125' size-in-bits='64' id='type-id-1098'/>
+    <pointer-type-def type-id='type-id-1119' size-in-bits='64' id='type-id-1092'/>
     <!-- const ProfileData::Entry -->
-    <qualified-type-def type-id='type-id-1081' const='yes' id='type-id-1126'/>
+    <qualified-type-def type-id='type-id-1075' const='yes' id='type-id-1120'/>
     <!-- const ProfileData::Entry& -->
-    <reference-type-def kind='lvalue' type-id='type-id-1126' size-in-bits='64' id='type-id-1100'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1120' size-in-bits='64' id='type-id-1094'/>
     <!-- const ProfileData::Options -->
-    <qualified-type-def type-id='type-id-1088' const='yes' id='type-id-1127'/>
+    <qualified-type-def type-id='type-id-1082' const='yes' id='type-id-1121'/>
     <!-- const ProfileData::Options& -->
-    <reference-type-def kind='lvalue' type-id='type-id-1127' size-in-bits='64' id='type-id-1097'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1121' size-in-bits='64' id='type-id-1091'/>
     <!-- const ProfileData::Options* -->
-    <pointer-type-def type-id='type-id-1127' size-in-bits='64' id='type-id-1090'/>
+    <pointer-type-def type-id='type-id-1121' size-in-bits='64' id='type-id-1084'/>
     <!-- const ProfilerOptions -->
-    <qualified-type-def type-id='type-id-1120' const='yes' id='type-id-1128'/>
+    <qualified-type-def type-id='type-id-1114' const='yes' id='type-id-1122'/>
     <!-- const ProfilerOptions* -->
-    <pointer-type-def type-id='type-id-1128' size-in-bits='64' id='type-id-1118'/>
+    <pointer-type-def type-id='type-id-1122' size-in-bits='64' id='type-id-1112'/>
     <!-- int (void*)* -->
-    <pointer-type-def type-id='type-id-1129' size-in-bits='64' id='type-id-1116'/>
+    <pointer-type-def type-id='type-id-1123' size-in-bits='64' id='type-id-1110'/>
     <!-- siginfo_t* -->
-    <pointer-type-def type-id='type-id-1122' size-in-bits='64' id='type-id-1021'/>
+    <pointer-type-def type-id='type-id-1116' size-in-bits='64' id='type-id-1015'/>
     <!-- namespace FLAG__namespace_do_not_use_directly_use_DECLARE_bool_instead -->
     <namespace-decl name='FLAG__namespace_do_not_use_directly_use_DECLARE_bool_instead'>
       <!-- bool FLAG__namespace_do_not_use_directly_use_DECLARE_bool_instead::FLAGS_cpu_profiler_unittest -->
@@ -29154,7 +28763,7 @@
     <!-- void ProfilerGetCurrentState(ProfilerState*) -->
     <function-decl name='ProfilerGetCurrentState' mangled-name='ProfilerGetCurrentState' filepath='src/profiler.cc' line='403' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='ProfilerGetCurrentState'>
       <!-- parameter of type 'ProfilerState*' -->
-      <parameter type-id='type-id-1119' name='state' filepath='src/profiler.cc' line='404' column='1'/>
+      <parameter type-id='type-id-1113' name='state' filepath='src/profiler.cc' line='404' column='1'/>
       <!-- void -->
       <return type-id='type-id-56'/>
     </function-decl>
@@ -29163,7 +28772,7 @@
       <!-- parameter of type 'const char*' -->
       <parameter type-id='type-id-52' name='fname' filepath='src/profiler.cc' line='395' column='1'/>
       <!-- parameter of type 'const ProfilerOptions*' -->
-      <parameter type-id='type-id-1118' name='options' filepath='src/profiler.cc' line='395' column='1'/>
+      <parameter type-id='type-id-1112' name='options' filepath='src/profiler.cc' line='395' column='1'/>
       <!-- int -->
       <return type-id='type-id-1'/>
     </function-decl>
@@ -29175,7 +28784,7 @@
       <return type-id='type-id-1'/>
     </function-decl>
     <!-- int (void*) -->
-    <function-type size-in-bits='64' id='type-id-1129'>
+    <function-type size-in-bits='64' id='type-id-1123'>
       <!-- parameter of type 'void*' -->
       <parameter type-id='type-id-53'/>
       <!-- int -->
@@ -29184,17 +28793,17 @@
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='src/raw_printer.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-kFgaKP/gperftools-2.4' language='LANG_C_plus_plus'>
     <!-- base::RawPrinter* -->
-    <pointer-type-def type-id='type-id-1130' size-in-bits='64' id='type-id-1131'/>
+    <pointer-type-def type-id='type-id-1124' size-in-bits='64' id='type-id-1125'/>
     <!-- const base::RawPrinter -->
-    <qualified-type-def type-id='type-id-1130' const='yes' id='type-id-1132'/>
+    <qualified-type-def type-id='type-id-1124' const='yes' id='type-id-1126'/>
     <!-- const base::RawPrinter& -->
-    <reference-type-def kind='lvalue' type-id='type-id-1132' size-in-bits='64' id='type-id-1133'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1126' size-in-bits='64' id='type-id-1127'/>
     <!-- const base::RawPrinter* -->
-    <pointer-type-def type-id='type-id-1132' size-in-bits='64' id='type-id-1134'/>
+    <pointer-type-def type-id='type-id-1126' size-in-bits='64' id='type-id-1128'/>
     <!-- namespace base -->
     <namespace-decl name='base'>
       <!-- class base::RawPrinter -->
-      <class-decl name='RawPrinter' size-in-bits='192' visibility='default' filepath='src/raw_printer.h' line='51' column='1' id='type-id-1130'>
+      <class-decl name='RawPrinter' size-in-bits='192' visibility='default' filepath='src/raw_printer.h' line='51' column='1' id='type-id-1124'>
         <data-member access='private' layout-offset-in-bits='0'>
           <!-- char* base::RawPrinter::base_ -->
           <var-decl name='base_' type-id='type-id-90' visibility='default' filepath='src/raw_printer.h' line='81' column='1'/>
@@ -29211,7 +28820,7 @@
           <!-- base::RawPrinter::RawPrinter(char*, int) -->
           <function-decl name='RawPrinter' mangled-name='_ZN4base10RawPrinterC1EPci' filepath='src/raw_printer.h' line='56' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN4base10RawPrinterC1EPci'>
             <!-- implicit parameter of type 'base::RawPrinter*' -->
-            <parameter type-id='type-id-1131' is-artificial='yes'/>
+            <parameter type-id='type-id-1125' is-artificial='yes'/>
             <!-- parameter of type 'char*' -->
             <parameter type-id='type-id-90'/>
             <!-- parameter of type 'int' -->
@@ -29224,7 +28833,7 @@
           <!-- int base::RawPrinter::length() -->
           <function-decl name='length' mangled-name='_ZNK4base10RawPrinter6lengthEv' filepath='src/raw_printer.h' line='60' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const base::RawPrinter*' -->
-            <parameter type-id='type-id-1134' is-artificial='yes'/>
+            <parameter type-id='type-id-1128' is-artificial='yes'/>
             <!-- int -->
             <return type-id='type-id-1'/>
           </function-decl>
@@ -29233,7 +28842,7 @@
           <!-- int base::RawPrinter::space_left() -->
           <function-decl name='space_left' mangled-name='_ZNK4base10RawPrinter10space_leftEv' filepath='src/raw_printer.h' line='63' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const base::RawPrinter*' -->
-            <parameter type-id='type-id-1134' is-artificial='yes'/>
+            <parameter type-id='type-id-1128' is-artificial='yes'/>
             <!-- int -->
             <return type-id='type-id-1'/>
           </function-decl>
@@ -29242,7 +28851,7 @@
           <!-- void base::RawPrinter::Printf(const char*, ...) -->
           <function-decl name='Printf' mangled-name='_ZN4base10RawPrinter6PrintfEPKcz' filepath='src/raw_printer.h' line='68' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN4base10RawPrinter6PrintfEPKcz'>
             <!-- implicit parameter of type 'base::RawPrinter*' -->
-            <parameter type-id='type-id-1131' is-artificial='yes'/>
+            <parameter type-id='type-id-1125' is-artificial='yes'/>
             <!-- parameter of type 'const char*' -->
             <parameter type-id='type-id-52'/>
             <parameter is-variadic='yes'/>
@@ -29254,9 +28863,9 @@
           <!-- base::RawPrinter::RawPrinter(const base::RawPrinter&) -->
           <function-decl name='RawPrinter' filepath='src/raw_printer.h' line='85' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'base::RawPrinter*' -->
-            <parameter type-id='type-id-1131' is-artificial='yes'/>
+            <parameter type-id='type-id-1125' is-artificial='yes'/>
             <!-- parameter of type 'const base::RawPrinter&' -->
-            <parameter type-id='type-id-1133'/>
+            <parameter type-id='type-id-1127'/>
             <!-- void -->
             <return type-id='type-id-56'/>
           </function-decl>
@@ -29265,9 +28874,9 @@
           <!-- void base::RawPrinter::operator=(const base::RawPrinter&) -->
           <function-decl name='operator=' mangled-name='_ZN4base10RawPrinteraSERKS0_' filepath='src/raw_printer.h' line='85' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'base::RawPrinter*' -->
-            <parameter type-id='type-id-1131' is-artificial='yes'/>
+            <parameter type-id='type-id-1125' is-artificial='yes'/>
             <!-- parameter of type 'const base::RawPrinter&' -->
-            <parameter type-id='type-id-1133'/>
+            <parameter type-id='type-id-1127'/>
             <!-- void -->
             <return type-id='type-id-56'/>
           </function-decl>
@@ -29281,11 +28890,11 @@
       <!-- const double& std::min<double>(const double&, const double&) -->
       <function-decl name='min&lt;double&gt;' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_algobase.h' line='186' column='1' visibility='default' binding='global' size-in-bits='64'>
         <!-- parameter of type 'const double&' -->
-        <parameter type-id='type-id-1135'/>
+        <parameter type-id='type-id-1129'/>
         <!-- parameter of type 'const double&' -->
-        <parameter type-id='type-id-1135'/>
+        <parameter type-id='type-id-1129'/>
         <!-- const double& -->
-        <return type-id='type-id-1135'/>
+        <return type-id='type-id-1129'/>
       </function-decl>
     </namespace-decl>
     <!-- namespace FLAG__namespace_do_not_use_directly_use_DECLARE_int64_instead -->
@@ -29302,21 +28911,21 @@
       <!-- void tcmalloc::DeleteSpan(tcmalloc::Span*) -->
       <function-decl name='DeleteSpan' mangled-name='_ZN8tcmalloc10DeleteSpanEPNS_4SpanE' filepath='src/span.cc' line='65' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN8tcmalloc10DeleteSpanEPNS_4SpanE'>
         <!-- parameter of type 'tcmalloc::Span*' -->
-        <parameter type-id='type-id-1136'/>
+        <parameter type-id='type-id-1130'/>
         <!-- void -->
         <return type-id='type-id-56'/>
       </function-decl>
       <!-- void tcmalloc::DLL_Init(tcmalloc::Span*) -->
       <function-decl name='DLL_Init' mangled-name='_ZN8tcmalloc8DLL_InitEPNS_4SpanE' filepath='src/span.cc' line='73' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN8tcmalloc8DLL_InitEPNS_4SpanE'>
         <!-- parameter of type 'tcmalloc::Span*' -->
-        <parameter type-id='type-id-1136'/>
+        <parameter type-id='type-id-1130'/>
         <!-- void -->
         <return type-id='type-id-56'/>
       </function-decl>
       <!-- void tcmalloc::DLL_Remove(tcmalloc::Span*) -->
       <function-decl name='DLL_Remove' mangled-name='_ZN8tcmalloc10DLL_RemoveEPNS_4SpanE' filepath='src/span.cc' line='78' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN8tcmalloc10DLL_RemoveEPNS_4SpanE'>
         <!-- parameter of type 'tcmalloc::Span*' -->
-        <parameter type-id='type-id-1136'/>
+        <parameter type-id='type-id-1130'/>
         <!-- void -->
         <return type-id='type-id-56'/>
       </function-decl>
@@ -29330,60 +28939,60 @@
       <!-- void tcmalloc::DLL_Prepend(tcmalloc::Span*, tcmalloc::Span*) -->
       <function-decl name='DLL_Prepend' mangled-name='_ZN8tcmalloc11DLL_PrependEPNS_4SpanES1_' filepath='src/span.cc' line='93' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN8tcmalloc11DLL_PrependEPNS_4SpanES1_'>
         <!-- parameter of type 'tcmalloc::Span*' -->
-        <parameter type-id='type-id-1136'/>
+        <parameter type-id='type-id-1130'/>
         <!-- parameter of type 'tcmalloc::Span*' -->
-        <parameter type-id='type-id-1136'/>
+        <parameter type-id='type-id-1130'/>
         <!-- void -->
         <return type-id='type-id-56'/>
       </function-decl>
       <!-- tcmalloc::Span* tcmalloc::NewSpan(PageID, Length) -->
       <function-decl name='NewSpan' mangled-name='_ZN8tcmalloc7NewSpanEmm' filepath='src/span.cc' line='54' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN8tcmalloc7NewSpanEmm'>
         <!-- parameter of type 'typedef PageID' -->
-        <parameter type-id='type-id-1137'/>
+        <parameter type-id='type-id-1131'/>
         <!-- parameter of type 'typedef Length' -->
-        <parameter type-id='type-id-1138'/>
+        <parameter type-id='type-id-1132'/>
         <!-- tcmalloc::Span* -->
-        <return type-id='type-id-1136'/>
+        <return type-id='type-id-1130'/>
       </function-decl>
     </namespace-decl>
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='src/stack_trace_table.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-kFgaKP/gperftools-2.4' language='LANG_C_plus_plus'>
     <!-- const tcmalloc::PageHeapAllocator<tcmalloc::StackTraceTable::Bucket> -->
-    <qualified-type-def type-id='type-id-1139' const='yes' id='type-id-1140'/>
+    <qualified-type-def type-id='type-id-1133' const='yes' id='type-id-1134'/>
     <!-- const tcmalloc::PageHeapAllocator<tcmalloc::StackTraceTable::Bucket>* -->
-    <pointer-type-def type-id='type-id-1140' size-in-bits='64' id='type-id-1141'/>
+    <pointer-type-def type-id='type-id-1134' size-in-bits='64' id='type-id-1135'/>
     <!-- const tcmalloc::StackTrace -->
-    <qualified-type-def type-id='type-id-1142' const='yes' id='type-id-1143'/>
+    <qualified-type-def type-id='type-id-1136' const='yes' id='type-id-1137'/>
     <!-- const tcmalloc::StackTrace& -->
-    <reference-type-def kind='lvalue' type-id='type-id-1143' size-in-bits='64' id='type-id-1144'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1137' size-in-bits='64' id='type-id-1138'/>
     <!-- const tcmalloc::StackTraceTable -->
-    <qualified-type-def type-id='type-id-1145' const='yes' id='type-id-1146'/>
+    <qualified-type-def type-id='type-id-1139' const='yes' id='type-id-1140'/>
     <!-- const tcmalloc::StackTraceTable* -->
-    <pointer-type-def type-id='type-id-1146' size-in-bits='64' id='type-id-1147'/>
+    <pointer-type-def type-id='type-id-1140' size-in-bits='64' id='type-id-1141'/>
     <!-- const tcmalloc::StackTraceTable::Bucket -->
-    <qualified-type-def type-id='type-id-1148' const='yes' id='type-id-1149'/>
+    <qualified-type-def type-id='type-id-1142' const='yes' id='type-id-1143'/>
     <!-- const tcmalloc::StackTraceTable::Bucket* -->
-    <pointer-type-def type-id='type-id-1149' size-in-bits='64' id='type-id-1150'/>
+    <pointer-type-def type-id='type-id-1143' size-in-bits='64' id='type-id-1144'/>
     <!-- tcmalloc::StackTraceTable* -->
-    <pointer-type-def type-id='type-id-1145' size-in-bits='64' id='type-id-1151'/>
+    <pointer-type-def type-id='type-id-1139' size-in-bits='64' id='type-id-1145'/>
     <!-- tcmalloc::StackTraceTable::Bucket* -->
-    <pointer-type-def type-id='type-id-1148' size-in-bits='64' id='type-id-1152'/>
+    <pointer-type-def type-id='type-id-1142' size-in-bits='64' id='type-id-1146'/>
     <!-- tcmalloc::StackTraceTable::Bucket** -->
-    <pointer-type-def type-id='type-id-1152' size-in-bits='64' id='type-id-1153'/>
+    <pointer-type-def type-id='type-id-1146' size-in-bits='64' id='type-id-1147'/>
     <!-- namespace tcmalloc -->
     <namespace-decl name='tcmalloc'>
       <!-- class tcmalloc::StackTraceTable -->
-      <class-decl name='StackTraceTable' size-in-bits='192' visibility='default' filepath='src/stack_trace_table.h' line='47' column='1' id='type-id-1145'>
+      <class-decl name='StackTraceTable' size-in-bits='192' visibility='default' filepath='src/stack_trace_table.h' line='47' column='1' id='type-id-1139'>
         <member-type access='private'>
           <!-- struct tcmalloc::StackTraceTable::Bucket -->
-          <class-decl name='Bucket' size-in-bits='2304' is-struct='yes' visibility='default' filepath='src/stack_trace_table.h' line='65' column='1' id='type-id-1148'>
+          <class-decl name='Bucket' size-in-bits='2304' is-struct='yes' visibility='default' filepath='src/stack_trace_table.h' line='65' column='1' id='type-id-1142'>
             <data-member access='public' layout-offset-in-bits='0'>
               <!-- uintptr_t tcmalloc::StackTraceTable::Bucket::hash -->
               <var-decl name='hash' type-id='type-id-130' visibility='default' filepath='src/stack_trace_table.h' line='67' column='1'/>
             </data-member>
             <data-member access='public' layout-offset-in-bits='64'>
               <!-- tcmalloc::StackTrace tcmalloc::StackTraceTable::Bucket::trace -->
-              <var-decl name='trace' type-id='type-id-1142' visibility='default' filepath='src/stack_trace_table.h' line='68' column='1'/>
+              <var-decl name='trace' type-id='type-id-1136' visibility='default' filepath='src/stack_trace_table.h' line='68' column='1'/>
             </data-member>
             <data-member access='public' layout-offset-in-bits='2176'>
               <!-- int tcmalloc::StackTraceTable::Bucket::count -->
@@ -29391,17 +29000,17 @@
             </data-member>
             <data-member access='public' layout-offset-in-bits='2240'>
               <!-- tcmalloc::StackTraceTable::Bucket* tcmalloc::StackTraceTable::Bucket::next -->
-              <var-decl name='next' type-id='type-id-1152' visibility='default' filepath='src/stack_trace_table.h' line='72' column='1'/>
+              <var-decl name='next' type-id='type-id-1146' visibility='default' filepath='src/stack_trace_table.h' line='72' column='1'/>
             </data-member>
             <member-function access='public'>
               <!-- bool tcmalloc::StackTraceTable::Bucket::KeyEqual(uintptr_t, const tcmalloc::StackTrace&) -->
               <function-decl name='KeyEqual' mangled-name='_ZNK8tcmalloc15StackTraceTable6Bucket8KeyEqualEmRKNS_10StackTraceE' filepath='src/stack_trace_table.h' line='74' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNK8tcmalloc15StackTraceTable6Bucket8KeyEqualEmRKNS_10StackTraceE'>
                 <!-- implicit parameter of type 'const tcmalloc::StackTraceTable::Bucket*' -->
-                <parameter type-id='type-id-1150' is-artificial='yes'/>
+                <parameter type-id='type-id-1144' is-artificial='yes'/>
                 <!-- parameter of type 'typedef uintptr_t' -->
                 <parameter type-id='type-id-130'/>
                 <!-- parameter of type 'const tcmalloc::StackTrace&' -->
-                <parameter type-id='type-id-1144'/>
+                <parameter type-id='type-id-1138'/>
                 <!-- bool -->
                 <return type-id='type-id-55'/>
               </function-decl>
@@ -29426,13 +29035,13 @@
         </data-member>
         <data-member access='private' layout-offset-in-bits='128'>
           <!-- tcmalloc::StackTraceTable::Bucket** tcmalloc::StackTraceTable::table_ -->
-          <var-decl name='table_' type-id='type-id-1153' visibility='default' filepath='src/stack_trace_table.h' line='87' column='1'/>
+          <var-decl name='table_' type-id='type-id-1147' visibility='default' filepath='src/stack_trace_table.h' line='87' column='1'/>
         </data-member>
         <member-function access='private' constructor='yes'>
           <!-- tcmalloc::StackTraceTable::StackTraceTable() -->
           <function-decl name='StackTraceTable' mangled-name='_ZN8tcmalloc15StackTraceTableC2Ev' filepath='src/stack_trace_table.h' line='50' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN8tcmalloc15StackTraceTableC2Ev'>
             <!-- implicit parameter of type 'tcmalloc::StackTraceTable*' -->
-            <parameter type-id='type-id-1151' is-artificial='yes'/>
+            <parameter type-id='type-id-1145' is-artificial='yes'/>
             <!-- void -->
             <return type-id='type-id-56'/>
           </function-decl>
@@ -29441,7 +29050,7 @@
           <!-- tcmalloc::StackTraceTable::~StackTraceTable(int) -->
           <function-decl name='~StackTraceTable' mangled-name='_ZN8tcmalloc15StackTraceTableD2Ev' filepath='src/stack_trace_table.h' line='51' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN8tcmalloc15StackTraceTableD2Ev'>
             <!-- implicit parameter of type 'tcmalloc::StackTraceTable*' -->
-            <parameter type-id='type-id-1151' is-artificial='yes'/>
+            <parameter type-id='type-id-1145' is-artificial='yes'/>
             <!-- artificial parameter of type 'int' -->
             <parameter type-id='type-id-1' is-artificial='yes'/>
             <!-- void -->
@@ -29452,9 +29061,9 @@
           <!-- void tcmalloc::StackTraceTable::AddTrace(const tcmalloc::StackTrace&) -->
           <function-decl name='AddTrace' mangled-name='_ZN8tcmalloc15StackTraceTable8AddTraceERKNS_10StackTraceE' filepath='src/stack_trace_table.h' line='56' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN8tcmalloc15StackTraceTable8AddTraceERKNS_10StackTraceE'>
             <!-- implicit parameter of type 'tcmalloc::StackTraceTable*' -->
-            <parameter type-id='type-id-1151' is-artificial='yes'/>
+            <parameter type-id='type-id-1145' is-artificial='yes'/>
             <!-- parameter of type 'const tcmalloc::StackTrace&' -->
-            <parameter type-id='type-id-1144'/>
+            <parameter type-id='type-id-1138'/>
             <!-- void -->
             <return type-id='type-id-56'/>
           </function-decl>
@@ -29463,7 +29072,7 @@
           <!-- void** tcmalloc::StackTraceTable::ReadStackTracesAndClear() -->
           <function-decl name='ReadStackTracesAndClear' mangled-name='_ZN8tcmalloc15StackTraceTable23ReadStackTracesAndClearEv' filepath='src/stack_trace_table.h' line='62' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN8tcmalloc15StackTraceTable23ReadStackTracesAndClearEv'>
             <!-- implicit parameter of type 'tcmalloc::StackTraceTable*' -->
-            <parameter type-id='type-id-1151' is-artificial='yes'/>
+            <parameter type-id='type-id-1145' is-artificial='yes'/>
             <!-- void** -->
             <return type-id='type-id-120'/>
           </function-decl>
@@ -29472,7 +29081,7 @@
           <!-- int tcmalloc::StackTraceTable::depth_total() -->
           <function-decl name='depth_total' mangled-name='_ZNK8tcmalloc15StackTraceTable11depth_totalEv' filepath='src/stack_trace_table.h' line='78' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const tcmalloc::StackTraceTable*' -->
-            <parameter type-id='type-id-1147' is-artificial='yes'/>
+            <parameter type-id='type-id-1141' is-artificial='yes'/>
             <!-- int -->
             <return type-id='type-id-1'/>
           </function-decl>
@@ -29481,7 +29090,7 @@
           <!-- int tcmalloc::StackTraceTable::bucket_total() -->
           <function-decl name='bucket_total' mangled-name='_ZNK8tcmalloc15StackTraceTable12bucket_totalEv' filepath='src/stack_trace_table.h' line='79' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const tcmalloc::StackTraceTable*' -->
-            <parameter type-id='type-id-1147' is-artificial='yes'/>
+            <parameter type-id='type-id-1141' is-artificial='yes'/>
             <!-- int -->
             <return type-id='type-id-1'/>
           </function-decl>
@@ -29547,10 +29156,10 @@
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='src/symbolize.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-kFgaKP/gperftools-2.4' language='LANG_C_plus_plus'>
     <!-- class SymbolTable -->
-    <class-decl name='SymbolTable' size-in-bits='448' visibility='default' filepath='src/symbolize.h' line='50' column='1' id='type-id-1154'>
+    <class-decl name='SymbolTable' size-in-bits='448' visibility='default' filepath='src/symbolize.h' line='50' column='1' id='type-id-1148'>
       <member-type access='private'>
         <!-- typedef std::map<const void*, const char*, std::less<const void*>, std::allocator<std::pair<const void* const, const char*> > > SymbolTable::SymbolMap -->
-        <typedef-decl name='SymbolMap' type-id='type-id-1156' filepath='src/symbolize.h' line='72' column='1' id='type-id-1155'/>
+        <typedef-decl name='SymbolMap' type-id='type-id-1150' filepath='src/symbolize.h' line='72' column='1' id='type-id-1149'/>
       </member-type>
       <data-member access='private' static='yes'>
         <!-- static const int SymbolTable::kSymbolSize -->
@@ -29558,7 +29167,7 @@
       </data-member>
       <data-member access='private' layout-offset-in-bits='0'>
         <!-- SymbolTable::SymbolMap SymbolTable::symbolization_table_ -->
-        <var-decl name='symbolization_table_' type-id='type-id-1155' visibility='default' filepath='src/symbolize.h' line='78' column='1'/>
+        <var-decl name='symbolization_table_' type-id='type-id-1149' visibility='default' filepath='src/symbolize.h' line='78' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='384'>
         <!-- char* SymbolTable::symbol_buffer_ -->
@@ -29568,7 +29177,7 @@
         <!-- SymbolTable::SymbolTable() -->
         <function-decl name='SymbolTable' filepath='src/symbolize.h' line='52' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'SymbolTable*' -->
-          <parameter type-id='type-id-1157' is-artificial='yes'/>
+          <parameter type-id='type-id-1151' is-artificial='yes'/>
           <!-- void -->
           <return type-id='type-id-56'/>
         </function-decl>
@@ -29577,7 +29186,7 @@
         <!-- SymbolTable::~SymbolTable(int) -->
         <function-decl name='~SymbolTable' filepath='src/symbolize.h' line='54' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'SymbolTable*' -->
-          <parameter type-id='type-id-1157' is-artificial='yes'/>
+          <parameter type-id='type-id-1151' is-artificial='yes'/>
           <!-- artificial parameter of type 'int' -->
           <parameter type-id='type-id-1' is-artificial='yes'/>
           <!-- void -->
@@ -29588,7 +29197,7 @@
         <!-- void SymbolTable::Add(void*) -->
         <function-decl name='Add' mangled-name='_ZN11SymbolTable3AddEPKv' filepath='src/symbolize.h' line='60' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN11SymbolTable3AddEPKv'>
           <!-- implicit parameter of type 'SymbolTable*' -->
-          <parameter type-id='type-id-1157' is-artificial='yes'/>
+          <parameter type-id='type-id-1151' is-artificial='yes'/>
           <!-- parameter of type 'void*' -->
           <parameter type-id='type-id-53'/>
           <!-- void -->
@@ -29599,7 +29208,7 @@
         <!-- const char* SymbolTable::GetSymbol(void*) -->
         <function-decl name='GetSymbol' mangled-name='_ZN11SymbolTable9GetSymbolEPKv' filepath='src/symbolize.h' line='65' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN11SymbolTable9GetSymbolEPKv'>
           <!-- implicit parameter of type 'SymbolTable*' -->
-          <parameter type-id='type-id-1157' is-artificial='yes'/>
+          <parameter type-id='type-id-1151' is-artificial='yes'/>
           <!-- parameter of type 'void*' -->
           <parameter type-id='type-id-53'/>
           <!-- const char* -->
@@ -29610,132 +29219,132 @@
         <!-- int SymbolTable::Symbolize() -->
         <function-decl name='Symbolize' mangled-name='_ZN11SymbolTable9SymbolizeEv' filepath='src/symbolize.h' line='69' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN11SymbolTable9SymbolizeEv'>
           <!-- implicit parameter of type 'SymbolTable*' -->
-          <parameter type-id='type-id-1157' is-artificial='yes'/>
+          <parameter type-id='type-id-1151' is-artificial='yes'/>
           <!-- int -->
           <return type-id='type-id-1'/>
         </function-decl>
       </member-function>
     </class-decl>
     <!-- SymbolTable* -->
-    <pointer-type-def type-id='type-id-1154' size-in-bits='64' id='type-id-1157'/>
+    <pointer-type-def type-id='type-id-1148' size-in-bits='64' id='type-id-1151'/>
     <!-- __gnu_cxx::new_allocator<std::_Rb_tree_node<std::pair<const void* const, const char*> > >* -->
-    <pointer-type-def type-id='type-id-1158' size-in-bits='64' id='type-id-1159'/>
+    <pointer-type-def type-id='type-id-1152' size-in-bits='64' id='type-id-1153'/>
     <!-- __gnu_cxx::new_allocator<std::pair<const void* const, const char*> >* -->
-    <pointer-type-def type-id='type-id-1160' size-in-bits='64' id='type-id-1161'/>
+    <pointer-type-def type-id='type-id-1154' size-in-bits='64' id='type-id-1155'/>
     <!-- const __gnu_cxx::new_allocator<std::_Rb_tree_node<std::pair<const void* const, const char*> > > -->
-    <qualified-type-def type-id='type-id-1158' const='yes' id='type-id-1162'/>
+    <qualified-type-def type-id='type-id-1152' const='yes' id='type-id-1156'/>
     <!-- const __gnu_cxx::new_allocator<std::_Rb_tree_node<std::pair<const void* const, const char*> > >& -->
-    <reference-type-def kind='lvalue' type-id='type-id-1162' size-in-bits='64' id='type-id-1163'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1156' size-in-bits='64' id='type-id-1157'/>
     <!-- const __gnu_cxx::new_allocator<std::_Rb_tree_node<std::pair<const void* const, const char*> > >* -->
-    <pointer-type-def type-id='type-id-1162' size-in-bits='64' id='type-id-1164'/>
+    <pointer-type-def type-id='type-id-1156' size-in-bits='64' id='type-id-1158'/>
     <!-- const __gnu_cxx::new_allocator<std::pair<const void* const, const char*> > -->
-    <qualified-type-def type-id='type-id-1160' const='yes' id='type-id-1165'/>
+    <qualified-type-def type-id='type-id-1154' const='yes' id='type-id-1159'/>
     <!-- const __gnu_cxx::new_allocator<std::pair<const void* const, const char*> >& -->
-    <reference-type-def kind='lvalue' type-id='type-id-1165' size-in-bits='64' id='type-id-1166'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1159' size-in-bits='64' id='type-id-1160'/>
     <!-- const __gnu_cxx::new_allocator<std::pair<const void* const, const char*> >* -->
-    <pointer-type-def type-id='type-id-1165' size-in-bits='64' id='type-id-1167'/>
+    <pointer-type-def type-id='type-id-1159' size-in-bits='64' id='type-id-1161'/>
     <!-- const char*& -->
-    <reference-type-def kind='lvalue' type-id='type-id-52' size-in-bits='64' id='type-id-1168'/>
+    <reference-type-def kind='lvalue' type-id='type-id-52' size-in-bits='64' id='type-id-1162'/>
     <!-- const std::_Rb_tree<const void*, std::pair<const void* const, const char*>, std::_Select1st<std::pair<const void* const, const char*> >, std::less<const void*>, std::allocator<std::pair<const void* const, const char*> > > -->
-    <qualified-type-def type-id='type-id-1169' const='yes' id='type-id-1170'/>
+    <qualified-type-def type-id='type-id-1163' const='yes' id='type-id-1164'/>
     <!-- const std::_Rb_tree<const void*, std::pair<const void* const, const char*>, std::_Select1st<std::pair<const void* const, const char*> >, std::less<const void*>, std::allocator<std::pair<const void* const, const char*> > >& -->
-    <reference-type-def kind='lvalue' type-id='type-id-1170' size-in-bits='64' id='type-id-1171'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1164' size-in-bits='64' id='type-id-1165'/>
     <!-- const std::_Rb_tree<const void*, std::pair<const void* const, const char*>, std::_Select1st<std::pair<const void* const, const char*> >, std::less<const void*>, std::allocator<std::pair<const void* const, const char*> > >* -->
-    <pointer-type-def type-id='type-id-1170' size-in-bits='64' id='type-id-1172'/>
+    <pointer-type-def type-id='type-id-1164' size-in-bits='64' id='type-id-1166'/>
     <!-- const std::_Rb_tree_const_iterator<std::pair<const void* const, const char*> > -->
-    <qualified-type-def type-id='type-id-1173' const='yes' id='type-id-1174'/>
+    <qualified-type-def type-id='type-id-1167' const='yes' id='type-id-1168'/>
     <!-- const std::_Rb_tree_const_iterator<std::pair<const void* const, const char*> >& -->
-    <reference-type-def kind='lvalue' type-id='type-id-1174' size-in-bits='64' id='type-id-1175'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1168' size-in-bits='64' id='type-id-1169'/>
     <!-- const std::_Rb_tree_const_iterator<std::pair<const void* const, const char*> >* -->
-    <pointer-type-def type-id='type-id-1174' size-in-bits='64' id='type-id-1176'/>
+    <pointer-type-def type-id='type-id-1168' size-in-bits='64' id='type-id-1170'/>
     <!-- const std::_Rb_tree_iterator<std::pair<const void* const, const char*> > -->
-    <qualified-type-def type-id='type-id-1177' const='yes' id='type-id-1178'/>
+    <qualified-type-def type-id='type-id-1171' const='yes' id='type-id-1172'/>
     <!-- const std::_Rb_tree_iterator<std::pair<const void* const, const char*> >& -->
-    <reference-type-def kind='lvalue' type-id='type-id-1178' size-in-bits='64' id='type-id-1179'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1172' size-in-bits='64' id='type-id-1173'/>
     <!-- const std::_Rb_tree_iterator<std::pair<const void* const, const char*> >* -->
-    <pointer-type-def type-id='type-id-1178' size-in-bits='64' id='type-id-1180'/>
+    <pointer-type-def type-id='type-id-1172' size-in-bits='64' id='type-id-1174'/>
     <!-- const std::_Rb_tree_node<std::pair<const void* const, const char*> > -->
-    <qualified-type-def type-id='type-id-1181' const='yes' id='type-id-1182'/>
+    <qualified-type-def type-id='type-id-1175' const='yes' id='type-id-1176'/>
     <!-- const std::_Rb_tree_node<std::pair<const void* const, const char*> >& -->
-    <reference-type-def kind='lvalue' type-id='type-id-1182' size-in-bits='64' id='type-id-1183'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1176' size-in-bits='64' id='type-id-1177'/>
     <!-- const std::_Rb_tree_node<std::pair<const void* const, const char*> >* -->
-    <pointer-type-def type-id='type-id-1182' size-in-bits='64' id='type-id-1184'/>
+    <pointer-type-def type-id='type-id-1176' size-in-bits='64' id='type-id-1178'/>
     <!-- const std::_Select1st<std::pair<const void* const, const char*> > -->
-    <qualified-type-def type-id='type-id-1185' const='yes' id='type-id-1186'/>
+    <qualified-type-def type-id='type-id-1179' const='yes' id='type-id-1180'/>
     <!-- const std::_Select1st<std::pair<const void* const, const char*> >* -->
-    <pointer-type-def type-id='type-id-1186' size-in-bits='64' id='type-id-1187'/>
+    <pointer-type-def type-id='type-id-1180' size-in-bits='64' id='type-id-1181'/>
     <!-- const std::allocator<std::_Rb_tree_node<std::pair<const void* const, const char*> > > -->
-    <qualified-type-def type-id='type-id-1188' const='yes' id='type-id-1189'/>
+    <qualified-type-def type-id='type-id-1182' const='yes' id='type-id-1183'/>
     <!-- const std::allocator<std::_Rb_tree_node<std::pair<const void* const, const char*> > >& -->
-    <reference-type-def kind='lvalue' type-id='type-id-1189' size-in-bits='64' id='type-id-1190'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1183' size-in-bits='64' id='type-id-1184'/>
     <!-- const std::allocator<std::pair<const void* const, const char*> > -->
-    <qualified-type-def type-id='type-id-1191' const='yes' id='type-id-1192'/>
+    <qualified-type-def type-id='type-id-1185' const='yes' id='type-id-1186'/>
     <!-- const std::allocator<std::pair<const void* const, const char*> >& -->
-    <reference-type-def kind='lvalue' type-id='type-id-1192' size-in-bits='64' id='type-id-1193'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1186' size-in-bits='64' id='type-id-1187'/>
     <!-- const std::less<const void*> -->
-    <qualified-type-def type-id='type-id-1194' const='yes' id='type-id-1195'/>
+    <qualified-type-def type-id='type-id-1188' const='yes' id='type-id-1189'/>
     <!-- const std::less<const void*>& -->
-    <reference-type-def kind='lvalue' type-id='type-id-1195' size-in-bits='64' id='type-id-1196'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1189' size-in-bits='64' id='type-id-1190'/>
     <!-- const std::less<const void*>* -->
-    <pointer-type-def type-id='type-id-1195' size-in-bits='64' id='type-id-1197'/>
+    <pointer-type-def type-id='type-id-1189' size-in-bits='64' id='type-id-1191'/>
     <!-- const std::map<const void*, const char*, std::less<const void*>, std::allocator<std::pair<const void* const, const char*> > > -->
-    <qualified-type-def type-id='type-id-1156' const='yes' id='type-id-1198'/>
+    <qualified-type-def type-id='type-id-1150' const='yes' id='type-id-1192'/>
     <!-- const std::map<const void*, const char*, std::less<const void*>, std::allocator<std::pair<const void* const, const char*> > >& -->
-    <reference-type-def kind='lvalue' type-id='type-id-1198' size-in-bits='64' id='type-id-1199'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1192' size-in-bits='64' id='type-id-1193'/>
     <!-- const std::map<const void*, const char*, std::less<const void*>, std::allocator<std::pair<const void* const, const char*> > >* -->
-    <pointer-type-def type-id='type-id-1198' size-in-bits='64' id='type-id-1200'/>
+    <pointer-type-def type-id='type-id-1192' size-in-bits='64' id='type-id-1194'/>
     <!-- const std::pair<const void* const, const char*> -->
-    <qualified-type-def type-id='type-id-1201' const='yes' id='type-id-1202'/>
+    <qualified-type-def type-id='type-id-1195' const='yes' id='type-id-1196'/>
     <!-- const std::pair<const void* const, const char*>& -->
-    <reference-type-def kind='lvalue' type-id='type-id-1202' size-in-bits='64' id='type-id-1203'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1196' size-in-bits='64' id='type-id-1197'/>
     <!-- const std::pair<const void* const, const char*>* -->
-    <pointer-type-def type-id='type-id-1202' size-in-bits='64' id='type-id-1204'/>
+    <pointer-type-def type-id='type-id-1196' size-in-bits='64' id='type-id-1198'/>
     <!-- std::_Rb_tree<const void*, std::pair<const void* const, const char*>, std::_Select1st<std::pair<const void* const, const char*> >, std::less<const void*>, std::allocator<std::pair<const void* const, const char*> > >& -->
-    <reference-type-def kind='lvalue' type-id='type-id-1169' size-in-bits='64' id='type-id-1205'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1163' size-in-bits='64' id='type-id-1199'/>
     <!-- std::_Rb_tree<const void*, std::pair<const void* const, const char*>, std::_Select1st<std::pair<const void* const, const char*> >, std::less<const void*>, std::allocator<std::pair<const void* const, const char*> > >* -->
-    <pointer-type-def type-id='type-id-1169' size-in-bits='64' id='type-id-1206'/>
+    <pointer-type-def type-id='type-id-1163' size-in-bits='64' id='type-id-1200'/>
     <!-- std::_Rb_tree<const void*, std::pair<const void* const, const char*>, std::_Select1st<std::pair<const void* const, const char*> >, std::less<const void*>, std::allocator<std::pair<const void* const, const char*> > >::_Rb_tree_impl<std::less<const void*>, false>* -->
-    <pointer-type-def type-id='type-id-1207' size-in-bits='64' id='type-id-1208'/>
+    <pointer-type-def type-id='type-id-1201' size-in-bits='64' id='type-id-1202'/>
     <!-- std::_Rb_tree_const_iterator<std::pair<const void* const, const char*> >& -->
-    <reference-type-def kind='lvalue' type-id='type-id-1173' size-in-bits='64' id='type-id-1209'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1167' size-in-bits='64' id='type-id-1203'/>
     <!-- std::_Rb_tree_const_iterator<std::pair<const void* const, const char*> >* -->
-    <pointer-type-def type-id='type-id-1173' size-in-bits='64' id='type-id-1210'/>
+    <pointer-type-def type-id='type-id-1167' size-in-bits='64' id='type-id-1204'/>
     <!-- std::_Rb_tree_iterator<std::pair<const void* const, const char*> >& -->
-    <reference-type-def kind='lvalue' type-id='type-id-1177' size-in-bits='64' id='type-id-1211'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1171' size-in-bits='64' id='type-id-1205'/>
     <!-- std::_Rb_tree_iterator<std::pair<const void* const, const char*> >* -->
-    <pointer-type-def type-id='type-id-1177' size-in-bits='64' id='type-id-1212'/>
+    <pointer-type-def type-id='type-id-1171' size-in-bits='64' id='type-id-1206'/>
     <!-- std::_Rb_tree_node<std::pair<const void* const, const char*> >& -->
-    <reference-type-def kind='lvalue' type-id='type-id-1181' size-in-bits='64' id='type-id-1213'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1175' size-in-bits='64' id='type-id-1207'/>
     <!-- std::_Rb_tree_node<std::pair<const void* const, const char*> >* -->
-    <pointer-type-def type-id='type-id-1181' size-in-bits='64' id='type-id-1214'/>
+    <pointer-type-def type-id='type-id-1175' size-in-bits='64' id='type-id-1208'/>
     <!-- std::allocator<std::_Rb_tree_node<std::pair<const void* const, const char*> > >& -->
-    <reference-type-def kind='lvalue' type-id='type-id-1188' size-in-bits='64' id='type-id-1215'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1182' size-in-bits='64' id='type-id-1209'/>
     <!-- std::allocator<std::_Rb_tree_node<std::pair<const void* const, const char*> > >* -->
-    <pointer-type-def type-id='type-id-1188' size-in-bits='64' id='type-id-1216'/>
+    <pointer-type-def type-id='type-id-1182' size-in-bits='64' id='type-id-1210'/>
     <!-- std::allocator<std::pair<const void* const, const char*> >* -->
-    <pointer-type-def type-id='type-id-1191' size-in-bits='64' id='type-id-1217'/>
+    <pointer-type-def type-id='type-id-1185' size-in-bits='64' id='type-id-1211'/>
     <!-- std::map<const void*, const char*, std::less<const void*>, std::allocator<std::pair<const void* const, const char*> > >& -->
-    <reference-type-def kind='lvalue' type-id='type-id-1156' size-in-bits='64' id='type-id-1218'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1150' size-in-bits='64' id='type-id-1212'/>
     <!-- std::map<const void*, const char*, std::less<const void*>, std::allocator<std::pair<const void* const, const char*> > >* -->
-    <pointer-type-def type-id='type-id-1156' size-in-bits='64' id='type-id-1219'/>
+    <pointer-type-def type-id='type-id-1150' size-in-bits='64' id='type-id-1213'/>
     <!-- std::pair<const void* const, const char*>& -->
-    <reference-type-def kind='lvalue' type-id='type-id-1201' size-in-bits='64' id='type-id-1220'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1195' size-in-bits='64' id='type-id-1214'/>
     <!-- std::pair<const void* const, const char*>* -->
-    <pointer-type-def type-id='type-id-1201' size-in-bits='64' id='type-id-1221'/>
+    <pointer-type-def type-id='type-id-1195' size-in-bits='64' id='type-id-1215'/>
     <!-- std::pair<std::_Rb_tree_iterator<std::pair<const void* const, const char*> >, bool>* -->
-    <pointer-type-def type-id='type-id-1222' size-in-bits='64' id='type-id-1223'/>
+    <pointer-type-def type-id='type-id-1216' size-in-bits='64' id='type-id-1217'/>
     <!-- namespace std -->
     <namespace-decl name='std'>
       <!-- class std::_Rb_tree<const void*, std::pair<const void* const, const char*>, std::_Select1st<std::pair<const void* const, const char*> >, std::less<const void*>, std::allocator<std::pair<const void* const, const char*> > > -->
-      <class-decl name='_Rb_tree&lt;const void*, std::pair&lt;const void* const, const char*&gt;, std::_Select1st&lt;std::pair&lt;const void* const, const char*&gt; &gt;, std::less&lt;const void*&gt;, std::allocator&lt;std::pair&lt;const void* const, const char*&gt; &gt; &gt;' size-in-bits='384' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='323' column='1' id='type-id-1169'>
+      <class-decl name='_Rb_tree&lt;const void*, std::pair&lt;const void* const, const char*&gt;, std::_Select1st&lt;std::pair&lt;const void* const, const char*&gt; &gt;, std::less&lt;const void*&gt;, std::allocator&lt;std::pair&lt;const void* const, const char*&gt; &gt; &gt;' size-in-bits='384' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='323' column='1' id='type-id-1163'>
         <member-type access='protected'>
           <!-- struct std::_Rb_tree<const void*, std::pair<const void* const, const char*>, std::_Select1st<std::pair<const void* const, const char*> >, std::less<const void*>, std::allocator<std::pair<const void* const, const char*> > >::_Rb_tree_impl<std::less<const void*>, false> -->
-          <class-decl name='_Rb_tree_impl&lt;std::less&lt;const void*&gt;, false&gt;' size-in-bits='384' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='427' column='1' id='type-id-1207'>
+          <class-decl name='_Rb_tree_impl&lt;std::less&lt;const void*&gt;, false&gt;' size-in-bits='384' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='427' column='1' id='type-id-1201'>
             <!-- class std::allocator<std::_Rb_tree_node<std::pair<const void* const, const char*> > > -->
-            <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1188'/>
+            <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1182'/>
             <data-member access='public' layout-offset-in-bits='0'>
               <!-- std::less<const void*> std::_Rb_tree<const void*, std::pair<const void* const, const char*>, std::_Select1st<std::pair<const void* const, const char*> >, std::less<const void*>, std::allocator<std::pair<const void* const, const char*> > >::_Rb_tree_impl<std::less<const void*>, false>::_M_key_compare -->
-              <var-decl name='_M_key_compare' type-id='type-id-1194' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='428' column='1'/>
+              <var-decl name='_M_key_compare' type-id='type-id-1188' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='428' column='1'/>
             </data-member>
             <data-member access='public' layout-offset-in-bits='64'>
               <!-- std::_Rb_tree_node_base std::_Rb_tree<const void*, std::pair<const void* const, const char*>, std::_Select1st<std::pair<const void* const, const char*> >, std::less<const void*>, std::allocator<std::pair<const void* const, const char*> > >::_Rb_tree_impl<std::less<const void*>, false>::_M_header -->
@@ -29749,7 +29358,7 @@
               <!-- void std::_Rb_tree<const void*, std::pair<const void* const, const char*>, std::_Select1st<std::pair<const void* const, const char*> >, std::less<const void*>, std::allocator<std::pair<const void* const, const char*> > >::_Rb_tree_impl<std::less<const void*>, false>::_Rb_tree_impl() -->
               <function-decl name='_Rb_tree_impl' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='432' column='1' visibility='default' binding='global' size-in-bits='64'>
                 <!-- implicit parameter of type 'std::_Rb_tree<const void*, std::pair<const void* const, const char*>, std::_Select1st<std::pair<const void* const, const char*> >, std::less<const void*>, std::allocator<std::pair<const void* const, const char*> > >::_Rb_tree_impl<std::less<const void*>, false>*' -->
-                <parameter type-id='type-id-1208' is-artificial='yes'/>
+                <parameter type-id='type-id-1202' is-artificial='yes'/>
                 <!-- void -->
                 <return type-id='type-id-56'/>
               </function-decl>
@@ -29758,11 +29367,11 @@
               <!-- void std::_Rb_tree<const void*, std::pair<const void* const, const char*>, std::_Select1st<std::pair<const void* const, const char*> >, std::less<const void*>, std::allocator<std::pair<const void* const, const char*> > >::_Rb_tree_impl<std::less<const void*>, false>::_Rb_tree_impl(const std::less<const void*>&, const std::allocator<std::_Rb_tree_node<std::pair<const void* const, const char*> > >&) -->
               <function-decl name='_Rb_tree_impl' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='437' column='1' visibility='default' binding='global' size-in-bits='64'>
                 <!-- implicit parameter of type 'std::_Rb_tree<const void*, std::pair<const void* const, const char*>, std::_Select1st<std::pair<const void* const, const char*> >, std::less<const void*>, std::allocator<std::pair<const void* const, const char*> > >::_Rb_tree_impl<std::less<const void*>, false>*' -->
-                <parameter type-id='type-id-1208' is-artificial='yes'/>
+                <parameter type-id='type-id-1202' is-artificial='yes'/>
                 <!-- parameter of type 'const std::less<const void*>&' -->
-                <parameter type-id='type-id-1196'/>
-                <!-- parameter of type 'const std::allocator<std::_Rb_tree_node<std::pair<const void* const, const char*> > >&' -->
                 <parameter type-id='type-id-1190'/>
+                <!-- parameter of type 'const std::allocator<std::_Rb_tree_node<std::pair<const void* const, const char*> > >&' -->
+                <parameter type-id='type-id-1184'/>
                 <!-- void -->
                 <return type-id='type-id-56'/>
               </function-decl>
@@ -29771,7 +29380,7 @@
               <!-- void std::_Rb_tree<const void*, std::pair<const void* const, const char*>, std::_Select1st<std::pair<const void* const, const char*> >, std::less<const void*>, std::allocator<std::pair<const void* const, const char*> > >::_Rb_tree_impl<std::less<const void*>, false>::_M_initialize() -->
               <function-decl name='_M_initialize' mangled-name='_ZNSt8_Rb_treeIPKvSt4pairIKS1_PKcESt10_Select1stIS6_ESt4lessIS1_ESaIS6_EE13_Rb_tree_implISA_Lb0EE13_M_initializeEv' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='444' column='1' visibility='default' binding='global' size-in-bits='64'>
                 <!-- implicit parameter of type 'std::_Rb_tree<const void*, std::pair<const void* const, const char*>, std::_Select1st<std::pair<const void* const, const char*> >, std::less<const void*>, std::allocator<std::pair<const void* const, const char*> > >::_Rb_tree_impl<std::less<const void*>, false>*' -->
-                <parameter type-id='type-id-1208' is-artificial='yes'/>
+                <parameter type-id='type-id-1202' is-artificial='yes'/>
                 <!-- void -->
                 <return type-id='type-id-56'/>
               </function-decl>
@@ -29780,51 +29389,51 @@
         </member-type>
         <data-member access='protected' layout-offset-in-bits='0'>
           <!-- std::_Rb_tree<const void*, std::pair<const void* const, const char*>, std::_Select1st<std::pair<const void* const, const char*> >, std::less<const void*>, std::allocator<std::pair<const void* const, const char*> > >::_Rb_tree_impl<std::less<const void*>, false> std::_Rb_tree<const void*, std::pair<const void* const, const char*>, std::_Select1st<std::pair<const void* const, const char*> >, std::less<const void*>, std::allocator<std::pair<const void* const, const char*> > >::_M_impl -->
-          <var-decl name='_M_impl' type-id='type-id-1207' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='453' column='1'/>
+          <var-decl name='_M_impl' type-id='type-id-1201' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='453' column='1'/>
         </data-member>
         <member-function access='private'>
           <!-- std::allocator<std::_Rb_tree_node<std::pair<const void* const, const char*> > >& std::_Rb_tree<const void*, std::pair<const void* const, const char*>, std::_Select1st<std::pair<const void* const, const char*> >, std::less<const void*>, std::allocator<std::pair<const void* const, const char*> > >::_M_get_Node_allocator() -->
           <function-decl name='_M_get_Node_allocator' mangled-name='_ZNSt8_Rb_treeIPKvSt4pairIKS1_PKcESt10_Select1stIS6_ESt4lessIS1_ESaIS6_EE21_M_get_Node_allocatorEv' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='345' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::_Rb_tree<const void*, std::pair<const void* const, const char*>, std::_Select1st<std::pair<const void* const, const char*> >, std::less<const void*>, std::allocator<std::pair<const void* const, const char*> > >*' -->
-            <parameter type-id='type-id-1206' is-artificial='yes'/>
+            <parameter type-id='type-id-1200' is-artificial='yes'/>
             <!-- std::allocator<std::_Rb_tree_node<std::pair<const void* const, const char*> > >& -->
-            <return type-id='type-id-1215'/>
+            <return type-id='type-id-1209'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <!-- const std::allocator<std::_Rb_tree_node<std::pair<const void* const, const char*> > >& std::_Rb_tree<const void*, std::pair<const void* const, const char*>, std::_Select1st<std::pair<const void* const, const char*> >, std::less<const void*>, std::allocator<std::pair<const void* const, const char*> > >::_M_get_Node_allocator() -->
           <function-decl name='_M_get_Node_allocator' mangled-name='_ZNKSt8_Rb_treeIPKvSt4pairIKS1_PKcESt10_Select1stIS6_ESt4lessIS1_ESaIS6_EE21_M_get_Node_allocatorEv' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='349' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const std::_Rb_tree<const void*, std::pair<const void* const, const char*>, std::_Select1st<std::pair<const void* const, const char*> >, std::less<const void*>, std::allocator<std::pair<const void* const, const char*> > >*' -->
-            <parameter type-id='type-id-1172' is-artificial='yes'/>
+            <parameter type-id='type-id-1166' is-artificial='yes'/>
             <!-- const std::allocator<std::_Rb_tree_node<std::pair<const void* const, const char*> > >& -->
-            <return type-id='type-id-1190'/>
+            <return type-id='type-id-1184'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <!-- std::allocator<std::pair<const void* const, const char*> > std::_Rb_tree<const void*, std::pair<const void* const, const char*>, std::_Select1st<std::pair<const void* const, const char*> >, std::less<const void*>, std::allocator<std::pair<const void* const, const char*> > >::get_allocator() -->
           <function-decl name='get_allocator' mangled-name='_ZNKSt8_Rb_treeIPKvSt4pairIKS1_PKcESt10_Select1stIS6_ESt4lessIS1_ESaIS6_EE13get_allocatorEv' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='353' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const std::_Rb_tree<const void*, std::pair<const void* const, const char*>, std::_Select1st<std::pair<const void* const, const char*> >, std::less<const void*>, std::allocator<std::pair<const void* const, const char*> > >*' -->
-            <parameter type-id='type-id-1172' is-artificial='yes'/>
+            <parameter type-id='type-id-1166' is-artificial='yes'/>
             <!-- class std::allocator<std::pair<const void* const, const char*> > -->
-            <return type-id='type-id-1191'/>
+            <return type-id='type-id-1185'/>
           </function-decl>
         </member-function>
         <member-function access='protected'>
           <!-- std::_Rb_tree_node<std::pair<const void* const, const char*> >* std::_Rb_tree<const void*, std::pair<const void* const, const char*>, std::_Select1st<std::pair<const void* const, const char*> >, std::less<const void*>, std::allocator<std::pair<const void* const, const char*> > >::_M_get_node() -->
           <function-decl name='_M_get_node' mangled-name='_ZNSt8_Rb_treeIPKvSt4pairIKS1_PKcESt10_Select1stIS6_ESt4lessIS1_ESaIS6_EE11_M_get_nodeEv' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='358' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::_Rb_tree<const void*, std::pair<const void* const, const char*>, std::_Select1st<std::pair<const void* const, const char*> >, std::less<const void*>, std::allocator<std::pair<const void* const, const char*> > >*' -->
-            <parameter type-id='type-id-1206' is-artificial='yes'/>
+            <parameter type-id='type-id-1200' is-artificial='yes'/>
             <!-- std::_Rb_tree_node<std::pair<const void* const, const char*> >* -->
-            <return type-id='type-id-1214'/>
+            <return type-id='type-id-1208'/>
           </function-decl>
         </member-function>
         <member-function access='protected'>
           <!-- void std::_Rb_tree<const void*, std::pair<const void* const, const char*>, std::_Select1st<std::pair<const void* const, const char*> >, std::less<const void*>, std::allocator<std::pair<const void* const, const char*> > >::_M_put_node(std::_Rb_tree_node<std::pair<const void* const, const char*> >*) -->
           <function-decl name='_M_put_node' mangled-name='_ZNSt8_Rb_treeIPKvSt4pairIKS1_PKcESt10_Select1stIS6_ESt4lessIS1_ESaIS6_EE11_M_put_nodeEPSt13_Rb_tree_nodeIS6_E' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='362' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::_Rb_tree<const void*, std::pair<const void* const, const char*>, std::_Select1st<std::pair<const void* const, const char*> >, std::less<const void*>, std::allocator<std::pair<const void* const, const char*> > >*' -->
-            <parameter type-id='type-id-1206' is-artificial='yes'/>
+            <parameter type-id='type-id-1200' is-artificial='yes'/>
             <!-- parameter of type 'std::_Rb_tree_node<std::pair<const void* const, const char*> >*' -->
-            <parameter type-id='type-id-1214'/>
+            <parameter type-id='type-id-1208'/>
             <!-- void -->
             <return type-id='type-id-56'/>
           </function-decl>
@@ -29833,20 +29442,20 @@
           <!-- std::_Rb_tree_node<std::pair<const void* const, const char*> >* std::_Rb_tree<const void*, std::pair<const void* const, const char*>, std::_Select1st<std::pair<const void* const, const char*> >, std::less<const void*>, std::allocator<std::pair<const void* const, const char*> > >::_M_create_node(const std::pair<const void* const, const char*>&) -->
           <function-decl name='_M_create_node' mangled-name='_ZNSt8_Rb_treeIPKvSt4pairIKS1_PKcESt10_Select1stIS6_ESt4lessIS1_ESaIS6_EE14_M_create_nodeERKS6_' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='367' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::_Rb_tree<const void*, std::pair<const void* const, const char*>, std::_Select1st<std::pair<const void* const, const char*> >, std::less<const void*>, std::allocator<std::pair<const void* const, const char*> > >*' -->
-            <parameter type-id='type-id-1206' is-artificial='yes'/>
+            <parameter type-id='type-id-1200' is-artificial='yes'/>
             <!-- parameter of type 'const std::pair<const void* const, const char*>&' -->
-            <parameter type-id='type-id-1203'/>
+            <parameter type-id='type-id-1197'/>
             <!-- std::_Rb_tree_node<std::pair<const void* const, const char*> >* -->
-            <return type-id='type-id-1214'/>
+            <return type-id='type-id-1208'/>
           </function-decl>
         </member-function>
         <member-function access='protected'>
           <!-- void std::_Rb_tree<const void*, std::pair<const void* const, const char*>, std::_Select1st<std::pair<const void* const, const char*> >, std::less<const void*>, std::allocator<std::pair<const void* const, const char*> > >::_M_destroy_node(std::_Rb_tree_node<std::pair<const void* const, const char*> >*) -->
           <function-decl name='_M_destroy_node' mangled-name='_ZNSt8_Rb_treeIPKvSt4pairIKS1_PKcESt10_Select1stIS6_ESt4lessIS1_ESaIS6_EE15_M_destroy_nodeEPSt13_Rb_tree_nodeIS6_E' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='381' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::_Rb_tree<const void*, std::pair<const void* const, const char*>, std::_Select1st<std::pair<const void* const, const char*> >, std::less<const void*>, std::allocator<std::pair<const void* const, const char*> > >*' -->
-            <parameter type-id='type-id-1206' is-artificial='yes'/>
+            <parameter type-id='type-id-1200' is-artificial='yes'/>
             <!-- parameter of type 'std::_Rb_tree_node<std::pair<const void* const, const char*> >*' -->
-            <parameter type-id='type-id-1214'/>
+            <parameter type-id='type-id-1208'/>
             <!-- void -->
             <return type-id='type-id-56'/>
           </function-decl>
@@ -29855,18 +29464,18 @@
           <!-- std::_Rb_tree_node<std::pair<const void* const, const char*> >* std::_Rb_tree<const void*, std::pair<const void* const, const char*>, std::_Select1st<std::pair<const void* const, const char*> >, std::less<const void*>, std::allocator<std::pair<const void* const, const char*> > >::_M_clone_node(const std::_Rb_tree_node<std::pair<const void* const, const char*> >*) -->
           <function-decl name='_M_clone_node' mangled-name='_ZNSt8_Rb_treeIPKvSt4pairIKS1_PKcESt10_Select1stIS6_ESt4lessIS1_ESaIS6_EE13_M_clone_nodeEPKSt13_Rb_tree_nodeIS6_E' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='414' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::_Rb_tree<const void*, std::pair<const void* const, const char*>, std::_Select1st<std::pair<const void* const, const char*> >, std::less<const void*>, std::allocator<std::pair<const void* const, const char*> > >*' -->
-            <parameter type-id='type-id-1206' is-artificial='yes'/>
+            <parameter type-id='type-id-1200' is-artificial='yes'/>
             <!-- parameter of type 'const std::_Rb_tree_node<std::pair<const void* const, const char*> >*' -->
-            <parameter type-id='type-id-1184'/>
+            <parameter type-id='type-id-1178'/>
             <!-- std::_Rb_tree_node<std::pair<const void* const, const char*> >* -->
-            <return type-id='type-id-1214'/>
+            <return type-id='type-id-1208'/>
           </function-decl>
         </member-function>
         <member-function access='protected'>
           <!-- std::_Rb_tree_node_base*& std::_Rb_tree<const void*, std::pair<const void* const, const char*>, std::_Select1st<std::pair<const void* const, const char*> >, std::less<const void*>, std::allocator<std::pair<const void* const, const char*> > >::_M_root() -->
           <function-decl name='_M_root' mangled-name='_ZNSt8_Rb_treeIPKvSt4pairIKS1_PKcESt10_Select1stIS6_ESt4lessIS1_ESaIS6_EE7_M_rootEv' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='457' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::_Rb_tree<const void*, std::pair<const void* const, const char*>, std::_Select1st<std::pair<const void* const, const char*> >, std::less<const void*>, std::allocator<std::pair<const void* const, const char*> > >*' -->
-            <parameter type-id='type-id-1206' is-artificial='yes'/>
+            <parameter type-id='type-id-1200' is-artificial='yes'/>
             <!-- std::_Rb_tree_node_base*& -->
             <return type-id='type-id-651'/>
           </function-decl>
@@ -29875,7 +29484,7 @@
           <!-- const std::_Rb_tree_node_base* std::_Rb_tree<const void*, std::pair<const void* const, const char*>, std::_Select1st<std::pair<const void* const, const char*> >, std::less<const void*>, std::allocator<std::pair<const void* const, const char*> > >::_M_root() -->
           <function-decl name='_M_root' mangled-name='_ZNKSt8_Rb_treeIPKvSt4pairIKS1_PKcESt10_Select1stIS6_ESt4lessIS1_ESaIS6_EE7_M_rootEv' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='461' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const std::_Rb_tree<const void*, std::pair<const void* const, const char*>, std::_Select1st<std::pair<const void* const, const char*> >, std::less<const void*>, std::allocator<std::pair<const void* const, const char*> > >*' -->
-            <parameter type-id='type-id-1172' is-artificial='yes'/>
+            <parameter type-id='type-id-1166' is-artificial='yes'/>
             <!-- const std::_Rb_tree_node_base* -->
             <return type-id='type-id-533'/>
           </function-decl>
@@ -29884,7 +29493,7 @@
           <!-- std::_Rb_tree_node_base*& std::_Rb_tree<const void*, std::pair<const void* const, const char*>, std::_Select1st<std::pair<const void* const, const char*> >, std::less<const void*>, std::allocator<std::pair<const void* const, const char*> > >::_M_leftmost() -->
           <function-decl name='_M_leftmost' mangled-name='_ZNSt8_Rb_treeIPKvSt4pairIKS1_PKcESt10_Select1stIS6_ESt4lessIS1_ESaIS6_EE11_M_leftmostEv' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='465' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::_Rb_tree<const void*, std::pair<const void* const, const char*>, std::_Select1st<std::pair<const void* const, const char*> >, std::less<const void*>, std::allocator<std::pair<const void* const, const char*> > >*' -->
-            <parameter type-id='type-id-1206' is-artificial='yes'/>
+            <parameter type-id='type-id-1200' is-artificial='yes'/>
             <!-- std::_Rb_tree_node_base*& -->
             <return type-id='type-id-651'/>
           </function-decl>
@@ -29893,7 +29502,7 @@
           <!-- const std::_Rb_tree_node_base* std::_Rb_tree<const void*, std::pair<const void* const, const char*>, std::_Select1st<std::pair<const void* const, const char*> >, std::less<const void*>, std::allocator<std::pair<const void* const, const char*> > >::_M_leftmost() -->
           <function-decl name='_M_leftmost' mangled-name='_ZNKSt8_Rb_treeIPKvSt4pairIKS1_PKcESt10_Select1stIS6_ESt4lessIS1_ESaIS6_EE11_M_leftmostEv' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='469' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const std::_Rb_tree<const void*, std::pair<const void* const, const char*>, std::_Select1st<std::pair<const void* const, const char*> >, std::less<const void*>, std::allocator<std::pair<const void* const, const char*> > >*' -->
-            <parameter type-id='type-id-1172' is-artificial='yes'/>
+            <parameter type-id='type-id-1166' is-artificial='yes'/>
             <!-- const std::_Rb_tree_node_base* -->
             <return type-id='type-id-533'/>
           </function-decl>
@@ -29902,7 +29511,7 @@
           <!-- std::_Rb_tree_node_base*& std::_Rb_tree<const void*, std::pair<const void* const, const char*>, std::_Select1st<std::pair<const void* const, const char*> >, std::less<const void*>, std::allocator<std::pair<const void* const, const char*> > >::_M_rightmost() -->
           <function-decl name='_M_rightmost' mangled-name='_ZNSt8_Rb_treeIPKvSt4pairIKS1_PKcESt10_Select1stIS6_ESt4lessIS1_ESaIS6_EE12_M_rightmostEv' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='473' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::_Rb_tree<const void*, std::pair<const void* const, const char*>, std::_Select1st<std::pair<const void* const, const char*> >, std::less<const void*>, std::allocator<std::pair<const void* const, const char*> > >*' -->
-            <parameter type-id='type-id-1206' is-artificial='yes'/>
+            <parameter type-id='type-id-1200' is-artificial='yes'/>
             <!-- std::_Rb_tree_node_base*& -->
             <return type-id='type-id-651'/>
           </function-decl>
@@ -29911,7 +29520,7 @@
           <!-- const std::_Rb_tree_node_base* std::_Rb_tree<const void*, std::pair<const void* const, const char*>, std::_Select1st<std::pair<const void* const, const char*> >, std::less<const void*>, std::allocator<std::pair<const void* const, const char*> > >::_M_rightmost() -->
           <function-decl name='_M_rightmost' mangled-name='_ZNKSt8_Rb_treeIPKvSt4pairIKS1_PKcESt10_Select1stIS6_ESt4lessIS1_ESaIS6_EE12_M_rightmostEv' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='477' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const std::_Rb_tree<const void*, std::pair<const void* const, const char*>, std::_Select1st<std::pair<const void* const, const char*> >, std::less<const void*>, std::allocator<std::pair<const void* const, const char*> > >*' -->
-            <parameter type-id='type-id-1172' is-artificial='yes'/>
+            <parameter type-id='type-id-1166' is-artificial='yes'/>
             <!-- const std::_Rb_tree_node_base* -->
             <return type-id='type-id-533'/>
           </function-decl>
@@ -29920,52 +29529,52 @@
           <!-- std::_Rb_tree_node<std::pair<const void* const, const char*> >* std::_Rb_tree<const void*, std::pair<const void* const, const char*>, std::_Select1st<std::pair<const void* const, const char*> >, std::less<const void*>, std::allocator<std::pair<const void* const, const char*> > >::_M_begin() -->
           <function-decl name='_M_begin' mangled-name='_ZNSt8_Rb_treeIPKvSt4pairIKS1_PKcESt10_Select1stIS6_ESt4lessIS1_ESaIS6_EE8_M_beginEv' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='481' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::_Rb_tree<const void*, std::pair<const void* const, const char*>, std::_Select1st<std::pair<const void* const, const char*> >, std::less<const void*>, std::allocator<std::pair<const void* const, const char*> > >*' -->
-            <parameter type-id='type-id-1206' is-artificial='yes'/>
+            <parameter type-id='type-id-1200' is-artificial='yes'/>
             <!-- std::_Rb_tree_node<std::pair<const void* const, const char*> >* -->
-            <return type-id='type-id-1214'/>
+            <return type-id='type-id-1208'/>
           </function-decl>
         </member-function>
         <member-function access='protected'>
           <!-- const std::_Rb_tree_node<std::pair<const void* const, const char*> >* std::_Rb_tree<const void*, std::pair<const void* const, const char*>, std::_Select1st<std::pair<const void* const, const char*> >, std::less<const void*>, std::allocator<std::pair<const void* const, const char*> > >::_M_begin() -->
           <function-decl name='_M_begin' mangled-name='_ZNKSt8_Rb_treeIPKvSt4pairIKS1_PKcESt10_Select1stIS6_ESt4lessIS1_ESaIS6_EE8_M_beginEv' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='485' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const std::_Rb_tree<const void*, std::pair<const void* const, const char*>, std::_Select1st<std::pair<const void* const, const char*> >, std::less<const void*>, std::allocator<std::pair<const void* const, const char*> > >*' -->
-            <parameter type-id='type-id-1172' is-artificial='yes'/>
+            <parameter type-id='type-id-1166' is-artificial='yes'/>
             <!-- const std::_Rb_tree_node<std::pair<const void* const, const char*> >* -->
-            <return type-id='type-id-1184'/>
+            <return type-id='type-id-1178'/>
           </function-decl>
         </member-function>
         <member-function access='protected'>
           <!-- std::_Rb_tree_node<std::pair<const void* const, const char*> >* std::_Rb_tree<const void*, std::pair<const void* const, const char*>, std::_Select1st<std::pair<const void* const, const char*> >, std::less<const void*>, std::allocator<std::pair<const void* const, const char*> > >::_M_end() -->
           <function-decl name='_M_end' mangled-name='_ZNSt8_Rb_treeIPKvSt4pairIKS1_PKcESt10_Select1stIS6_ESt4lessIS1_ESaIS6_EE6_M_endEv' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='492' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::_Rb_tree<const void*, std::pair<const void* const, const char*>, std::_Select1st<std::pair<const void* const, const char*> >, std::less<const void*>, std::allocator<std::pair<const void* const, const char*> > >*' -->
-            <parameter type-id='type-id-1206' is-artificial='yes'/>
+            <parameter type-id='type-id-1200' is-artificial='yes'/>
             <!-- std::_Rb_tree_node<std::pair<const void* const, const char*> >* -->
-            <return type-id='type-id-1214'/>
+            <return type-id='type-id-1208'/>
           </function-decl>
         </member-function>
         <member-function access='protected'>
           <!-- const std::_Rb_tree_node<std::pair<const void* const, const char*> >* std::_Rb_tree<const void*, std::pair<const void* const, const char*>, std::_Select1st<std::pair<const void* const, const char*> >, std::less<const void*>, std::allocator<std::pair<const void* const, const char*> > >::_M_end() -->
           <function-decl name='_M_end' mangled-name='_ZNKSt8_Rb_treeIPKvSt4pairIKS1_PKcESt10_Select1stIS6_ESt4lessIS1_ESaIS6_EE6_M_endEv' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='496' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const std::_Rb_tree<const void*, std::pair<const void* const, const char*>, std::_Select1st<std::pair<const void* const, const char*> >, std::less<const void*>, std::allocator<std::pair<const void* const, const char*> > >*' -->
-            <parameter type-id='type-id-1172' is-artificial='yes'/>
+            <parameter type-id='type-id-1166' is-artificial='yes'/>
             <!-- const std::_Rb_tree_node<std::pair<const void* const, const char*> >* -->
-            <return type-id='type-id-1184'/>
+            <return type-id='type-id-1178'/>
           </function-decl>
         </member-function>
         <member-function access='protected' static='yes'>
           <!-- const std::pair<const void* const, const char*>& std::_Rb_tree<const void*, std::pair<const void* const, const char*>, std::_Select1st<std::pair<const void* const, const char*> >, std::less<const void*>, std::allocator<std::pair<const void* const, const char*> > >::_S_value() -->
           <function-decl name='_S_value' mangled-name='_ZNSt8_Rb_treeIPKvSt4pairIKS1_PKcESt10_Select1stIS6_ESt4lessIS1_ESaIS6_EE8_S_valueEPKSt13_Rb_tree_nodeIS6_E' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='500' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- parameter of type 'const std::_Rb_tree_node<std::pair<const void* const, const char*> >*' -->
-            <parameter type-id='type-id-1184'/>
+            <parameter type-id='type-id-1178'/>
             <!-- const std::pair<const void* const, const char*>& -->
-            <return type-id='type-id-1203'/>
+            <return type-id='type-id-1197'/>
           </function-decl>
         </member-function>
         <member-function access='protected' static='yes'>
           <!-- void* const& std::_Rb_tree<const void*, std::pair<const void* const, const char*>, std::_Select1st<std::pair<const void* const, const char*> >, std::less<const void*>, std::allocator<std::pair<const void* const, const char*> > >::_S_key() -->
           <function-decl name='_S_key' mangled-name='_ZNSt8_Rb_treeIPKvSt4pairIKS1_PKcESt10_Select1stIS6_ESt4lessIS1_ESaIS6_EE6_S_keyEPKSt13_Rb_tree_nodeIS6_E' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='504' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- parameter of type 'const std::_Rb_tree_node<std::pair<const void* const, const char*> >*' -->
-            <parameter type-id='type-id-1184'/>
+            <parameter type-id='type-id-1178'/>
             <!-- void* const& -->
             <return type-id='type-id-149'/>
           </function-decl>
@@ -29976,7 +29585,7 @@
             <!-- parameter of type 'std::_Rb_tree_node_base*' -->
             <parameter type-id='type-id-650'/>
             <!-- std::_Rb_tree_node<std::pair<const void* const, const char*> >* -->
-            <return type-id='type-id-1214'/>
+            <return type-id='type-id-1208'/>
           </function-decl>
         </member-function>
         <member-function access='protected' static='yes'>
@@ -29985,7 +29594,7 @@
             <!-- parameter of type 'const std::_Rb_tree_node_base*' -->
             <parameter type-id='type-id-533'/>
             <!-- const std::_Rb_tree_node<std::pair<const void* const, const char*> >* -->
-            <return type-id='type-id-1184'/>
+            <return type-id='type-id-1178'/>
           </function-decl>
         </member-function>
         <member-function access='protected' static='yes'>
@@ -29994,7 +29603,7 @@
             <!-- parameter of type 'std::_Rb_tree_node_base*' -->
             <parameter type-id='type-id-650'/>
             <!-- std::_Rb_tree_node<std::pair<const void* const, const char*> >* -->
-            <return type-id='type-id-1214'/>
+            <return type-id='type-id-1208'/>
           </function-decl>
         </member-function>
         <member-function access='protected' static='yes'>
@@ -30003,7 +29612,7 @@
             <!-- parameter of type 'const std::_Rb_tree_node_base*' -->
             <parameter type-id='type-id-533'/>
             <!-- const std::_Rb_tree_node<std::pair<const void* const, const char*> >* -->
-            <return type-id='type-id-1184'/>
+            <return type-id='type-id-1178'/>
           </function-decl>
         </member-function>
         <member-function access='protected' static='yes'>
@@ -30012,7 +29621,7 @@
             <!-- parameter of type 'const std::_Rb_tree_node_base*' -->
             <parameter type-id='type-id-533'/>
             <!-- const std::pair<const void* const, const char*>& -->
-            <return type-id='type-id-1203'/>
+            <return type-id='type-id-1197'/>
           </function-decl>
         </member-function>
         <member-function access='protected' static='yes'>
@@ -30064,63 +29673,63 @@
           <!-- std::_Rb_tree_iterator<std::pair<const void* const, const char*> > std::_Rb_tree<const void*, std::pair<const void* const, const char*>, std::_Select1st<std::pair<const void* const, const char*> >, std::less<const void*>, std::allocator<std::pair<const void* const, const char*> > >::_M_insert_(const std::_Rb_tree_node_base*, const std::_Rb_tree_node_base*, const std::pair<const void* const, const char*>&) -->
           <function-decl name='_M_insert_' mangled-name='_ZNSt8_Rb_treeIPKvSt4pairIKS1_PKcESt10_Select1stIS6_ESt4lessIS1_ESaIS6_EE10_M_insert_EPKSt18_Rb_tree_node_baseSF_RKS6_' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='874' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt8_Rb_treeIPKvSt4pairIKS1_PKcESt10_Select1stIS6_ESt4lessIS1_ESaIS6_EE10_M_insert_EPKSt18_Rb_tree_node_baseSF_RKS6_'>
             <!-- implicit parameter of type 'std::_Rb_tree<const void*, std::pair<const void* const, const char*>, std::_Select1st<std::pair<const void* const, const char*> >, std::less<const void*>, std::allocator<std::pair<const void* const, const char*> > >*' -->
-            <parameter type-id='type-id-1206' is-artificial='yes'/>
+            <parameter type-id='type-id-1200' is-artificial='yes'/>
             <!-- parameter of type 'const std::_Rb_tree_node_base*' -->
             <parameter type-id='type-id-533'/>
             <!-- parameter of type 'const std::_Rb_tree_node_base*' -->
             <parameter type-id='type-id-533'/>
             <!-- parameter of type 'const std::pair<const void* const, const char*>&' -->
-            <parameter type-id='type-id-1203'/>
+            <parameter type-id='type-id-1197'/>
             <!-- struct std::_Rb_tree_iterator<std::pair<const void* const, const char*> > -->
-            <return type-id='type-id-1177'/>
+            <return type-id='type-id-1171'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <!-- std::_Rb_tree_iterator<std::pair<const void* const, const char*> > std::_Rb_tree<const void*, std::pair<const void* const, const char*>, std::_Select1st<std::pair<const void* const, const char*> >, std::less<const void*>, std::allocator<std::pair<const void* const, const char*> > >::_M_insert_lower(std::_Rb_tree_node_base*, std::_Rb_tree_node_base*, const std::pair<const void* const, const char*>&) -->
           <function-decl name='_M_insert_lower' mangled-name='_ZNSt8_Rb_treeIPKvSt4pairIKS1_PKcESt10_Select1stIS6_ESt4lessIS1_ESaIS6_EE15_M_insert_lowerEPSt18_Rb_tree_node_baseSE_RKS6_' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='893' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::_Rb_tree<const void*, std::pair<const void* const, const char*>, std::_Select1st<std::pair<const void* const, const char*> >, std::less<const void*>, std::allocator<std::pair<const void* const, const char*> > >*' -->
-            <parameter type-id='type-id-1206' is-artificial='yes'/>
+            <parameter type-id='type-id-1200' is-artificial='yes'/>
             <!-- parameter of type 'std::_Rb_tree_node_base*' -->
             <parameter type-id='type-id-650'/>
             <!-- parameter of type 'std::_Rb_tree_node_base*' -->
             <parameter type-id='type-id-650'/>
             <!-- parameter of type 'const std::pair<const void* const, const char*>&' -->
-            <parameter type-id='type-id-1203'/>
+            <parameter type-id='type-id-1197'/>
             <!-- struct std::_Rb_tree_iterator<std::pair<const void* const, const char*> > -->
-            <return type-id='type-id-1177'/>
+            <return type-id='type-id-1171'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <!-- std::_Rb_tree_iterator<std::pair<const void* const, const char*> > std::_Rb_tree<const void*, std::pair<const void* const, const char*>, std::_Select1st<std::pair<const void* const, const char*> >, std::less<const void*>, std::allocator<std::pair<const void* const, const char*> > >::_M_insert_equal_lower(const std::pair<const void* const, const char*>&) -->
           <function-decl name='_M_insert_equal_lower' mangled-name='_ZNSt8_Rb_treeIPKvSt4pairIKS1_PKcESt10_Select1stIS6_ESt4lessIS1_ESaIS6_EE21_M_insert_equal_lowerERKS6_' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='911' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::_Rb_tree<const void*, std::pair<const void* const, const char*>, std::_Select1st<std::pair<const void* const, const char*> >, std::less<const void*>, std::allocator<std::pair<const void* const, const char*> > >*' -->
-            <parameter type-id='type-id-1206' is-artificial='yes'/>
+            <parameter type-id='type-id-1200' is-artificial='yes'/>
             <!-- parameter of type 'const std::pair<const void* const, const char*>&' -->
-            <parameter type-id='type-id-1203'/>
+            <parameter type-id='type-id-1197'/>
             <!-- struct std::_Rb_tree_iterator<std::pair<const void* const, const char*> > -->
-            <return type-id='type-id-1177'/>
+            <return type-id='type-id-1171'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <!-- std::_Rb_tree_node<std::pair<const void* const, const char*> >* std::_Rb_tree<const void*, std::pair<const void* const, const char*>, std::_Select1st<std::pair<const void* const, const char*> >, std::less<const void*>, std::allocator<std::pair<const void* const, const char*> > >::_M_copy(const std::_Rb_tree_node<std::pair<const void* const, const char*> >*, std::_Rb_tree_node<std::pair<const void* const, const char*> >*) -->
           <function-decl name='_M_copy' mangled-name='_ZNSt8_Rb_treeIPKvSt4pairIKS1_PKcESt10_Select1stIS6_ESt4lessIS1_ESaIS6_EE7_M_copyEPKSt13_Rb_tree_nodeIS6_EPSE_' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='928' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::_Rb_tree<const void*, std::pair<const void* const, const char*>, std::_Select1st<std::pair<const void* const, const char*> >, std::less<const void*>, std::allocator<std::pair<const void* const, const char*> > >*' -->
-            <parameter type-id='type-id-1206' is-artificial='yes'/>
+            <parameter type-id='type-id-1200' is-artificial='yes'/>
             <!-- parameter of type 'const std::_Rb_tree_node<std::pair<const void* const, const char*> >*' -->
-            <parameter type-id='type-id-1184'/>
+            <parameter type-id='type-id-1178'/>
             <!-- parameter of type 'std::_Rb_tree_node<std::pair<const void* const, const char*> >*' -->
-            <parameter type-id='type-id-1214'/>
+            <parameter type-id='type-id-1208'/>
             <!-- std::_Rb_tree_node<std::pair<const void* const, const char*> >* -->
-            <return type-id='type-id-1214'/>
+            <return type-id='type-id-1208'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <!-- void std::_Rb_tree<const void*, std::pair<const void* const, const char*>, std::_Select1st<std::pair<const void* const, const char*> >, std::less<const void*>, std::allocator<std::pair<const void* const, const char*> > >::_M_erase(std::_Rb_tree_node<std::pair<const void* const, const char*> >*) -->
           <function-decl name='_M_erase' mangled-name='_ZNSt8_Rb_treeIPKvSt4pairIKS1_PKcESt10_Select1stIS6_ESt4lessIS1_ESaIS6_EE8_M_eraseEPSt13_Rb_tree_nodeIS6_E' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='964' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt8_Rb_treeIPKvSt4pairIKS1_PKcESt10_Select1stIS6_ESt4lessIS1_ESaIS6_EE8_M_eraseEPSt13_Rb_tree_nodeIS6_E'>
             <!-- implicit parameter of type 'std::_Rb_tree<const void*, std::pair<const void* const, const char*>, std::_Select1st<std::pair<const void* const, const char*> >, std::less<const void*>, std::allocator<std::pair<const void* const, const char*> > >*' -->
-            <parameter type-id='type-id-1206' is-artificial='yes'/>
+            <parameter type-id='type-id-1200' is-artificial='yes'/>
             <!-- parameter of type 'std::_Rb_tree_node<std::pair<const void* const, const char*> >*' -->
-            <parameter type-id='type-id-1214'/>
+            <parameter type-id='type-id-1208'/>
             <!-- void -->
             <return type-id='type-id-56'/>
           </function-decl>
@@ -30129,67 +29738,67 @@
           <!-- std::_Rb_tree_iterator<std::pair<const void* const, const char*> > std::_Rb_tree<const void*, std::pair<const void* const, const char*>, std::_Select1st<std::pair<const void* const, const char*> >, std::less<const void*>, std::allocator<std::pair<const void* const, const char*> > >::_M_lower_bound(std::_Rb_tree_node<std::pair<const void* const, const char*> >*, std::_Rb_tree_node<std::pair<const void* const, const char*> >*, void* const&) -->
           <function-decl name='_M_lower_bound' mangled-name='_ZNSt8_Rb_treeIPKvSt4pairIKS1_PKcESt10_Select1stIS6_ESt4lessIS1_ESaIS6_EE14_M_lower_boundEPSt13_Rb_tree_nodeIS6_ESF_RS3_' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='981' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::_Rb_tree<const void*, std::pair<const void* const, const char*>, std::_Select1st<std::pair<const void* const, const char*> >, std::less<const void*>, std::allocator<std::pair<const void* const, const char*> > >*' -->
-            <parameter type-id='type-id-1206' is-artificial='yes'/>
+            <parameter type-id='type-id-1200' is-artificial='yes'/>
             <!-- parameter of type 'std::_Rb_tree_node<std::pair<const void* const, const char*> >*' -->
-            <parameter type-id='type-id-1214'/>
+            <parameter type-id='type-id-1208'/>
             <!-- parameter of type 'std::_Rb_tree_node<std::pair<const void* const, const char*> >*' -->
-            <parameter type-id='type-id-1214'/>
+            <parameter type-id='type-id-1208'/>
             <!-- parameter of type 'void* const&' -->
             <parameter type-id='type-id-149'/>
             <!-- struct std::_Rb_tree_iterator<std::pair<const void* const, const char*> > -->
-            <return type-id='type-id-1177'/>
+            <return type-id='type-id-1171'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <!-- std::_Rb_tree_const_iterator<std::pair<const void* const, const char*> > std::_Rb_tree<const void*, std::pair<const void* const, const char*>, std::_Select1st<std::pair<const void* const, const char*> >, std::less<const void*>, std::allocator<std::pair<const void* const, const char*> > >::_M_lower_bound(const std::_Rb_tree_node<std::pair<const void* const, const char*> >*, const std::_Rb_tree_node<std::pair<const void* const, const char*> >*, void* const&) -->
           <function-decl name='_M_lower_bound' mangled-name='_ZNKSt8_Rb_treeIPKvSt4pairIKS1_PKcESt10_Select1stIS6_ESt4lessIS1_ESaIS6_EE14_M_lower_boundEPKSt13_Rb_tree_nodeIS6_ESG_RS3_' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='997' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const std::_Rb_tree<const void*, std::pair<const void* const, const char*>, std::_Select1st<std::pair<const void* const, const char*> >, std::less<const void*>, std::allocator<std::pair<const void* const, const char*> > >*' -->
-            <parameter type-id='type-id-1172' is-artificial='yes'/>
+            <parameter type-id='type-id-1166' is-artificial='yes'/>
             <!-- parameter of type 'const std::_Rb_tree_node<std::pair<const void* const, const char*> >*' -->
-            <parameter type-id='type-id-1184'/>
+            <parameter type-id='type-id-1178'/>
             <!-- parameter of type 'const std::_Rb_tree_node<std::pair<const void* const, const char*> >*' -->
-            <parameter type-id='type-id-1184'/>
+            <parameter type-id='type-id-1178'/>
             <!-- parameter of type 'void* const&' -->
             <parameter type-id='type-id-149'/>
             <!-- struct std::_Rb_tree_const_iterator<std::pair<const void* const, const char*> > -->
-            <return type-id='type-id-1173'/>
+            <return type-id='type-id-1167'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <!-- std::_Rb_tree_iterator<std::pair<const void* const, const char*> > std::_Rb_tree<const void*, std::pair<const void* const, const char*>, std::_Select1st<std::pair<const void* const, const char*> >, std::less<const void*>, std::allocator<std::pair<const void* const, const char*> > >::_M_upper_bound(std::_Rb_tree_node<std::pair<const void* const, const char*> >*, std::_Rb_tree_node<std::pair<const void* const, const char*> >*, void* const&) -->
           <function-decl name='_M_upper_bound' mangled-name='_ZNSt8_Rb_treeIPKvSt4pairIKS1_PKcESt10_Select1stIS6_ESt4lessIS1_ESaIS6_EE14_M_upper_boundEPSt13_Rb_tree_nodeIS6_ESF_RS3_' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='1013' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::_Rb_tree<const void*, std::pair<const void* const, const char*>, std::_Select1st<std::pair<const void* const, const char*> >, std::less<const void*>, std::allocator<std::pair<const void* const, const char*> > >*' -->
-            <parameter type-id='type-id-1206' is-artificial='yes'/>
+            <parameter type-id='type-id-1200' is-artificial='yes'/>
             <!-- parameter of type 'std::_Rb_tree_node<std::pair<const void* const, const char*> >*' -->
-            <parameter type-id='type-id-1214'/>
+            <parameter type-id='type-id-1208'/>
             <!-- parameter of type 'std::_Rb_tree_node<std::pair<const void* const, const char*> >*' -->
-            <parameter type-id='type-id-1214'/>
+            <parameter type-id='type-id-1208'/>
             <!-- parameter of type 'void* const&' -->
             <parameter type-id='type-id-149'/>
             <!-- struct std::_Rb_tree_iterator<std::pair<const void* const, const char*> > -->
-            <return type-id='type-id-1177'/>
+            <return type-id='type-id-1171'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <!-- std::_Rb_tree_const_iterator<std::pair<const void* const, const char*> > std::_Rb_tree<const void*, std::pair<const void* const, const char*>, std::_Select1st<std::pair<const void* const, const char*> >, std::less<const void*>, std::allocator<std::pair<const void* const, const char*> > >::_M_upper_bound(const std::_Rb_tree_node<std::pair<const void* const, const char*> >*, const std::_Rb_tree_node<std::pair<const void* const, const char*> >*, void* const&) -->
           <function-decl name='_M_upper_bound' mangled-name='_ZNKSt8_Rb_treeIPKvSt4pairIKS1_PKcESt10_Select1stIS6_ESt4lessIS1_ESaIS6_EE14_M_upper_boundEPKSt13_Rb_tree_nodeIS6_ESG_RS3_' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='1029' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const std::_Rb_tree<const void*, std::pair<const void* const, const char*>, std::_Select1st<std::pair<const void* const, const char*> >, std::less<const void*>, std::allocator<std::pair<const void* const, const char*> > >*' -->
-            <parameter type-id='type-id-1172' is-artificial='yes'/>
+            <parameter type-id='type-id-1166' is-artificial='yes'/>
             <!-- parameter of type 'const std::_Rb_tree_node<std::pair<const void* const, const char*> >*' -->
-            <parameter type-id='type-id-1184'/>
+            <parameter type-id='type-id-1178'/>
             <!-- parameter of type 'const std::_Rb_tree_node<std::pair<const void* const, const char*> >*' -->
-            <parameter type-id='type-id-1184'/>
+            <parameter type-id='type-id-1178'/>
             <!-- parameter of type 'void* const&' -->
             <parameter type-id='type-id-149'/>
             <!-- struct std::_Rb_tree_const_iterator<std::pair<const void* const, const char*> > -->
-            <return type-id='type-id-1173'/>
+            <return type-id='type-id-1167'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <!-- void std::_Rb_tree<const void*, std::pair<const void* const, const char*>, std::_Select1st<std::pair<const void* const, const char*> >, std::less<const void*>, std::allocator<std::pair<const void* const, const char*> > >::_Rb_tree() -->
           <function-decl name='_Rb_tree' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='591' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::_Rb_tree<const void*, std::pair<const void* const, const char*>, std::_Select1st<std::pair<const void* const, const char*> >, std::less<const void*>, std::allocator<std::pair<const void* const, const char*> > >*' -->
-            <parameter type-id='type-id-1206' is-artificial='yes'/>
+            <parameter type-id='type-id-1200' is-artificial='yes'/>
             <!-- void -->
             <return type-id='type-id-56'/>
           </function-decl>
@@ -30198,11 +29807,11 @@
           <!-- void std::_Rb_tree<const void*, std::pair<const void* const, const char*>, std::_Select1st<std::pair<const void* const, const char*> >, std::less<const void*>, std::allocator<std::pair<const void* const, const char*> > >::_Rb_tree(const std::less<const void*>&, const std::allocator<std::pair<const void* const, const char*> >&) -->
           <function-decl name='_Rb_tree' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='593' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::_Rb_tree<const void*, std::pair<const void* const, const char*>, std::_Select1st<std::pair<const void* const, const char*> >, std::less<const void*>, std::allocator<std::pair<const void* const, const char*> > >*' -->
-            <parameter type-id='type-id-1206' is-artificial='yes'/>
+            <parameter type-id='type-id-1200' is-artificial='yes'/>
             <!-- parameter of type 'const std::less<const void*>&' -->
-            <parameter type-id='type-id-1196'/>
+            <parameter type-id='type-id-1190'/>
             <!-- parameter of type 'const std::allocator<std::pair<const void* const, const char*> >&' -->
-            <parameter type-id='type-id-1193'/>
+            <parameter type-id='type-id-1187'/>
             <!-- void -->
             <return type-id='type-id-56'/>
           </function-decl>
@@ -30211,9 +29820,9 @@
           <!-- void std::_Rb_tree<const void*, std::pair<const void* const, const char*>, std::_Select1st<std::pair<const void* const, const char*> >, std::less<const void*>, std::allocator<std::pair<const void* const, const char*> > >::_Rb_tree(const std::_Rb_tree<const void*, std::pair<const void* const, const char*>, std::_Select1st<std::pair<const void* const, const char*> >, std::less<const void*>, std::allocator<std::pair<const void* const, const char*> > >&) -->
           <function-decl name='_Rb_tree' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='597' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::_Rb_tree<const void*, std::pair<const void* const, const char*>, std::_Select1st<std::pair<const void* const, const char*> >, std::less<const void*>, std::allocator<std::pair<const void* const, const char*> > >*' -->
-            <parameter type-id='type-id-1206' is-artificial='yes'/>
+            <parameter type-id='type-id-1200' is-artificial='yes'/>
             <!-- parameter of type 'const std::_Rb_tree<const void*, std::pair<const void* const, const char*>, std::_Select1st<std::pair<const void* const, const char*> >, std::less<const void*>, std::allocator<std::pair<const void* const, const char*> > >&' -->
-            <parameter type-id='type-id-1171'/>
+            <parameter type-id='type-id-1165'/>
             <!-- void -->
             <return type-id='type-id-56'/>
           </function-decl>
@@ -30222,7 +29831,7 @@
           <!-- std::_Rb_tree<const void*, std::pair<const void* const, const char*>, std::_Select1st<std::pair<const void* const, const char*> >, std::less<const void*>, std::allocator<std::pair<const void* const, const char*> > >::~_Rb_tree(int) -->
           <function-decl name='~_Rb_tree' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='613' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::_Rb_tree<const void*, std::pair<const void* const, const char*>, std::_Select1st<std::pair<const void* const, const char*> >, std::less<const void*>, std::allocator<std::pair<const void* const, const char*> > >*' -->
-            <parameter type-id='type-id-1206' is-artificial='yes'/>
+            <parameter type-id='type-id-1200' is-artificial='yes'/>
             <!-- artificial parameter of type 'int' -->
             <parameter type-id='type-id-1' is-artificial='yes'/>
             <!-- void -->
@@ -30233,99 +29842,99 @@
           <!-- std::_Rb_tree<const void*, std::pair<const void* const, const char*>, std::_Select1st<std::pair<const void* const, const char*> >, std::less<const void*>, std::allocator<std::pair<const void* const, const char*> > >& std::_Rb_tree<const void*, std::pair<const void* const, const char*>, std::_Select1st<std::pair<const void* const, const char*> >, std::less<const void*>, std::allocator<std::pair<const void* const, const char*> > >::operator=(const std::_Rb_tree<const void*, std::pair<const void* const, const char*>, std::_Select1st<std::pair<const void* const, const char*> >, std::less<const void*>, std::allocator<std::pair<const void* const, const char*> > >&) -->
           <function-decl name='operator=' mangled-name='_ZNSt8_Rb_treeIPKvSt4pairIKS1_PKcESt10_Select1stIS6_ESt4lessIS1_ESaIS6_EEaSERKSC_' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='852' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::_Rb_tree<const void*, std::pair<const void* const, const char*>, std::_Select1st<std::pair<const void* const, const char*> >, std::less<const void*>, std::allocator<std::pair<const void* const, const char*> > >*' -->
-            <parameter type-id='type-id-1206' is-artificial='yes'/>
+            <parameter type-id='type-id-1200' is-artificial='yes'/>
             <!-- parameter of type 'const std::_Rb_tree<const void*, std::pair<const void* const, const char*>, std::_Select1st<std::pair<const void* const, const char*> >, std::less<const void*>, std::allocator<std::pair<const void* const, const char*> > >&' -->
-            <parameter type-id='type-id-1171'/>
+            <parameter type-id='type-id-1165'/>
             <!-- std::_Rb_tree<const void*, std::pair<const void* const, const char*>, std::_Select1st<std::pair<const void* const, const char*> >, std::less<const void*>, std::allocator<std::pair<const void* const, const char*> > >& -->
-            <return type-id='type-id-1205'/>
+            <return type-id='type-id-1199'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <!-- std::less<const void*> std::_Rb_tree<const void*, std::pair<const void* const, const char*>, std::_Select1st<std::pair<const void* const, const char*> >, std::less<const void*>, std::allocator<std::pair<const void* const, const char*> > >::key_comp() -->
           <function-decl name='key_comp' mangled-name='_ZNKSt8_Rb_treeIPKvSt4pairIKS1_PKcESt10_Select1stIS6_ESt4lessIS1_ESaIS6_EE8key_compEv' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='621' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const std::_Rb_tree<const void*, std::pair<const void* const, const char*>, std::_Select1st<std::pair<const void* const, const char*> >, std::less<const void*>, std::allocator<std::pair<const void* const, const char*> > >*' -->
-            <parameter type-id='type-id-1172' is-artificial='yes'/>
+            <parameter type-id='type-id-1166' is-artificial='yes'/>
             <!-- struct std::less<const void*> -->
-            <return type-id='type-id-1194'/>
+            <return type-id='type-id-1188'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <!-- std::_Rb_tree_iterator<std::pair<const void* const, const char*> > std::_Rb_tree<const void*, std::pair<const void* const, const char*>, std::_Select1st<std::pair<const void* const, const char*> >, std::less<const void*>, std::allocator<std::pair<const void* const, const char*> > >::begin() -->
           <function-decl name='begin' mangled-name='_ZNSt8_Rb_treeIPKvSt4pairIKS1_PKcESt10_Select1stIS6_ESt4lessIS1_ESaIS6_EE5beginEv' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='625' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::_Rb_tree<const void*, std::pair<const void* const, const char*>, std::_Select1st<std::pair<const void* const, const char*> >, std::less<const void*>, std::allocator<std::pair<const void* const, const char*> > >*' -->
-            <parameter type-id='type-id-1206' is-artificial='yes'/>
+            <parameter type-id='type-id-1200' is-artificial='yes'/>
             <!-- struct std::_Rb_tree_iterator<std::pair<const void* const, const char*> > -->
-            <return type-id='type-id-1177'/>
+            <return type-id='type-id-1171'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <!-- std::_Rb_tree_const_iterator<std::pair<const void* const, const char*> > std::_Rb_tree<const void*, std::pair<const void* const, const char*>, std::_Select1st<std::pair<const void* const, const char*> >, std::less<const void*>, std::allocator<std::pair<const void* const, const char*> > >::begin() -->
           <function-decl name='begin' mangled-name='_ZNKSt8_Rb_treeIPKvSt4pairIKS1_PKcESt10_Select1stIS6_ESt4lessIS1_ESaIS6_EE5beginEv' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='632' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const std::_Rb_tree<const void*, std::pair<const void* const, const char*>, std::_Select1st<std::pair<const void* const, const char*> >, std::less<const void*>, std::allocator<std::pair<const void* const, const char*> > >*' -->
-            <parameter type-id='type-id-1172' is-artificial='yes'/>
+            <parameter type-id='type-id-1166' is-artificial='yes'/>
             <!-- struct std::_Rb_tree_const_iterator<std::pair<const void* const, const char*> > -->
-            <return type-id='type-id-1173'/>
+            <return type-id='type-id-1167'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <!-- std::_Rb_tree_iterator<std::pair<const void* const, const char*> > std::_Rb_tree<const void*, std::pair<const void* const, const char*>, std::_Select1st<std::pair<const void* const, const char*> >, std::less<const void*>, std::allocator<std::pair<const void* const, const char*> > >::end() -->
           <function-decl name='end' mangled-name='_ZNSt8_Rb_treeIPKvSt4pairIKS1_PKcESt10_Select1stIS6_ESt4lessIS1_ESaIS6_EE3endEv' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='639' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::_Rb_tree<const void*, std::pair<const void* const, const char*>, std::_Select1st<std::pair<const void* const, const char*> >, std::less<const void*>, std::allocator<std::pair<const void* const, const char*> > >*' -->
-            <parameter type-id='type-id-1206' is-artificial='yes'/>
+            <parameter type-id='type-id-1200' is-artificial='yes'/>
             <!-- struct std::_Rb_tree_iterator<std::pair<const void* const, const char*> > -->
-            <return type-id='type-id-1177'/>
+            <return type-id='type-id-1171'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <!-- std::_Rb_tree_const_iterator<std::pair<const void* const, const char*> > std::_Rb_tree<const void*, std::pair<const void* const, const char*>, std::_Select1st<std::pair<const void* const, const char*> >, std::less<const void*>, std::allocator<std::pair<const void* const, const char*> > >::end() -->
           <function-decl name='end' mangled-name='_ZNKSt8_Rb_treeIPKvSt4pairIKS1_PKcESt10_Select1stIS6_ESt4lessIS1_ESaIS6_EE3endEv' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='643' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const std::_Rb_tree<const void*, std::pair<const void* const, const char*>, std::_Select1st<std::pair<const void* const, const char*> >, std::less<const void*>, std::allocator<std::pair<const void* const, const char*> > >*' -->
-            <parameter type-id='type-id-1172' is-artificial='yes'/>
+            <parameter type-id='type-id-1166' is-artificial='yes'/>
             <!-- struct std::_Rb_tree_const_iterator<std::pair<const void* const, const char*> > -->
-            <return type-id='type-id-1173'/>
+            <return type-id='type-id-1167'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <!-- std::reverse_iterator<std::_Rb_tree_iterator<std::pair<const void* const, const char*> > > std::_Rb_tree<const void*, std::pair<const void* const, const char*>, std::_Select1st<std::pair<const void* const, const char*> >, std::less<const void*>, std::allocator<std::pair<const void* const, const char*> > >::rbegin() -->
           <function-decl name='rbegin' mangled-name='_ZNSt8_Rb_treeIPKvSt4pairIKS1_PKcESt10_Select1stIS6_ESt4lessIS1_ESaIS6_EE6rbeginEv' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='650' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::_Rb_tree<const void*, std::pair<const void* const, const char*>, std::_Select1st<std::pair<const void* const, const char*> >, std::less<const void*>, std::allocator<std::pair<const void* const, const char*> > >*' -->
-            <parameter type-id='type-id-1206' is-artificial='yes'/>
+            <parameter type-id='type-id-1200' is-artificial='yes'/>
             <!-- class std::reverse_iterator<std::_Rb_tree_iterator<std::pair<const void* const, const char*> > > -->
-            <return type-id='type-id-1224'/>
+            <return type-id='type-id-1218'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <!-- std::reverse_iterator<std::_Rb_tree_const_iterator<std::pair<const void* const, const char*> > > std::_Rb_tree<const void*, std::pair<const void* const, const char*>, std::_Select1st<std::pair<const void* const, const char*> >, std::less<const void*>, std::allocator<std::pair<const void* const, const char*> > >::rbegin() -->
           <function-decl name='rbegin' mangled-name='_ZNKSt8_Rb_treeIPKvSt4pairIKS1_PKcESt10_Select1stIS6_ESt4lessIS1_ESaIS6_EE6rbeginEv' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='654' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const std::_Rb_tree<const void*, std::pair<const void* const, const char*>, std::_Select1st<std::pair<const void* const, const char*> >, std::less<const void*>, std::allocator<std::pair<const void* const, const char*> > >*' -->
-            <parameter type-id='type-id-1172' is-artificial='yes'/>
+            <parameter type-id='type-id-1166' is-artificial='yes'/>
             <!-- class std::reverse_iterator<std::_Rb_tree_const_iterator<std::pair<const void* const, const char*> > > -->
-            <return type-id='type-id-1225'/>
+            <return type-id='type-id-1219'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <!-- std::reverse_iterator<std::_Rb_tree_iterator<std::pair<const void* const, const char*> > > std::_Rb_tree<const void*, std::pair<const void* const, const char*>, std::_Select1st<std::pair<const void* const, const char*> >, std::less<const void*>, std::allocator<std::pair<const void* const, const char*> > >::rend() -->
           <function-decl name='rend' mangled-name='_ZNSt8_Rb_treeIPKvSt4pairIKS1_PKcESt10_Select1stIS6_ESt4lessIS1_ESaIS6_EE4rendEv' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='658' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::_Rb_tree<const void*, std::pair<const void* const, const char*>, std::_Select1st<std::pair<const void* const, const char*> >, std::less<const void*>, std::allocator<std::pair<const void* const, const char*> > >*' -->
-            <parameter type-id='type-id-1206' is-artificial='yes'/>
+            <parameter type-id='type-id-1200' is-artificial='yes'/>
             <!-- class std::reverse_iterator<std::_Rb_tree_iterator<std::pair<const void* const, const char*> > > -->
-            <return type-id='type-id-1224'/>
+            <return type-id='type-id-1218'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <!-- std::reverse_iterator<std::_Rb_tree_const_iterator<std::pair<const void* const, const char*> > > std::_Rb_tree<const void*, std::pair<const void* const, const char*>, std::_Select1st<std::pair<const void* const, const char*> >, std::less<const void*>, std::allocator<std::pair<const void* const, const char*> > >::rend() -->
           <function-decl name='rend' mangled-name='_ZNKSt8_Rb_treeIPKvSt4pairIKS1_PKcESt10_Select1stIS6_ESt4lessIS1_ESaIS6_EE4rendEv' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='662' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const std::_Rb_tree<const void*, std::pair<const void* const, const char*>, std::_Select1st<std::pair<const void* const, const char*> >, std::less<const void*>, std::allocator<std::pair<const void* const, const char*> > >*' -->
-            <parameter type-id='type-id-1172' is-artificial='yes'/>
+            <parameter type-id='type-id-1166' is-artificial='yes'/>
             <!-- class std::reverse_iterator<std::_Rb_tree_const_iterator<std::pair<const void* const, const char*> > > -->
-            <return type-id='type-id-1225'/>
+            <return type-id='type-id-1219'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <!-- bool std::_Rb_tree<const void*, std::pair<const void* const, const char*>, std::_Select1st<std::pair<const void* const, const char*> >, std::less<const void*>, std::allocator<std::pair<const void* const, const char*> > >::empty() -->
           <function-decl name='empty' mangled-name='_ZNKSt8_Rb_treeIPKvSt4pairIKS1_PKcESt10_Select1stIS6_ESt4lessIS1_ESaIS6_EE5emptyEv' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='666' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const std::_Rb_tree<const void*, std::pair<const void* const, const char*>, std::_Select1st<std::pair<const void* const, const char*> >, std::less<const void*>, std::allocator<std::pair<const void* const, const char*> > >*' -->
-            <parameter type-id='type-id-1172' is-artificial='yes'/>
+            <parameter type-id='type-id-1166' is-artificial='yes'/>
             <!-- bool -->
             <return type-id='type-id-55'/>
           </function-decl>
@@ -30334,7 +29943,7 @@
           <!-- size_t std::_Rb_tree<const void*, std::pair<const void* const, const char*>, std::_Select1st<std::pair<const void* const, const char*> >, std::less<const void*>, std::allocator<std::pair<const void* const, const char*> > >::size() -->
           <function-decl name='size' mangled-name='_ZNKSt8_Rb_treeIPKvSt4pairIKS1_PKcESt10_Select1stIS6_ESt4lessIS1_ESaIS6_EE4sizeEv' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='670' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const std::_Rb_tree<const void*, std::pair<const void* const, const char*>, std::_Select1st<std::pair<const void* const, const char*> >, std::less<const void*>, std::allocator<std::pair<const void* const, const char*> > >*' -->
-            <parameter type-id='type-id-1172' is-artificial='yes'/>
+            <parameter type-id='type-id-1166' is-artificial='yes'/>
             <!-- typedef size_t -->
             <return type-id='type-id-57'/>
           </function-decl>
@@ -30343,7 +29952,7 @@
           <!-- size_t std::_Rb_tree<const void*, std::pair<const void* const, const char*>, std::_Select1st<std::pair<const void* const, const char*> >, std::less<const void*>, std::allocator<std::pair<const void* const, const char*> > >::max_size() -->
           <function-decl name='max_size' mangled-name='_ZNKSt8_Rb_treeIPKvSt4pairIKS1_PKcESt10_Select1stIS6_ESt4lessIS1_ESaIS6_EE8max_sizeEv' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='674' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const std::_Rb_tree<const void*, std::pair<const void* const, const char*>, std::_Select1st<std::pair<const void* const, const char*> >, std::less<const void*>, std::allocator<std::pair<const void* const, const char*> > >*' -->
-            <parameter type-id='type-id-1172' is-artificial='yes'/>
+            <parameter type-id='type-id-1166' is-artificial='yes'/>
             <!-- typedef size_t -->
             <return type-id='type-id-57'/>
           </function-decl>
@@ -30352,9 +29961,9 @@
           <!-- void std::_Rb_tree<const void*, std::pair<const void* const, const char*>, std::_Select1st<std::pair<const void* const, const char*> >, std::less<const void*>, std::allocator<std::pair<const void* const, const char*> > >::swap(std::_Rb_tree<const void*, std::pair<const void* const, const char*>, std::_Select1st<std::pair<const void* const, const char*> >, std::less<const void*>, std::allocator<std::pair<const void* const, const char*> > >&) -->
           <function-decl name='swap' mangled-name='_ZNSt8_Rb_treeIPKvSt4pairIKS1_PKcESt10_Select1stIS6_ESt4lessIS1_ESaIS6_EE4swapERSC_' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='1106' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::_Rb_tree<const void*, std::pair<const void* const, const char*>, std::_Select1st<std::pair<const void* const, const char*> >, std::less<const void*>, std::allocator<std::pair<const void* const, const char*> > >*' -->
-            <parameter type-id='type-id-1206' is-artificial='yes'/>
+            <parameter type-id='type-id-1200' is-artificial='yes'/>
             <!-- parameter of type 'std::_Rb_tree<const void*, std::pair<const void* const, const char*>, std::_Select1st<std::pair<const void* const, const char*> >, std::less<const void*>, std::allocator<std::pair<const void* const, const char*> > >&' -->
-            <parameter type-id='type-id-1205'/>
+            <parameter type-id='type-id-1199'/>
             <!-- void -->
             <return type-id='type-id-56'/>
           </function-decl>
@@ -30363,57 +29972,57 @@
           <!-- std::pair<std::_Rb_tree_iterator<std::pair<const void* const, const char*> >, bool> std::_Rb_tree<const void*, std::pair<const void* const, const char*>, std::_Select1st<std::pair<const void* const, const char*> >, std::less<const void*>, std::allocator<std::pair<const void* const, const char*> > >::_M_insert_unique(const std::pair<const void* const, const char*>&) -->
           <function-decl name='_M_insert_unique' mangled-name='_ZNSt8_Rb_treeIPKvSt4pairIKS1_PKcESt10_Select1stIS6_ESt4lessIS1_ESaIS6_EE16_M_insert_uniqueERKS6_' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='1161' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt8_Rb_treeIPKvSt4pairIKS1_PKcESt10_Select1stIS6_ESt4lessIS1_ESaIS6_EE16_M_insert_uniqueERKS6_'>
             <!-- implicit parameter of type 'std::_Rb_tree<const void*, std::pair<const void* const, const char*>, std::_Select1st<std::pair<const void* const, const char*> >, std::less<const void*>, std::allocator<std::pair<const void* const, const char*> > >*' -->
-            <parameter type-id='type-id-1206' is-artificial='yes'/>
+            <parameter type-id='type-id-1200' is-artificial='yes'/>
             <!-- parameter of type 'const std::pair<const void* const, const char*>&' -->
-            <parameter type-id='type-id-1203'/>
+            <parameter type-id='type-id-1197'/>
             <!-- struct std::pair<std::_Rb_tree_iterator<std::pair<const void* const, const char*> >, bool> -->
-            <return type-id='type-id-1222'/>
+            <return type-id='type-id-1216'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <!-- std::_Rb_tree_iterator<std::pair<const void* const, const char*> > std::_Rb_tree<const void*, std::pair<const void* const, const char*>, std::_Select1st<std::pair<const void* const, const char*> >, std::less<const void*>, std::allocator<std::pair<const void* const, const char*> > >::_M_insert_equal(const std::pair<const void* const, const char*>&) -->
           <function-decl name='_M_insert_equal' mangled-name='_ZNSt8_Rb_treeIPKvSt4pairIKS1_PKcESt10_Select1stIS6_ESt4lessIS1_ESaIS6_EE15_M_insert_equalERKS6_' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='1189' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::_Rb_tree<const void*, std::pair<const void* const, const char*>, std::_Select1st<std::pair<const void* const, const char*> >, std::less<const void*>, std::allocator<std::pair<const void* const, const char*> > >*' -->
-            <parameter type-id='type-id-1206' is-artificial='yes'/>
+            <parameter type-id='type-id-1200' is-artificial='yes'/>
             <!-- parameter of type 'const std::pair<const void* const, const char*>&' -->
-            <parameter type-id='type-id-1203'/>
+            <parameter type-id='type-id-1197'/>
             <!-- struct std::_Rb_tree_iterator<std::pair<const void* const, const char*> > -->
-            <return type-id='type-id-1177'/>
+            <return type-id='type-id-1171'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <!-- std::_Rb_tree_iterator<std::pair<const void* const, const char*> > std::_Rb_tree<const void*, std::pair<const void* const, const char*>, std::_Select1st<std::pair<const void* const, const char*> >, std::less<const void*>, std::allocator<std::pair<const void* const, const char*> > >::_M_insert_unique_(std::_Rb_tree_const_iterator<std::pair<const void* const, const char*> >, const std::pair<const void* const, const char*>&) -->
           <function-decl name='_M_insert_unique_' mangled-name='_ZNSt8_Rb_treeIPKvSt4pairIKS1_PKcESt10_Select1stIS6_ESt4lessIS1_ESaIS6_EE17_M_insert_unique_ESt23_Rb_tree_const_iteratorIS6_ERKS6_' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='1206' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt8_Rb_treeIPKvSt4pairIKS1_PKcESt10_Select1stIS6_ESt4lessIS1_ESaIS6_EE17_M_insert_unique_ESt23_Rb_tree_const_iteratorIS6_ERKS6_'>
             <!-- implicit parameter of type 'std::_Rb_tree<const void*, std::pair<const void* const, const char*>, std::_Select1st<std::pair<const void* const, const char*> >, std::less<const void*>, std::allocator<std::pair<const void* const, const char*> > >*' -->
-            <parameter type-id='type-id-1206' is-artificial='yes'/>
+            <parameter type-id='type-id-1200' is-artificial='yes'/>
             <!-- parameter of type 'struct std::_Rb_tree_const_iterator<std::pair<const void* const, const char*> >' -->
-            <parameter type-id='type-id-1173'/>
+            <parameter type-id='type-id-1167'/>
             <!-- parameter of type 'const std::pair<const void* const, const char*>&' -->
-            <parameter type-id='type-id-1203'/>
+            <parameter type-id='type-id-1197'/>
             <!-- struct std::_Rb_tree_iterator<std::pair<const void* const, const char*> > -->
-            <return type-id='type-id-1177'/>
+            <return type-id='type-id-1171'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <!-- std::_Rb_tree_iterator<std::pair<const void* const, const char*> > std::_Rb_tree<const void*, std::pair<const void* const, const char*>, std::_Select1st<std::pair<const void* const, const char*> >, std::less<const void*>, std::allocator<std::pair<const void* const, const char*> > >::_M_insert_equal_(std::_Rb_tree_const_iterator<std::pair<const void* const, const char*> >, const std::pair<const void* const, const char*>&) -->
           <function-decl name='_M_insert_equal_' mangled-name='_ZNSt8_Rb_treeIPKvSt4pairIKS1_PKcESt10_Select1stIS6_ESt4lessIS1_ESaIS6_EE16_M_insert_equal_ESt23_Rb_tree_const_iteratorIS6_ERKS6_' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='1265' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::_Rb_tree<const void*, std::pair<const void* const, const char*>, std::_Select1st<std::pair<const void* const, const char*> >, std::less<const void*>, std::allocator<std::pair<const void* const, const char*> > >*' -->
-            <parameter type-id='type-id-1206' is-artificial='yes'/>
+            <parameter type-id='type-id-1200' is-artificial='yes'/>
             <!-- parameter of type 'struct std::_Rb_tree_const_iterator<std::pair<const void* const, const char*> >' -->
-            <parameter type-id='type-id-1173'/>
+            <parameter type-id='type-id-1167'/>
             <!-- parameter of type 'const std::pair<const void* const, const char*>&' -->
-            <parameter type-id='type-id-1203'/>
+            <parameter type-id='type-id-1197'/>
             <!-- struct std::_Rb_tree_iterator<std::pair<const void* const, const char*> > -->
-            <return type-id='type-id-1177'/>
+            <return type-id='type-id-1171'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <!-- void std::_Rb_tree<const void*, std::pair<const void* const, const char*>, std::_Select1st<std::pair<const void* const, const char*> >, std::less<const void*>, std::allocator<std::pair<const void* const, const char*> > >::erase(std::_Rb_tree_iterator<std::pair<const void* const, const char*> >) -->
           <function-decl name='erase' mangled-name='_ZNSt8_Rb_treeIPKvSt4pairIKS1_PKcESt10_Select1stIS6_ESt4lessIS1_ESaIS6_EE5eraseESt17_Rb_tree_iteratorIS6_E' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='1341' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::_Rb_tree<const void*, std::pair<const void* const, const char*>, std::_Select1st<std::pair<const void* const, const char*> >, std::less<const void*>, std::allocator<std::pair<const void* const, const char*> > >*' -->
-            <parameter type-id='type-id-1206' is-artificial='yes'/>
+            <parameter type-id='type-id-1200' is-artificial='yes'/>
             <!-- parameter of type 'struct std::_Rb_tree_iterator<std::pair<const void* const, const char*> >' -->
-            <parameter type-id='type-id-1177'/>
+            <parameter type-id='type-id-1171'/>
             <!-- void -->
             <return type-id='type-id-56'/>
           </function-decl>
@@ -30422,9 +30031,9 @@
           <!-- void std::_Rb_tree<const void*, std::pair<const void* const, const char*>, std::_Select1st<std::pair<const void* const, const char*> >, std::less<const void*>, std::allocator<std::pair<const void* const, const char*> > >::erase(std::_Rb_tree_const_iterator<std::pair<const void* const, const char*> >) -->
           <function-decl name='erase' mangled-name='_ZNSt8_Rb_treeIPKvSt4pairIKS1_PKcESt10_Select1stIS6_ESt4lessIS1_ESaIS6_EE5eraseESt23_Rb_tree_const_iteratorIS6_E' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='1355' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::_Rb_tree<const void*, std::pair<const void* const, const char*>, std::_Select1st<std::pair<const void* const, const char*> >, std::less<const void*>, std::allocator<std::pair<const void* const, const char*> > >*' -->
-            <parameter type-id='type-id-1206' is-artificial='yes'/>
+            <parameter type-id='type-id-1200' is-artificial='yes'/>
             <!-- parameter of type 'struct std::_Rb_tree_const_iterator<std::pair<const void* const, const char*> >' -->
-            <parameter type-id='type-id-1173'/>
+            <parameter type-id='type-id-1167'/>
             <!-- void -->
             <return type-id='type-id-56'/>
           </function-decl>
@@ -30433,7 +30042,7 @@
           <!-- size_t std::_Rb_tree<const void*, std::pair<const void* const, const char*>, std::_Select1st<std::pair<const void* const, const char*> >, std::less<const void*>, std::allocator<std::pair<const void* const, const char*> > >::erase(void* const&) -->
           <function-decl name='erase' mangled-name='_ZNSt8_Rb_treeIPKvSt4pairIKS1_PKcESt10_Select1stIS6_ESt4lessIS1_ESaIS6_EE5eraseERS3_' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='1369' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::_Rb_tree<const void*, std::pair<const void* const, const char*>, std::_Select1st<std::pair<const void* const, const char*> >, std::less<const void*>, std::allocator<std::pair<const void* const, const char*> > >*' -->
-            <parameter type-id='type-id-1206' is-artificial='yes'/>
+            <parameter type-id='type-id-1200' is-artificial='yes'/>
             <!-- parameter of type 'void* const&' -->
             <parameter type-id='type-id-149'/>
             <!-- typedef size_t -->
@@ -30444,11 +30053,11 @@
           <!-- void std::_Rb_tree<const void*, std::pair<const void* const, const char*>, std::_Select1st<std::pair<const void* const, const char*> >, std::less<const void*>, std::allocator<std::pair<const void* const, const char*> > >::erase(std::_Rb_tree_iterator<std::pair<const void* const, const char*> >, std::_Rb_tree_iterator<std::pair<const void* const, const char*> >) -->
           <function-decl name='erase' mangled-name='_ZNSt8_Rb_treeIPKvSt4pairIKS1_PKcESt10_Select1stIS6_ESt4lessIS1_ESaIS6_EE5eraseESt17_Rb_tree_iteratorIS6_ESE_' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='1381' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::_Rb_tree<const void*, std::pair<const void* const, const char*>, std::_Select1st<std::pair<const void* const, const char*> >, std::less<const void*>, std::allocator<std::pair<const void* const, const char*> > >*' -->
-            <parameter type-id='type-id-1206' is-artificial='yes'/>
+            <parameter type-id='type-id-1200' is-artificial='yes'/>
             <!-- parameter of type 'struct std::_Rb_tree_iterator<std::pair<const void* const, const char*> >' -->
-            <parameter type-id='type-id-1177'/>
+            <parameter type-id='type-id-1171'/>
             <!-- parameter of type 'struct std::_Rb_tree_iterator<std::pair<const void* const, const char*> >' -->
-            <parameter type-id='type-id-1177'/>
+            <parameter type-id='type-id-1171'/>
             <!-- void -->
             <return type-id='type-id-56'/>
           </function-decl>
@@ -30457,11 +30066,11 @@
           <!-- void std::_Rb_tree<const void*, std::pair<const void* const, const char*>, std::_Select1st<std::pair<const void* const, const char*> >, std::less<const void*>, std::allocator<std::pair<const void* const, const char*> > >::erase(std::_Rb_tree_const_iterator<std::pair<const void* const, const char*> >, std::_Rb_tree_const_iterator<std::pair<const void* const, const char*> >) -->
           <function-decl name='erase' mangled-name='_ZNSt8_Rb_treeIPKvSt4pairIKS1_PKcESt10_Select1stIS6_ESt4lessIS1_ESaIS6_EE5eraseESt23_Rb_tree_const_iteratorIS6_ESE_' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='1394' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::_Rb_tree<const void*, std::pair<const void* const, const char*>, std::_Select1st<std::pair<const void* const, const char*> >, std::less<const void*>, std::allocator<std::pair<const void* const, const char*> > >*' -->
-            <parameter type-id='type-id-1206' is-artificial='yes'/>
+            <parameter type-id='type-id-1200' is-artificial='yes'/>
             <!-- parameter of type 'struct std::_Rb_tree_const_iterator<std::pair<const void* const, const char*> >' -->
-            <parameter type-id='type-id-1173'/>
+            <parameter type-id='type-id-1167'/>
             <!-- parameter of type 'struct std::_Rb_tree_const_iterator<std::pair<const void* const, const char*> >' -->
-            <parameter type-id='type-id-1173'/>
+            <parameter type-id='type-id-1167'/>
             <!-- void -->
             <return type-id='type-id-56'/>
           </function-decl>
@@ -30470,7 +30079,7 @@
           <!-- void std::_Rb_tree<const void*, std::pair<const void* const, const char*>, std::_Select1st<std::pair<const void* const, const char*> >, std::less<const void*>, std::allocator<std::pair<const void* const, const char*> > >::erase(void* const*, void* const*) -->
           <function-decl name='erase' mangled-name='_ZNSt8_Rb_treeIPKvSt4pairIKS1_PKcESt10_Select1stIS6_ESt4lessIS1_ESaIS6_EE5eraseEPS3_SD_' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='1407' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::_Rb_tree<const void*, std::pair<const void* const, const char*>, std::_Select1st<std::pair<const void* const, const char*> >, std::less<const void*>, std::allocator<std::pair<const void* const, const char*> > >*' -->
-            <parameter type-id='type-id-1206' is-artificial='yes'/>
+            <parameter type-id='type-id-1200' is-artificial='yes'/>
             <!-- parameter of type 'void* const*' -->
             <parameter type-id='type-id-150'/>
             <!-- parameter of type 'void* const*' -->
@@ -30483,7 +30092,7 @@
           <!-- void std::_Rb_tree<const void*, std::pair<const void* const, const char*>, std::_Select1st<std::pair<const void* const, const char*> >, std::less<const void*>, std::allocator<std::pair<const void* const, const char*> > >::clear() -->
           <function-decl name='clear' mangled-name='_ZNSt8_Rb_treeIPKvSt4pairIKS1_PKcESt10_Select1stIS6_ESt4lessIS1_ESaIS6_EE5clearEv' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='724' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::_Rb_tree<const void*, std::pair<const void* const, const char*>, std::_Select1st<std::pair<const void* const, const char*> >, std::less<const void*>, std::allocator<std::pair<const void* const, const char*> > >*' -->
-            <parameter type-id='type-id-1206' is-artificial='yes'/>
+            <parameter type-id='type-id-1200' is-artificial='yes'/>
             <!-- void -->
             <return type-id='type-id-56'/>
           </function-decl>
@@ -30492,29 +30101,29 @@
           <!-- std::_Rb_tree_iterator<std::pair<const void* const, const char*> > std::_Rb_tree<const void*, std::pair<const void* const, const char*>, std::_Select1st<std::pair<const void* const, const char*> >, std::less<const void*>, std::allocator<std::pair<const void* const, const char*> > >::find(void* const&) -->
           <function-decl name='find' mangled-name='_ZNSt8_Rb_treeIPKvSt4pairIKS1_PKcESt10_Select1stIS6_ESt4lessIS1_ESaIS6_EE4findERS3_' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='1418' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::_Rb_tree<const void*, std::pair<const void* const, const char*>, std::_Select1st<std::pair<const void* const, const char*> >, std::less<const void*>, std::allocator<std::pair<const void* const, const char*> > >*' -->
-            <parameter type-id='type-id-1206' is-artificial='yes'/>
+            <parameter type-id='type-id-1200' is-artificial='yes'/>
             <!-- parameter of type 'void* const&' -->
             <parameter type-id='type-id-149'/>
             <!-- struct std::_Rb_tree_iterator<std::pair<const void* const, const char*> > -->
-            <return type-id='type-id-1177'/>
+            <return type-id='type-id-1171'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <!-- std::_Rb_tree_const_iterator<std::pair<const void* const, const char*> > std::_Rb_tree<const void*, std::pair<const void* const, const char*>, std::_Select1st<std::pair<const void* const, const char*> >, std::less<const void*>, std::allocator<std::pair<const void* const, const char*> > >::find(void* const&) -->
           <function-decl name='find' mangled-name='_ZNKSt8_Rb_treeIPKvSt4pairIKS1_PKcESt10_Select1stIS6_ESt4lessIS1_ESaIS6_EE4findERS3_' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='1431' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const std::_Rb_tree<const void*, std::pair<const void* const, const char*>, std::_Select1st<std::pair<const void* const, const char*> >, std::less<const void*>, std::allocator<std::pair<const void* const, const char*> > >*' -->
-            <parameter type-id='type-id-1172' is-artificial='yes'/>
+            <parameter type-id='type-id-1166' is-artificial='yes'/>
             <!-- parameter of type 'void* const&' -->
             <parameter type-id='type-id-149'/>
             <!-- struct std::_Rb_tree_const_iterator<std::pair<const void* const, const char*> > -->
-            <return type-id='type-id-1173'/>
+            <return type-id='type-id-1167'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <!-- size_t std::_Rb_tree<const void*, std::pair<const void* const, const char*>, std::_Select1st<std::pair<const void* const, const char*> >, std::less<const void*>, std::allocator<std::pair<const void* const, const char*> > >::count(void* const&) -->
           <function-decl name='count' mangled-name='_ZNKSt8_Rb_treeIPKvSt4pairIKS1_PKcESt10_Select1stIS6_ESt4lessIS1_ESaIS6_EE5countERS3_' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='1443' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const std::_Rb_tree<const void*, std::pair<const void* const, const char*>, std::_Select1st<std::pair<const void* const, const char*> >, std::less<const void*>, std::allocator<std::pair<const void* const, const char*> > >*' -->
-            <parameter type-id='type-id-1172' is-artificial='yes'/>
+            <parameter type-id='type-id-1166' is-artificial='yes'/>
             <!-- parameter of type 'void* const&' -->
             <parameter type-id='type-id-149'/>
             <!-- typedef size_t -->
@@ -30525,87 +30134,87 @@
           <!-- std::_Rb_tree_iterator<std::pair<const void* const, const char*> > std::_Rb_tree<const void*, std::pair<const void* const, const char*>, std::_Select1st<std::pair<const void* const, const char*> >, std::less<const void*>, std::allocator<std::pair<const void* const, const char*> > >::lower_bound(void* const&) -->
           <function-decl name='lower_bound' mangled-name='_ZNSt8_Rb_treeIPKvSt4pairIKS1_PKcESt10_Select1stIS6_ESt4lessIS1_ESaIS6_EE11lower_boundERS3_' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='744' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::_Rb_tree<const void*, std::pair<const void* const, const char*>, std::_Select1st<std::pair<const void* const, const char*> >, std::less<const void*>, std::allocator<std::pair<const void* const, const char*> > >*' -->
-            <parameter type-id='type-id-1206' is-artificial='yes'/>
+            <parameter type-id='type-id-1200' is-artificial='yes'/>
             <!-- parameter of type 'void* const&' -->
             <parameter type-id='type-id-149'/>
             <!-- struct std::_Rb_tree_iterator<std::pair<const void* const, const char*> > -->
-            <return type-id='type-id-1177'/>
+            <return type-id='type-id-1171'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <!-- std::_Rb_tree_const_iterator<std::pair<const void* const, const char*> > std::_Rb_tree<const void*, std::pair<const void* const, const char*>, std::_Select1st<std::pair<const void* const, const char*> >, std::less<const void*>, std::allocator<std::pair<const void* const, const char*> > >::lower_bound(void* const&) -->
           <function-decl name='lower_bound' mangled-name='_ZNKSt8_Rb_treeIPKvSt4pairIKS1_PKcESt10_Select1stIS6_ESt4lessIS1_ESaIS6_EE11lower_boundERS3_' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='748' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const std::_Rb_tree<const void*, std::pair<const void* const, const char*>, std::_Select1st<std::pair<const void* const, const char*> >, std::less<const void*>, std::allocator<std::pair<const void* const, const char*> > >*' -->
-            <parameter type-id='type-id-1172' is-artificial='yes'/>
+            <parameter type-id='type-id-1166' is-artificial='yes'/>
             <!-- parameter of type 'void* const&' -->
             <parameter type-id='type-id-149'/>
             <!-- struct std::_Rb_tree_const_iterator<std::pair<const void* const, const char*> > -->
-            <return type-id='type-id-1173'/>
+            <return type-id='type-id-1167'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <!-- std::_Rb_tree_iterator<std::pair<const void* const, const char*> > std::_Rb_tree<const void*, std::pair<const void* const, const char*>, std::_Select1st<std::pair<const void* const, const char*> >, std::less<const void*>, std::allocator<std::pair<const void* const, const char*> > >::upper_bound(void* const&) -->
           <function-decl name='upper_bound' mangled-name='_ZNSt8_Rb_treeIPKvSt4pairIKS1_PKcESt10_Select1stIS6_ESt4lessIS1_ESaIS6_EE11upper_boundERS3_' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='752' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::_Rb_tree<const void*, std::pair<const void* const, const char*>, std::_Select1st<std::pair<const void* const, const char*> >, std::less<const void*>, std::allocator<std::pair<const void* const, const char*> > >*' -->
-            <parameter type-id='type-id-1206' is-artificial='yes'/>
+            <parameter type-id='type-id-1200' is-artificial='yes'/>
             <!-- parameter of type 'void* const&' -->
             <parameter type-id='type-id-149'/>
             <!-- struct std::_Rb_tree_iterator<std::pair<const void* const, const char*> > -->
-            <return type-id='type-id-1177'/>
+            <return type-id='type-id-1171'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <!-- std::_Rb_tree_const_iterator<std::pair<const void* const, const char*> > std::_Rb_tree<const void*, std::pair<const void* const, const char*>, std::_Select1st<std::pair<const void* const, const char*> >, std::less<const void*>, std::allocator<std::pair<const void* const, const char*> > >::upper_bound(void* const&) -->
           <function-decl name='upper_bound' mangled-name='_ZNKSt8_Rb_treeIPKvSt4pairIKS1_PKcESt10_Select1stIS6_ESt4lessIS1_ESaIS6_EE11upper_boundERS3_' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='756' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const std::_Rb_tree<const void*, std::pair<const void* const, const char*>, std::_Select1st<std::pair<const void* const, const char*> >, std::less<const void*>, std::allocator<std::pair<const void* const, const char*> > >*' -->
-            <parameter type-id='type-id-1172' is-artificial='yes'/>
+            <parameter type-id='type-id-1166' is-artificial='yes'/>
             <!-- parameter of type 'void* const&' -->
             <parameter type-id='type-id-149'/>
             <!-- struct std::_Rb_tree_const_iterator<std::pair<const void* const, const char*> > -->
-            <return type-id='type-id-1173'/>
+            <return type-id='type-id-1167'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <!-- std::pair<std::_Rb_tree_iterator<std::pair<const void* const, const char*> >, std::_Rb_tree_iterator<std::pair<const void* const, const char*> > > std::_Rb_tree<const void*, std::pair<const void* const, const char*>, std::_Select1st<std::pair<const void* const, const char*> >, std::less<const void*>, std::allocator<std::pair<const void* const, const char*> > >::equal_range(void* const&) -->
           <function-decl name='equal_range' mangled-name='_ZNSt8_Rb_treeIPKvSt4pairIKS1_PKcESt10_Select1stIS6_ESt4lessIS1_ESaIS6_EE11equal_rangeERS3_' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='1047' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::_Rb_tree<const void*, std::pair<const void* const, const char*>, std::_Select1st<std::pair<const void* const, const char*> >, std::less<const void*>, std::allocator<std::pair<const void* const, const char*> > >*' -->
-            <parameter type-id='type-id-1206' is-artificial='yes'/>
+            <parameter type-id='type-id-1200' is-artificial='yes'/>
             <!-- parameter of type 'void* const&' -->
             <parameter type-id='type-id-149'/>
             <!-- struct std::pair<std::_Rb_tree_iterator<std::pair<const void* const, const char*> >, std::_Rb_tree_iterator<std::pair<const void* const, const char*> > > -->
-            <return type-id='type-id-1226'/>
+            <return type-id='type-id-1220'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <!-- std::pair<std::_Rb_tree_const_iterator<std::pair<const void* const, const char*> >, std::_Rb_tree_const_iterator<std::pair<const void* const, const char*> > > std::_Rb_tree<const void*, std::pair<const void* const, const char*>, std::_Select1st<std::pair<const void* const, const char*> >, std::less<const void*>, std::allocator<std::pair<const void* const, const char*> > >::equal_range(void* const&) -->
           <function-decl name='equal_range' mangled-name='_ZNKSt8_Rb_treeIPKvSt4pairIKS1_PKcESt10_Select1stIS6_ESt4lessIS1_ESaIS6_EE11equal_rangeERS3_' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='1078' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const std::_Rb_tree<const void*, std::pair<const void* const, const char*>, std::_Select1st<std::pair<const void* const, const char*> >, std::less<const void*>, std::allocator<std::pair<const void* const, const char*> > >*' -->
-            <parameter type-id='type-id-1172' is-artificial='yes'/>
+            <parameter type-id='type-id-1166' is-artificial='yes'/>
             <!-- parameter of type 'void* const&' -->
             <parameter type-id='type-id-149'/>
             <!-- struct std::pair<std::_Rb_tree_const_iterator<std::pair<const void* const, const char*> >, std::_Rb_tree_const_iterator<std::pair<const void* const, const char*> > > -->
-            <return type-id='type-id-1227'/>
+            <return type-id='type-id-1221'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <!-- bool std::_Rb_tree<const void*, std::pair<const void* const, const char*>, std::_Select1st<std::pair<const void* const, const char*> >, std::less<const void*>, std::allocator<std::pair<const void* const, const char*> > >::__rb_verify() -->
           <function-decl name='__rb_verify' mangled-name='_ZNKSt8_Rb_treeIPKvSt4pairIKS1_PKcESt10_Select1stIS6_ESt4lessIS1_ESaIS6_EE11__rb_verifyEv' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='1458' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const std::_Rb_tree<const void*, std::pair<const void* const, const char*>, std::_Select1st<std::pair<const void* const, const char*> >, std::less<const void*>, std::allocator<std::pair<const void* const, const char*> > >*' -->
-            <parameter type-id='type-id-1172' is-artificial='yes'/>
+            <parameter type-id='type-id-1166' is-artificial='yes'/>
             <!-- bool -->
             <return type-id='type-id-55'/>
           </function-decl>
         </member-function>
       </class-decl>
       <!-- class std::allocator<std::_Rb_tree_node<std::pair<const void* const, const char*> > > -->
-      <class-decl name='allocator&lt;std::_Rb_tree_node&lt;std::pair&lt;const void* const, const char*&gt; &gt; &gt;' size-in-bits='8' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/allocator.h' line='87' column='1' id='type-id-1188'>
+      <class-decl name='allocator&lt;std::_Rb_tree_node&lt;std::pair&lt;const void* const, const char*&gt; &gt; &gt;' size-in-bits='8' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/allocator.h' line='87' column='1' id='type-id-1182'>
         <!-- class __gnu_cxx::new_allocator<std::_Rb_tree_node<std::pair<const void* const, const char*> > > -->
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1158'/>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1152'/>
         <member-function access='private'>
           <!-- void std::allocator<std::_Rb_tree_node<std::pair<const void* const, const char*> > >::allocator() -->
           <function-decl name='allocator' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/allocator.h' line='101' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::allocator<std::_Rb_tree_node<std::pair<const void* const, const char*> > >*' -->
-            <parameter type-id='type-id-1216' is-artificial='yes'/>
+            <parameter type-id='type-id-1210' is-artificial='yes'/>
             <!-- void -->
             <return type-id='type-id-56'/>
           </function-decl>
@@ -30614,9 +30223,9 @@
           <!-- void std::allocator<std::_Rb_tree_node<std::pair<const void* const, const char*> > >::allocator(const std::allocator<std::_Rb_tree_node<std::pair<const void* const, const char*> > >&) -->
           <function-decl name='allocator' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/allocator.h' line='103' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::allocator<std::_Rb_tree_node<std::pair<const void* const, const char*> > >*' -->
-            <parameter type-id='type-id-1216' is-artificial='yes'/>
+            <parameter type-id='type-id-1210' is-artificial='yes'/>
             <!-- parameter of type 'const std::allocator<std::_Rb_tree_node<std::pair<const void* const, const char*> > >&' -->
-            <parameter type-id='type-id-1190'/>
+            <parameter type-id='type-id-1184'/>
             <!-- void -->
             <return type-id='type-id-56'/>
           </function-decl>
@@ -30625,7 +30234,7 @@
           <!-- std::allocator<std::_Rb_tree_node<std::pair<const void* const, const char*> > >::~allocator(int) -->
           <function-decl name='~allocator' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/allocator.h' line='109' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::allocator<std::_Rb_tree_node<std::pair<const void* const, const char*> > >*' -->
-            <parameter type-id='type-id-1216' is-artificial='yes'/>
+            <parameter type-id='type-id-1210' is-artificial='yes'/>
             <!-- artificial parameter of type 'int' -->
             <parameter type-id='type-id-1' is-artificial='yes'/>
             <!-- void -->
@@ -30634,16 +30243,16 @@
         </member-function>
       </class-decl>
       <!-- struct std::_Rb_tree_node<std::pair<const void* const, const char*> > -->
-      <class-decl name='_Rb_tree_node&lt;std::pair&lt;const void* const, const char*&gt; &gt;' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-1181'/>
+      <class-decl name='_Rb_tree_node&lt;std::pair&lt;const void* const, const char*&gt; &gt;' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-1175'/>
       <!-- struct std::less<const void*> -->
-      <class-decl name='less&lt;const void*&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_function.h' line='227' column='1' id='type-id-1194'>
+      <class-decl name='less&lt;const void*&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_function.h' line='227' column='1' id='type-id-1188'>
         <!-- struct std::binary_function<const void*, const void*, bool> -->
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1228'/>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1222'/>
         <member-function access='public'>
           <!-- bool std::less<const void*>::operator()(void* const&, void* const&) -->
           <function-decl name='operator()' mangled-name='_ZNKSt4lessIPKvEclERKS1_S4_' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_function.h' line='229' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const std::less<const void*>*' -->
-            <parameter type-id='type-id-1197' is-artificial='yes'/>
+            <parameter type-id='type-id-1191' is-artificial='yes'/>
             <!-- parameter of type 'void* const&' -->
             <parameter type-id='type-id-149'/>
             <!-- parameter of type 'void* const&' -->
@@ -30654,16 +30263,16 @@
         </member-function>
       </class-decl>
       <!-- struct std::binary_function<const void*, const void*, bool> -->
-      <class-decl name='binary_function&lt;const void*, const void*, bool&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_function.h' line='113' column='1' id='type-id-1228'/>
+      <class-decl name='binary_function&lt;const void*, const void*, bool&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_function.h' line='113' column='1' id='type-id-1222'/>
       <!-- class std::allocator<std::pair<const void* const, const char*> > -->
-      <class-decl name='allocator&lt;std::pair&lt;const void* const, const char*&gt; &gt;' size-in-bits='8' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/allocator.h' line='87' column='1' id='type-id-1191'>
+      <class-decl name='allocator&lt;std::pair&lt;const void* const, const char*&gt; &gt;' size-in-bits='8' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/allocator.h' line='87' column='1' id='type-id-1185'>
         <!-- class __gnu_cxx::new_allocator<std::pair<const void* const, const char*> > -->
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1160'/>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1154'/>
         <member-function access='private'>
           <!-- void std::allocator<std::pair<const void* const, const char*> >::allocator() -->
           <function-decl name='allocator' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/allocator.h' line='101' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::allocator<std::pair<const void* const, const char*> >*' -->
-            <parameter type-id='type-id-1217' is-artificial='yes'/>
+            <parameter type-id='type-id-1211' is-artificial='yes'/>
             <!-- void -->
             <return type-id='type-id-56'/>
           </function-decl>
@@ -30672,9 +30281,9 @@
           <!-- void std::allocator<std::pair<const void* const, const char*> >::allocator(const std::allocator<std::pair<const void* const, const char*> >&) -->
           <function-decl name='allocator' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/allocator.h' line='103' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::allocator<std::pair<const void* const, const char*> >*' -->
-            <parameter type-id='type-id-1217' is-artificial='yes'/>
+            <parameter type-id='type-id-1211' is-artificial='yes'/>
             <!-- parameter of type 'const std::allocator<std::pair<const void* const, const char*> >&' -->
-            <parameter type-id='type-id-1193'/>
+            <parameter type-id='type-id-1187'/>
             <!-- void -->
             <return type-id='type-id-56'/>
           </function-decl>
@@ -30683,7 +30292,7 @@
           <!-- std::allocator<std::pair<const void* const, const char*> >::~allocator(int) -->
           <function-decl name='~allocator' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/allocator.h' line='109' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::allocator<std::pair<const void* const, const char*> >*' -->
-            <parameter type-id='type-id-1217' is-artificial='yes'/>
+            <parameter type-id='type-id-1211' is-artificial='yes'/>
             <!-- artificial parameter of type 'int' -->
             <parameter type-id='type-id-1' is-artificial='yes'/>
             <!-- void -->
@@ -30694,16 +30303,16 @@
           <!-- void std::allocator<std::pair<const void* const, const char*> >::allocator<std::_Rb_tree_node<std::pair<const void* const, const char*> > >(const std::allocator<std::_Rb_tree_node<std::pair<const void* const, const char*> > >&) -->
           <function-decl name='allocator&lt;std::_Rb_tree_node&lt;std::pair&lt;const void* const, const char*&gt; &gt; &gt;' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/allocator.h' line='107' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::allocator<std::pair<const void* const, const char*> >*' -->
-            <parameter type-id='type-id-1217' is-artificial='yes'/>
+            <parameter type-id='type-id-1211' is-artificial='yes'/>
             <!-- parameter of type 'const std::allocator<std::_Rb_tree_node<std::pair<const void* const, const char*> > >&' -->
-            <parameter type-id='type-id-1190'/>
+            <parameter type-id='type-id-1184'/>
             <!-- void -->
             <return type-id='type-id-56'/>
           </function-decl>
         </member-function>
       </class-decl>
       <!-- struct std::pair<const void* const, const char*> -->
-      <class-decl name='pair&lt;const void* const, const char*&gt;' size-in-bits='128' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_pair.h' line='68' column='1' id='type-id-1201'>
+      <class-decl name='pair&lt;const void* const, const char*&gt;' size-in-bits='128' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_pair.h' line='68' column='1' id='type-id-1195'>
         <data-member access='public' layout-offset-in-bits='0'>
           <!-- void* const std::pair<const void* const, const char*>::first -->
           <var-decl name='first' type-id='type-id-54' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_pair.h' line='72' column='1'/>
@@ -30716,7 +30325,7 @@
           <!-- void std::pair<const void* const, const char*>::pair() -->
           <function-decl name='pair' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_pair.h' line='79' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::pair<const void* const, const char*>*' -->
-            <parameter type-id='type-id-1221' is-artificial='yes'/>
+            <parameter type-id='type-id-1215' is-artificial='yes'/>
             <!-- void -->
             <return type-id='type-id-56'/>
           </function-decl>
@@ -30725,7 +30334,7 @@
           <!-- void std::pair<const void* const, const char*>::pair(void* const&, const char* const&) -->
           <function-decl name='pair' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_pair.h' line='83' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::pair<const void* const, const char*>*' -->
-            <parameter type-id='type-id-1221' is-artificial='yes'/>
+            <parameter type-id='type-id-1215' is-artificial='yes'/>
             <!-- parameter of type 'void* const&' -->
             <parameter type-id='type-id-149'/>
             <!-- parameter of type 'const char* const&' -->
@@ -30736,7 +30345,7 @@
         </member-function>
       </class-decl>
       <!-- struct std::_Rb_tree_iterator<std::pair<const void* const, const char*> > -->
-      <class-decl name='_Rb_tree_iterator&lt;std::pair&lt;const void* const, const char*&gt; &gt;' size-in-bits='64' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='154' column='1' id='type-id-1177'>
+      <class-decl name='_Rb_tree_iterator&lt;std::pair&lt;const void* const, const char*&gt; &gt;' size-in-bits='64' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='154' column='1' id='type-id-1171'>
         <data-member access='public' layout-offset-in-bits='0'>
           <!-- std::_Rb_tree_node_base::_Base_ptr std::_Rb_tree_iterator<std::pair<const void* const, const char*> >::_M_node -->
           <var-decl name='_M_node' type-id='type-id-730' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='219' column='1'/>
@@ -30745,7 +30354,7 @@
           <!-- void std::_Rb_tree_iterator<std::pair<const void* const, const char*> >::_Rb_tree_iterator() -->
           <function-decl name='_Rb_tree_iterator' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='166' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::_Rb_tree_iterator<std::pair<const void* const, const char*> >*' -->
-            <parameter type-id='type-id-1212' is-artificial='yes'/>
+            <parameter type-id='type-id-1206' is-artificial='yes'/>
             <!-- void -->
             <return type-id='type-id-56'/>
           </function-decl>
@@ -30754,9 +30363,9 @@
           <!-- void std::_Rb_tree_iterator<std::pair<const void* const, const char*> >::_Rb_tree_iterator(std::_Rb_tree_node<std::pair<const void* const, const char*> >*) -->
           <function-decl name='_Rb_tree_iterator' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='170' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::_Rb_tree_iterator<std::pair<const void* const, const char*> >*' -->
-            <parameter type-id='type-id-1212' is-artificial='yes'/>
+            <parameter type-id='type-id-1206' is-artificial='yes'/>
             <!-- parameter of type 'std::_Rb_tree_node<std::pair<const void* const, const char*> >*' -->
-            <parameter type-id='type-id-1214'/>
+            <parameter type-id='type-id-1208'/>
             <!-- void -->
             <return type-id='type-id-56'/>
           </function-decl>
@@ -30765,67 +30374,67 @@
           <!-- std::pair<const void* const, const char*>& std::_Rb_tree_iterator<std::pair<const void* const, const char*> >::operator*() -->
           <function-decl name='operator*' mangled-name='_ZNKSt17_Rb_tree_iteratorISt4pairIKPKvPKcEEdeEv' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='174' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const std::_Rb_tree_iterator<std::pair<const void* const, const char*> >*' -->
-            <parameter type-id='type-id-1180' is-artificial='yes'/>
+            <parameter type-id='type-id-1174' is-artificial='yes'/>
             <!-- std::pair<const void* const, const char*>& -->
-            <return type-id='type-id-1220'/>
+            <return type-id='type-id-1214'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <!-- std::pair<const void* const, const char*>* std::_Rb_tree_iterator<std::pair<const void* const, const char*> >::operator&#45;>() -->
           <function-decl name='operator-&gt;' mangled-name='_ZNKSt17_Rb_tree_iteratorISt4pairIKPKvPKcEEptEv' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='178' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const std::_Rb_tree_iterator<std::pair<const void* const, const char*> >*' -->
-            <parameter type-id='type-id-1180' is-artificial='yes'/>
+            <parameter type-id='type-id-1174' is-artificial='yes'/>
             <!-- std::pair<const void* const, const char*>* -->
-            <return type-id='type-id-1221'/>
+            <return type-id='type-id-1215'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <!-- std::_Rb_tree_iterator<std::pair<const void* const, const char*> >& std::_Rb_tree_iterator<std::pair<const void* const, const char*> >::operator++() -->
           <function-decl name='operator++' mangled-name='_ZNSt17_Rb_tree_iteratorISt4pairIKPKvPKcEEppEv' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='182' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::_Rb_tree_iterator<std::pair<const void* const, const char*> >*' -->
-            <parameter type-id='type-id-1212' is-artificial='yes'/>
+            <parameter type-id='type-id-1206' is-artificial='yes'/>
             <!-- std::_Rb_tree_iterator<std::pair<const void* const, const char*> >& -->
-            <return type-id='type-id-1211'/>
+            <return type-id='type-id-1205'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <!-- std::_Rb_tree_iterator<std::pair<const void* const, const char*> > std::_Rb_tree_iterator<std::pair<const void* const, const char*> >::operator++(int) -->
           <function-decl name='operator++' mangled-name='_ZNSt17_Rb_tree_iteratorISt4pairIKPKvPKcEEppEi' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='189' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::_Rb_tree_iterator<std::pair<const void* const, const char*> >*' -->
-            <parameter type-id='type-id-1212' is-artificial='yes'/>
+            <parameter type-id='type-id-1206' is-artificial='yes'/>
             <!-- parameter of type 'int' -->
             <parameter type-id='type-id-1'/>
             <!-- struct std::_Rb_tree_iterator<std::pair<const void* const, const char*> > -->
-            <return type-id='type-id-1177'/>
+            <return type-id='type-id-1171'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <!-- std::_Rb_tree_iterator<std::pair<const void* const, const char*> >& std::_Rb_tree_iterator<std::pair<const void* const, const char*> >::operator&#45;&#45;() -->
           <function-decl name='operator--' mangled-name='_ZNSt17_Rb_tree_iteratorISt4pairIKPKvPKcEEmmEv' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='197' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::_Rb_tree_iterator<std::pair<const void* const, const char*> >*' -->
-            <parameter type-id='type-id-1212' is-artificial='yes'/>
+            <parameter type-id='type-id-1206' is-artificial='yes'/>
             <!-- std::_Rb_tree_iterator<std::pair<const void* const, const char*> >& -->
-            <return type-id='type-id-1211'/>
+            <return type-id='type-id-1205'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <!-- std::_Rb_tree_iterator<std::pair<const void* const, const char*> > std::_Rb_tree_iterator<std::pair<const void* const, const char*> >::operator&#45;&#45;(int) -->
           <function-decl name='operator--' mangled-name='_ZNSt17_Rb_tree_iteratorISt4pairIKPKvPKcEEmmEi' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='204' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::_Rb_tree_iterator<std::pair<const void* const, const char*> >*' -->
-            <parameter type-id='type-id-1212' is-artificial='yes'/>
+            <parameter type-id='type-id-1206' is-artificial='yes'/>
             <!-- parameter of type 'int' -->
             <parameter type-id='type-id-1'/>
             <!-- struct std::_Rb_tree_iterator<std::pair<const void* const, const char*> > -->
-            <return type-id='type-id-1177'/>
+            <return type-id='type-id-1171'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <!-- bool std::_Rb_tree_iterator<std::pair<const void* const, const char*> >::operator==(const std::_Rb_tree_iterator<std::pair<const void* const, const char*> >&) -->
           <function-decl name='operator==' mangled-name='_ZNKSt17_Rb_tree_iteratorISt4pairIKPKvPKcEEeqERKS7_' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='212' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const std::_Rb_tree_iterator<std::pair<const void* const, const char*> >*' -->
-            <parameter type-id='type-id-1180' is-artificial='yes'/>
+            <parameter type-id='type-id-1174' is-artificial='yes'/>
             <!-- parameter of type 'const std::_Rb_tree_iterator<std::pair<const void* const, const char*> >&' -->
-            <parameter type-id='type-id-1179'/>
+            <parameter type-id='type-id-1173'/>
             <!-- bool -->
             <return type-id='type-id-55'/>
           </function-decl>
@@ -30834,16 +30443,16 @@
           <!-- bool std::_Rb_tree_iterator<std::pair<const void* const, const char*> >::operator!=(const std::_Rb_tree_iterator<std::pair<const void* const, const char*> >&) -->
           <function-decl name='operator!=' mangled-name='_ZNKSt17_Rb_tree_iteratorISt4pairIKPKvPKcEEneERKS7_' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='216' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const std::_Rb_tree_iterator<std::pair<const void* const, const char*> >*' -->
-            <parameter type-id='type-id-1180' is-artificial='yes'/>
+            <parameter type-id='type-id-1174' is-artificial='yes'/>
             <!-- parameter of type 'const std::_Rb_tree_iterator<std::pair<const void* const, const char*> >&' -->
-            <parameter type-id='type-id-1179'/>
+            <parameter type-id='type-id-1173'/>
             <!-- bool -->
             <return type-id='type-id-55'/>
           </function-decl>
         </member-function>
       </class-decl>
       <!-- struct std::_Rb_tree_const_iterator<std::pair<const void* const, const char*> > -->
-      <class-decl name='_Rb_tree_const_iterator&lt;std::pair&lt;const void* const, const char*&gt; &gt;' size-in-bits='64' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='224' column='1' id='type-id-1173'>
+      <class-decl name='_Rb_tree_const_iterator&lt;std::pair&lt;const void* const, const char*&gt; &gt;' size-in-bits='64' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='224' column='1' id='type-id-1167'>
         <data-member access='public' layout-offset-in-bits='0'>
           <!-- std::_Rb_tree_node_base::_Const_Base_ptr std::_Rb_tree_const_iterator<std::pair<const void* const, const char*> >::_M_node -->
           <var-decl name='_M_node' type-id='type-id-731' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='294' column='1'/>
@@ -30852,7 +30461,7 @@
           <!-- void std::_Rb_tree_const_iterator<std::pair<const void* const, const char*> >::_Rb_tree_const_iterator() -->
           <function-decl name='_Rb_tree_const_iterator' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='238' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::_Rb_tree_const_iterator<std::pair<const void* const, const char*> >*' -->
-            <parameter type-id='type-id-1210' is-artificial='yes'/>
+            <parameter type-id='type-id-1204' is-artificial='yes'/>
             <!-- void -->
             <return type-id='type-id-56'/>
           </function-decl>
@@ -30861,9 +30470,9 @@
           <!-- void std::_Rb_tree_const_iterator<std::pair<const void* const, const char*> >::_Rb_tree_const_iterator(const std::_Rb_tree_node<std::pair<const void* const, const char*> >*) -->
           <function-decl name='_Rb_tree_const_iterator' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='242' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::_Rb_tree_const_iterator<std::pair<const void* const, const char*> >*' -->
-            <parameter type-id='type-id-1210' is-artificial='yes'/>
+            <parameter type-id='type-id-1204' is-artificial='yes'/>
             <!-- parameter of type 'const std::_Rb_tree_node<std::pair<const void* const, const char*> >*' -->
-            <parameter type-id='type-id-1184'/>
+            <parameter type-id='type-id-1178'/>
             <!-- void -->
             <return type-id='type-id-56'/>
           </function-decl>
@@ -30872,9 +30481,9 @@
           <!-- void std::_Rb_tree_const_iterator<std::pair<const void* const, const char*> >::_Rb_tree_const_iterator(const std::_Rb_tree_iterator<std::pair<const void* const, const char*> >&) -->
           <function-decl name='_Rb_tree_const_iterator' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='245' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::_Rb_tree_const_iterator<std::pair<const void* const, const char*> >*' -->
-            <parameter type-id='type-id-1210' is-artificial='yes'/>
+            <parameter type-id='type-id-1204' is-artificial='yes'/>
             <!-- parameter of type 'const std::_Rb_tree_iterator<std::pair<const void* const, const char*> >&' -->
-            <parameter type-id='type-id-1179'/>
+            <parameter type-id='type-id-1173'/>
             <!-- void -->
             <return type-id='type-id-56'/>
           </function-decl>
@@ -30883,67 +30492,67 @@
           <!-- const std::pair<const void* const, const char*>& std::_Rb_tree_const_iterator<std::pair<const void* const, const char*> >::operator*() -->
           <function-decl name='operator*' mangled-name='_ZNKSt23_Rb_tree_const_iteratorISt4pairIKPKvPKcEEdeEv' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='249' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const std::_Rb_tree_const_iterator<std::pair<const void* const, const char*> >*' -->
-            <parameter type-id='type-id-1176' is-artificial='yes'/>
+            <parameter type-id='type-id-1170' is-artificial='yes'/>
             <!-- const std::pair<const void* const, const char*>& -->
-            <return type-id='type-id-1203'/>
+            <return type-id='type-id-1197'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <!-- const std::pair<const void* const, const char*>* std::_Rb_tree_const_iterator<std::pair<const void* const, const char*> >::operator&#45;>() -->
           <function-decl name='operator-&gt;' mangled-name='_ZNKSt23_Rb_tree_const_iteratorISt4pairIKPKvPKcEEptEv' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='253' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const std::_Rb_tree_const_iterator<std::pair<const void* const, const char*> >*' -->
-            <parameter type-id='type-id-1176' is-artificial='yes'/>
+            <parameter type-id='type-id-1170' is-artificial='yes'/>
             <!-- const std::pair<const void* const, const char*>* -->
-            <return type-id='type-id-1204'/>
+            <return type-id='type-id-1198'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <!-- std::_Rb_tree_const_iterator<std::pair<const void* const, const char*> >& std::_Rb_tree_const_iterator<std::pair<const void* const, const char*> >::operator++() -->
           <function-decl name='operator++' mangled-name='_ZNSt23_Rb_tree_const_iteratorISt4pairIKPKvPKcEEppEv' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='257' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::_Rb_tree_const_iterator<std::pair<const void* const, const char*> >*' -->
-            <parameter type-id='type-id-1210' is-artificial='yes'/>
+            <parameter type-id='type-id-1204' is-artificial='yes'/>
             <!-- std::_Rb_tree_const_iterator<std::pair<const void* const, const char*> >& -->
-            <return type-id='type-id-1209'/>
+            <return type-id='type-id-1203'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <!-- std::_Rb_tree_const_iterator<std::pair<const void* const, const char*> > std::_Rb_tree_const_iterator<std::pair<const void* const, const char*> >::operator++(int) -->
           <function-decl name='operator++' mangled-name='_ZNSt23_Rb_tree_const_iteratorISt4pairIKPKvPKcEEppEi' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='264' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::_Rb_tree_const_iterator<std::pair<const void* const, const char*> >*' -->
-            <parameter type-id='type-id-1210' is-artificial='yes'/>
+            <parameter type-id='type-id-1204' is-artificial='yes'/>
             <!-- parameter of type 'int' -->
             <parameter type-id='type-id-1'/>
             <!-- struct std::_Rb_tree_const_iterator<std::pair<const void* const, const char*> > -->
-            <return type-id='type-id-1173'/>
+            <return type-id='type-id-1167'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <!-- std::_Rb_tree_const_iterator<std::pair<const void* const, const char*> >& std::_Rb_tree_const_iterator<std::pair<const void* const, const char*> >::operator&#45;&#45;() -->
           <function-decl name='operator--' mangled-name='_ZNSt23_Rb_tree_const_iteratorISt4pairIKPKvPKcEEmmEv' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='272' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::_Rb_tree_const_iterator<std::pair<const void* const, const char*> >*' -->
-            <parameter type-id='type-id-1210' is-artificial='yes'/>
+            <parameter type-id='type-id-1204' is-artificial='yes'/>
             <!-- std::_Rb_tree_const_iterator<std::pair<const void* const, const char*> >& -->
-            <return type-id='type-id-1209'/>
+            <return type-id='type-id-1203'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <!-- std::_Rb_tree_const_iterator<std::pair<const void* const, const char*> > std::_Rb_tree_const_iterator<std::pair<const void* const, const char*> >::operator&#45;&#45;(int) -->
           <function-decl name='operator--' mangled-name='_ZNSt23_Rb_tree_const_iteratorISt4pairIKPKvPKcEEmmEi' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='279' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::_Rb_tree_const_iterator<std::pair<const void* const, const char*> >*' -->
-            <parameter type-id='type-id-1210' is-artificial='yes'/>
+            <parameter type-id='type-id-1204' is-artificial='yes'/>
             <!-- parameter of type 'int' -->
             <parameter type-id='type-id-1'/>
             <!-- struct std::_Rb_tree_const_iterator<std::pair<const void* const, const char*> > -->
-            <return type-id='type-id-1173'/>
+            <return type-id='type-id-1167'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <!-- bool std::_Rb_tree_const_iterator<std::pair<const void* const, const char*> >::operator==(const std::_Rb_tree_const_iterator<std::pair<const void* const, const char*> >&) -->
           <function-decl name='operator==' mangled-name='_ZNKSt23_Rb_tree_const_iteratorISt4pairIKPKvPKcEEeqERKS7_' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='287' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const std::_Rb_tree_const_iterator<std::pair<const void* const, const char*> >*' -->
-            <parameter type-id='type-id-1176' is-artificial='yes'/>
+            <parameter type-id='type-id-1170' is-artificial='yes'/>
             <!-- parameter of type 'const std::_Rb_tree_const_iterator<std::pair<const void* const, const char*> >&' -->
-            <parameter type-id='type-id-1175'/>
+            <parameter type-id='type-id-1169'/>
             <!-- bool -->
             <return type-id='type-id-55'/>
           </function-decl>
@@ -30952,23 +30561,23 @@
           <!-- bool std::_Rb_tree_const_iterator<std::pair<const void* const, const char*> >::operator!=(const std::_Rb_tree_const_iterator<std::pair<const void* const, const char*> >&) -->
           <function-decl name='operator!=' mangled-name='_ZNKSt23_Rb_tree_const_iteratorISt4pairIKPKvPKcEEneERKS7_' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='291' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const std::_Rb_tree_const_iterator<std::pair<const void* const, const char*> >*' -->
-            <parameter type-id='type-id-1176' is-artificial='yes'/>
+            <parameter type-id='type-id-1170' is-artificial='yes'/>
             <!-- parameter of type 'const std::_Rb_tree_const_iterator<std::pair<const void* const, const char*> >&' -->
-            <parameter type-id='type-id-1175'/>
+            <parameter type-id='type-id-1169'/>
             <!-- bool -->
             <return type-id='type-id-55'/>
           </function-decl>
         </member-function>
       </class-decl>
       <!-- class std::reverse_iterator<std::_Rb_tree_iterator<std::pair<const void* const, const char*> > > -->
-      <class-decl name='reverse_iterator&lt;std::_Rb_tree_iterator&lt;std::pair&lt;const void* const, const char*&gt; &gt; &gt;' visibility='default' is-declaration-only='yes' id='type-id-1224'/>
+      <class-decl name='reverse_iterator&lt;std::_Rb_tree_iterator&lt;std::pair&lt;const void* const, const char*&gt; &gt; &gt;' visibility='default' is-declaration-only='yes' id='type-id-1218'/>
       <!-- class std::reverse_iterator<std::_Rb_tree_const_iterator<std::pair<const void* const, const char*> > > -->
-      <class-decl name='reverse_iterator&lt;std::_Rb_tree_const_iterator&lt;std::pair&lt;const void* const, const char*&gt; &gt; &gt;' visibility='default' is-declaration-only='yes' id='type-id-1225'/>
+      <class-decl name='reverse_iterator&lt;std::_Rb_tree_const_iterator&lt;std::pair&lt;const void* const, const char*&gt; &gt; &gt;' visibility='default' is-declaration-only='yes' id='type-id-1219'/>
       <!-- struct std::pair<std::_Rb_tree_iterator<std::pair<const void* const, const char*> >, bool> -->
-      <class-decl name='pair&lt;std::_Rb_tree_iterator&lt;std::pair&lt;const void* const, const char*&gt; &gt;, bool&gt;' size-in-bits='128' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_pair.h' line='68' column='1' id='type-id-1222'>
+      <class-decl name='pair&lt;std::_Rb_tree_iterator&lt;std::pair&lt;const void* const, const char*&gt; &gt;, bool&gt;' size-in-bits='128' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_pair.h' line='68' column='1' id='type-id-1216'>
         <data-member access='public' layout-offset-in-bits='0'>
           <!-- std::_Rb_tree_iterator<std::pair<const void* const, const char*> > std::pair<std::_Rb_tree_iterator<std::pair<const void* const, const char*> >, bool>::first -->
-          <var-decl name='first' type-id='type-id-1177' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_pair.h' line='72' column='1'/>
+          <var-decl name='first' type-id='type-id-1171' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_pair.h' line='72' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='64'>
           <!-- bool std::pair<std::_Rb_tree_iterator<std::pair<const void* const, const char*> >, bool>::second -->
@@ -30978,7 +30587,7 @@
           <!-- void std::pair<std::_Rb_tree_iterator<std::pair<const void* const, const char*> >, bool>::pair() -->
           <function-decl name='pair' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_pair.h' line='79' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::pair<std::_Rb_tree_iterator<std::pair<const void* const, const char*> >, bool>*' -->
-            <parameter type-id='type-id-1223' is-artificial='yes'/>
+            <parameter type-id='type-id-1217' is-artificial='yes'/>
             <!-- void -->
             <return type-id='type-id-56'/>
           </function-decl>
@@ -30987,9 +30596,9 @@
           <!-- void std::pair<std::_Rb_tree_iterator<std::pair<const void* const, const char*> >, bool>::pair(const std::_Rb_tree_iterator<std::pair<const void* const, const char*> >&, const bool&) -->
           <function-decl name='pair' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_pair.h' line='83' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::pair<std::_Rb_tree_iterator<std::pair<const void* const, const char*> >, bool>*' -->
-            <parameter type-id='type-id-1223' is-artificial='yes'/>
+            <parameter type-id='type-id-1217' is-artificial='yes'/>
             <!-- parameter of type 'const std::_Rb_tree_iterator<std::pair<const void* const, const char*> >&' -->
-            <parameter type-id='type-id-1179'/>
+            <parameter type-id='type-id-1173'/>
             <!-- parameter of type 'const bool&' -->
             <parameter type-id='type-id-460'/>
             <!-- void -->
@@ -30998,20 +30607,20 @@
         </member-function>
       </class-decl>
       <!-- struct std::pair<std::_Rb_tree_iterator<std::pair<const void* const, const char*> >, std::_Rb_tree_iterator<std::pair<const void* const, const char*> > > -->
-      <class-decl name='pair&lt;std::_Rb_tree_iterator&lt;std::pair&lt;const void* const, const char*&gt; &gt;, std::_Rb_tree_iterator&lt;std::pair&lt;const void* const, const char*&gt; &gt; &gt;' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-1226'/>
+      <class-decl name='pair&lt;std::_Rb_tree_iterator&lt;std::pair&lt;const void* const, const char*&gt; &gt;, std::_Rb_tree_iterator&lt;std::pair&lt;const void* const, const char*&gt; &gt; &gt;' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-1220'/>
       <!-- struct std::pair<std::_Rb_tree_const_iterator<std::pair<const void* const, const char*> >, std::_Rb_tree_const_iterator<std::pair<const void* const, const char*> > > -->
-      <class-decl name='pair&lt;std::_Rb_tree_const_iterator&lt;std::pair&lt;const void* const, const char*&gt; &gt;, std::_Rb_tree_const_iterator&lt;std::pair&lt;const void* const, const char*&gt; &gt; &gt;' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-1227'/>
+      <class-decl name='pair&lt;std::_Rb_tree_const_iterator&lt;std::pair&lt;const void* const, const char*&gt; &gt;, std::_Rb_tree_const_iterator&lt;std::pair&lt;const void* const, const char*&gt; &gt; &gt;' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-1221'/>
       <!-- struct std::_Select1st<std::pair<const void* const, const char*> > -->
-      <class-decl name='_Select1st&lt;std::pair&lt;const void* const, const char*&gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_function.h' line='482' column='1' id='type-id-1185'>
+      <class-decl name='_Select1st&lt;std::pair&lt;const void* const, const char*&gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_function.h' line='482' column='1' id='type-id-1179'>
         <!-- struct std::unary_function<std::pair<const void* const, const char*>, const void* const> -->
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1229'/>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1223'/>
         <member-function access='public'>
           <!-- void* const& std::_Select1st<std::pair<const void* const, const char*> >::operator()(std::pair<const void* const, const char*>&) -->
           <function-decl name='operator()' mangled-name='_ZNKSt10_Select1stISt4pairIKPKvPKcEEclERS6_' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_function.h' line='484' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const std::_Select1st<std::pair<const void* const, const char*> >*' -->
-            <parameter type-id='type-id-1187' is-artificial='yes'/>
+            <parameter type-id='type-id-1181' is-artificial='yes'/>
             <!-- parameter of type 'std::pair<const void* const, const char*>&' -->
-            <parameter type-id='type-id-1220'/>
+            <parameter type-id='type-id-1214'/>
             <!-- void* const& -->
             <return type-id='type-id-149'/>
           </function-decl>
@@ -31020,31 +30629,31 @@
           <!-- void* const& std::_Select1st<std::pair<const void* const, const char*> >::operator()(const std::pair<const void* const, const char*>&) -->
           <function-decl name='operator()' mangled-name='_ZNKSt10_Select1stISt4pairIKPKvPKcEEclERKS6_' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_function.h' line='488' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const std::_Select1st<std::pair<const void* const, const char*> >*' -->
-            <parameter type-id='type-id-1187' is-artificial='yes'/>
+            <parameter type-id='type-id-1181' is-artificial='yes'/>
             <!-- parameter of type 'const std::pair<const void* const, const char*>&' -->
-            <parameter type-id='type-id-1203'/>
+            <parameter type-id='type-id-1197'/>
             <!-- void* const& -->
             <return type-id='type-id-149'/>
           </function-decl>
         </member-function>
       </class-decl>
       <!-- struct std::unary_function<std::pair<const void* const, const char*>, const void* const> -->
-      <class-decl name='unary_function&lt;std::pair&lt;const void* const, const char*&gt;, const void* const&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_function.h' line='101' column='1' id='type-id-1229'/>
+      <class-decl name='unary_function&lt;std::pair&lt;const void* const, const char*&gt;, const void* const&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_function.h' line='101' column='1' id='type-id-1223'/>
       <!-- class std::map<const void*, const char*, std::less<const void*>, std::allocator<std::pair<const void* const, const char*> > > -->
-      <class-decl name='map&lt;const void*, const char*, std::less&lt;const void*&gt;, std::allocator&lt;std::pair&lt;const void* const, const char*&gt; &gt; &gt;' size-in-bits='384' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_map.h' line='87' column='1' id='type-id-1156'>
+      <class-decl name='map&lt;const void*, const char*, std::less&lt;const void*&gt;, std::allocator&lt;std::pair&lt;const void* const, const char*&gt; &gt; &gt;' size-in-bits='384' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_map.h' line='87' column='1' id='type-id-1150'>
         <member-type access='private'>
           <!-- class std::map<const void*, const char*, std::less<const void*>, std::allocator<std::pair<const void* const, const char*> > >::value_compare -->
-          <class-decl name='value_compare' visibility='default' is-declaration-only='yes' id='type-id-1230'/>
+          <class-decl name='value_compare' visibility='default' is-declaration-only='yes' id='type-id-1224'/>
         </member-type>
         <data-member access='private' layout-offset-in-bits='0'>
           <!-- std::_Rb_tree<const void*, std::pair<const void* const, const char*>, std::_Select1st<std::pair<const void* const, const char*> >, std::less<const void*>, std::allocator<std::pair<const void* const, const char*> > > std::map<const void*, const char*, std::less<const void*>, std::allocator<std::pair<const void* const, const char*> > >::_M_t -->
-          <var-decl name='_M_t' type-id='type-id-1169' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_map.h' line='128' column='1'/>
+          <var-decl name='_M_t' type-id='type-id-1163' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_map.h' line='128' column='1'/>
         </data-member>
         <member-function access='private'>
           <!-- void std::map<const void*, const char*, std::less<const void*>, std::allocator<std::pair<const void* const, const char*> > >::map() -->
           <function-decl name='map' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_map.h' line='150' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::map<const void*, const char*, std::less<const void*>, std::allocator<std::pair<const void* const, const char*> > >*' -->
-            <parameter type-id='type-id-1219' is-artificial='yes'/>
+            <parameter type-id='type-id-1213' is-artificial='yes'/>
             <!-- void -->
             <return type-id='type-id-56'/>
           </function-decl>
@@ -31053,11 +30662,11 @@
           <!-- void std::map<const void*, const char*, std::less<const void*>, std::allocator<std::pair<const void* const, const char*> > >::map(const std::less<const void*>&, const std::allocator<std::pair<const void* const, const char*> >&) -->
           <function-decl name='map' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_map.h' line='159' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::map<const void*, const char*, std::less<const void*>, std::allocator<std::pair<const void* const, const char*> > >*' -->
-            <parameter type-id='type-id-1219' is-artificial='yes'/>
+            <parameter type-id='type-id-1213' is-artificial='yes'/>
             <!-- parameter of type 'const std::less<const void*>&' -->
-            <parameter type-id='type-id-1196'/>
+            <parameter type-id='type-id-1190'/>
             <!-- parameter of type 'const std::allocator<std::pair<const void* const, const char*> >&' -->
-            <parameter type-id='type-id-1193'/>
+            <parameter type-id='type-id-1187'/>
             <!-- void -->
             <return type-id='type-id-56'/>
           </function-decl>
@@ -31066,9 +30675,9 @@
           <!-- void std::map<const void*, const char*, std::less<const void*>, std::allocator<std::pair<const void* const, const char*> > >::map(const std::map<const void*, const char*, std::less<const void*>, std::allocator<std::pair<const void* const, const char*> > >&) -->
           <function-decl name='map' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_map.h' line='170' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::map<const void*, const char*, std::less<const void*>, std::allocator<std::pair<const void* const, const char*> > >*' -->
-            <parameter type-id='type-id-1219' is-artificial='yes'/>
+            <parameter type-id='type-id-1213' is-artificial='yes'/>
             <!-- parameter of type 'const std::map<const void*, const char*, std::less<const void*>, std::allocator<std::pair<const void* const, const char*> > >&' -->
-            <parameter type-id='type-id-1199'/>
+            <parameter type-id='type-id-1193'/>
             <!-- void -->
             <return type-id='type-id-56'/>
           </function-decl>
@@ -31077,99 +30686,99 @@
           <!-- std::map<const void*, const char*, std::less<const void*>, std::allocator<std::pair<const void* const, const char*> > >& std::map<const void*, const char*, std::less<const void*>, std::allocator<std::pair<const void* const, const char*> > >::operator=(const std::map<const void*, const char*, std::less<const void*>, std::allocator<std::pair<const void* const, const char*> > >&) -->
           <function-decl name='operator=' mangled-name='_ZNSt3mapIPKvPKcSt4lessIS1_ESaISt4pairIKS1_S3_EEEaSERKSA_' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_map.h' line='251' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::map<const void*, const char*, std::less<const void*>, std::allocator<std::pair<const void* const, const char*> > >*' -->
-            <parameter type-id='type-id-1219' is-artificial='yes'/>
+            <parameter type-id='type-id-1213' is-artificial='yes'/>
             <!-- parameter of type 'const std::map<const void*, const char*, std::less<const void*>, std::allocator<std::pair<const void* const, const char*> > >&' -->
-            <parameter type-id='type-id-1199'/>
+            <parameter type-id='type-id-1193'/>
             <!-- std::map<const void*, const char*, std::less<const void*>, std::allocator<std::pair<const void* const, const char*> > >& -->
-            <return type-id='type-id-1218'/>
+            <return type-id='type-id-1212'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <!-- std::allocator<std::pair<const void* const, const char*> > std::map<const void*, const char*, std::less<const void*>, std::allocator<std::pair<const void* const, const char*> > >::get_allocator() -->
           <function-decl name='get_allocator' mangled-name='_ZNKSt3mapIPKvPKcSt4lessIS1_ESaISt4pairIKS1_S3_EEE13get_allocatorEv' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_map.h' line='296' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const std::map<const void*, const char*, std::less<const void*>, std::allocator<std::pair<const void* const, const char*> > >*' -->
-            <parameter type-id='type-id-1200' is-artificial='yes'/>
+            <parameter type-id='type-id-1194' is-artificial='yes'/>
             <!-- class std::allocator<std::pair<const void* const, const char*> > -->
-            <return type-id='type-id-1191'/>
+            <return type-id='type-id-1185'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <!-- std::_Rb_tree_iterator<std::pair<const void* const, const char*> > std::map<const void*, const char*, std::less<const void*>, std::allocator<std::pair<const void* const, const char*> > >::begin() -->
           <function-decl name='begin' mangled-name='_ZNSt3mapIPKvPKcSt4lessIS1_ESaISt4pairIKS1_S3_EEE5beginEv' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_map.h' line='306' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::map<const void*, const char*, std::less<const void*>, std::allocator<std::pair<const void* const, const char*> > >*' -->
-            <parameter type-id='type-id-1219' is-artificial='yes'/>
+            <parameter type-id='type-id-1213' is-artificial='yes'/>
             <!-- struct std::_Rb_tree_iterator<std::pair<const void* const, const char*> > -->
-            <return type-id='type-id-1177'/>
+            <return type-id='type-id-1171'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <!-- std::_Rb_tree_const_iterator<std::pair<const void* const, const char*> > std::map<const void*, const char*, std::less<const void*>, std::allocator<std::pair<const void* const, const char*> > >::begin() -->
           <function-decl name='begin' mangled-name='_ZNKSt3mapIPKvPKcSt4lessIS1_ESaISt4pairIKS1_S3_EEE5beginEv' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_map.h' line='315' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const std::map<const void*, const char*, std::less<const void*>, std::allocator<std::pair<const void* const, const char*> > >*' -->
-            <parameter type-id='type-id-1200' is-artificial='yes'/>
+            <parameter type-id='type-id-1194' is-artificial='yes'/>
             <!-- struct std::_Rb_tree_const_iterator<std::pair<const void* const, const char*> > -->
-            <return type-id='type-id-1173'/>
+            <return type-id='type-id-1167'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <!-- std::_Rb_tree_iterator<std::pair<const void* const, const char*> > std::map<const void*, const char*, std::less<const void*>, std::allocator<std::pair<const void* const, const char*> > >::end() -->
           <function-decl name='end' mangled-name='_ZNSt3mapIPKvPKcSt4lessIS1_ESaISt4pairIKS1_S3_EEE3endEv' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_map.h' line='324' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::map<const void*, const char*, std::less<const void*>, std::allocator<std::pair<const void* const, const char*> > >*' -->
-            <parameter type-id='type-id-1219' is-artificial='yes'/>
+            <parameter type-id='type-id-1213' is-artificial='yes'/>
             <!-- struct std::_Rb_tree_iterator<std::pair<const void* const, const char*> > -->
-            <return type-id='type-id-1177'/>
+            <return type-id='type-id-1171'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <!-- std::_Rb_tree_const_iterator<std::pair<const void* const, const char*> > std::map<const void*, const char*, std::less<const void*>, std::allocator<std::pair<const void* const, const char*> > >::end() -->
           <function-decl name='end' mangled-name='_ZNKSt3mapIPKvPKcSt4lessIS1_ESaISt4pairIKS1_S3_EEE3endEv' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_map.h' line='333' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const std::map<const void*, const char*, std::less<const void*>, std::allocator<std::pair<const void* const, const char*> > >*' -->
-            <parameter type-id='type-id-1200' is-artificial='yes'/>
+            <parameter type-id='type-id-1194' is-artificial='yes'/>
             <!-- struct std::_Rb_tree_const_iterator<std::pair<const void* const, const char*> > -->
-            <return type-id='type-id-1173'/>
+            <return type-id='type-id-1167'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <!-- std::reverse_iterator<std::_Rb_tree_iterator<std::pair<const void* const, const char*> > > std::map<const void*, const char*, std::less<const void*>, std::allocator<std::pair<const void* const, const char*> > >::rbegin() -->
           <function-decl name='rbegin' mangled-name='_ZNSt3mapIPKvPKcSt4lessIS1_ESaISt4pairIKS1_S3_EEE6rbeginEv' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_map.h' line='342' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::map<const void*, const char*, std::less<const void*>, std::allocator<std::pair<const void* const, const char*> > >*' -->
-            <parameter type-id='type-id-1219' is-artificial='yes'/>
+            <parameter type-id='type-id-1213' is-artificial='yes'/>
             <!-- class std::reverse_iterator<std::_Rb_tree_iterator<std::pair<const void* const, const char*> > > -->
-            <return type-id='type-id-1224'/>
+            <return type-id='type-id-1218'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <!-- std::reverse_iterator<std::_Rb_tree_const_iterator<std::pair<const void* const, const char*> > > std::map<const void*, const char*, std::less<const void*>, std::allocator<std::pair<const void* const, const char*> > >::rbegin() -->
           <function-decl name='rbegin' mangled-name='_ZNKSt3mapIPKvPKcSt4lessIS1_ESaISt4pairIKS1_S3_EEE6rbeginEv' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_map.h' line='351' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const std::map<const void*, const char*, std::less<const void*>, std::allocator<std::pair<const void* const, const char*> > >*' -->
-            <parameter type-id='type-id-1200' is-artificial='yes'/>
+            <parameter type-id='type-id-1194' is-artificial='yes'/>
             <!-- class std::reverse_iterator<std::_Rb_tree_const_iterator<std::pair<const void* const, const char*> > > -->
-            <return type-id='type-id-1225'/>
+            <return type-id='type-id-1219'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <!-- std::reverse_iterator<std::_Rb_tree_iterator<std::pair<const void* const, const char*> > > std::map<const void*, const char*, std::less<const void*>, std::allocator<std::pair<const void* const, const char*> > >::rend() -->
           <function-decl name='rend' mangled-name='_ZNSt3mapIPKvPKcSt4lessIS1_ESaISt4pairIKS1_S3_EEE4rendEv' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_map.h' line='360' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::map<const void*, const char*, std::less<const void*>, std::allocator<std::pair<const void* const, const char*> > >*' -->
-            <parameter type-id='type-id-1219' is-artificial='yes'/>
+            <parameter type-id='type-id-1213' is-artificial='yes'/>
             <!-- class std::reverse_iterator<std::_Rb_tree_iterator<std::pair<const void* const, const char*> > > -->
-            <return type-id='type-id-1224'/>
+            <return type-id='type-id-1218'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <!-- std::reverse_iterator<std::_Rb_tree_const_iterator<std::pair<const void* const, const char*> > > std::map<const void*, const char*, std::less<const void*>, std::allocator<std::pair<const void* const, const char*> > >::rend() -->
           <function-decl name='rend' mangled-name='_ZNKSt3mapIPKvPKcSt4lessIS1_ESaISt4pairIKS1_S3_EEE4rendEv' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_map.h' line='369' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const std::map<const void*, const char*, std::less<const void*>, std::allocator<std::pair<const void* const, const char*> > >*' -->
-            <parameter type-id='type-id-1200' is-artificial='yes'/>
+            <parameter type-id='type-id-1194' is-artificial='yes'/>
             <!-- class std::reverse_iterator<std::_Rb_tree_const_iterator<std::pair<const void* const, const char*> > > -->
-            <return type-id='type-id-1225'/>
+            <return type-id='type-id-1219'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <!-- bool std::map<const void*, const char*, std::less<const void*>, std::allocator<std::pair<const void* const, const char*> > >::empty() -->
           <function-decl name='empty' mangled-name='_ZNKSt3mapIPKvPKcSt4lessIS1_ESaISt4pairIKS1_S3_EEE5emptyEv' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_map.h' line='415' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const std::map<const void*, const char*, std::less<const void*>, std::allocator<std::pair<const void* const, const char*> > >*' -->
-            <parameter type-id='type-id-1200' is-artificial='yes'/>
+            <parameter type-id='type-id-1194' is-artificial='yes'/>
             <!-- bool -->
             <return type-id='type-id-55'/>
           </function-decl>
@@ -31178,7 +30787,7 @@
           <!-- size_t std::map<const void*, const char*, std::less<const void*>, std::allocator<std::pair<const void* const, const char*> > >::size() -->
           <function-decl name='size' mangled-name='_ZNKSt3mapIPKvPKcSt4lessIS1_ESaISt4pairIKS1_S3_EEE4sizeEv' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_map.h' line='420' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const std::map<const void*, const char*, std::less<const void*>, std::allocator<std::pair<const void* const, const char*> > >*' -->
-            <parameter type-id='type-id-1200' is-artificial='yes'/>
+            <parameter type-id='type-id-1194' is-artificial='yes'/>
             <!-- typedef size_t -->
             <return type-id='type-id-57'/>
           </function-decl>
@@ -31187,7 +30796,7 @@
           <!-- size_t std::map<const void*, const char*, std::less<const void*>, std::allocator<std::pair<const void* const, const char*> > >::max_size() -->
           <function-decl name='max_size' mangled-name='_ZNKSt3mapIPKvPKcSt4lessIS1_ESaISt4pairIKS1_S3_EEE8max_sizeEv' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_map.h' line='425' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const std::map<const void*, const char*, std::less<const void*>, std::allocator<std::pair<const void* const, const char*> > >*' -->
-            <parameter type-id='type-id-1200' is-artificial='yes'/>
+            <parameter type-id='type-id-1194' is-artificial='yes'/>
             <!-- typedef size_t -->
             <return type-id='type-id-57'/>
           </function-decl>
@@ -31196,29 +30805,29 @@
           <!-- const char*& std::map<const void*, const char*, std::less<const void*>, std::allocator<std::pair<const void* const, const char*> > >::operator[](void* const&) -->
           <function-decl name='operator[]' mangled-name='_ZNSt3mapIPKvPKcSt4lessIS1_ESaISt4pairIKS1_S3_EEEixERS7_' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_map.h' line='442' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::map<const void*, const char*, std::less<const void*>, std::allocator<std::pair<const void* const, const char*> > >*' -->
-            <parameter type-id='type-id-1219' is-artificial='yes'/>
+            <parameter type-id='type-id-1213' is-artificial='yes'/>
             <!-- parameter of type 'void* const&' -->
             <parameter type-id='type-id-149'/>
             <!-- const char*& -->
-            <return type-id='type-id-1168'/>
+            <return type-id='type-id-1162'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <!-- const char*& std::map<const void*, const char*, std::less<const void*>, std::allocator<std::pair<const void* const, const char*> > >::at(void* const&) -->
           <function-decl name='at' mangled-name='_ZNSt3mapIPKvPKcSt4lessIS1_ESaISt4pairIKS1_S3_EEE2atERS7_' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_map.h' line='464' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::map<const void*, const char*, std::less<const void*>, std::allocator<std::pair<const void* const, const char*> > >*' -->
-            <parameter type-id='type-id-1219' is-artificial='yes'/>
+            <parameter type-id='type-id-1213' is-artificial='yes'/>
             <!-- parameter of type 'void* const&' -->
             <parameter type-id='type-id-149'/>
             <!-- const char*& -->
-            <return type-id='type-id-1168'/>
+            <return type-id='type-id-1162'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <!-- const char* const& std::map<const void*, const char*, std::less<const void*>, std::allocator<std::pair<const void* const, const char*> > >::at(void* const&) -->
           <function-decl name='at' mangled-name='_ZNKSt3mapIPKvPKcSt4lessIS1_ESaISt4pairIKS1_S3_EEE2atERS7_' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_map.h' line='473' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const std::map<const void*, const char*, std::less<const void*>, std::allocator<std::pair<const void* const, const char*> > >*' -->
-            <parameter type-id='type-id-1200' is-artificial='yes'/>
+            <parameter type-id='type-id-1194' is-artificial='yes'/>
             <!-- parameter of type 'void* const&' -->
             <parameter type-id='type-id-149'/>
             <!-- const char* const& -->
@@ -31229,33 +30838,33 @@
           <!-- std::pair<std::_Rb_tree_iterator<std::pair<const void* const, const char*> >, bool> std::map<const void*, const char*, std::less<const void*>, std::allocator<std::pair<const void* const, const char*> > >::insert(const std::pair<const void* const, const char*>&) -->
           <function-decl name='insert' mangled-name='_ZNSt3mapIPKvPKcSt4lessIS1_ESaISt4pairIKS1_S3_EEE6insertERKS8_' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_map.h' line='499' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::map<const void*, const char*, std::less<const void*>, std::allocator<std::pair<const void* const, const char*> > >*' -->
-            <parameter type-id='type-id-1219' is-artificial='yes'/>
+            <parameter type-id='type-id-1213' is-artificial='yes'/>
             <!-- parameter of type 'const std::pair<const void* const, const char*>&' -->
-            <parameter type-id='type-id-1203'/>
+            <parameter type-id='type-id-1197'/>
             <!-- struct std::pair<std::_Rb_tree_iterator<std::pair<const void* const, const char*> >, bool> -->
-            <return type-id='type-id-1222'/>
+            <return type-id='type-id-1216'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <!-- std::_Rb_tree_iterator<std::pair<const void* const, const char*> > std::map<const void*, const char*, std::less<const void*>, std::allocator<std::pair<const void* const, const char*> > >::insert(std::_Rb_tree_iterator<std::pair<const void* const, const char*> >, const std::pair<const void* const, const char*>&) -->
           <function-decl name='insert' mangled-name='_ZNSt3mapIPKvPKcSt4lessIS1_ESaISt4pairIKS1_S3_EEE6insertESt17_Rb_tree_iteratorIS8_ERKS8_' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_map.h' line='539' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::map<const void*, const char*, std::less<const void*>, std::allocator<std::pair<const void* const, const char*> > >*' -->
-            <parameter type-id='type-id-1219' is-artificial='yes'/>
+            <parameter type-id='type-id-1213' is-artificial='yes'/>
             <!-- parameter of type 'struct std::_Rb_tree_iterator<std::pair<const void* const, const char*> >' -->
-            <parameter type-id='type-id-1177'/>
+            <parameter type-id='type-id-1171'/>
             <!-- parameter of type 'const std::pair<const void* const, const char*>&' -->
-            <parameter type-id='type-id-1203'/>
+            <parameter type-id='type-id-1197'/>
             <!-- struct std::_Rb_tree_iterator<std::pair<const void* const, const char*> > -->
-            <return type-id='type-id-1177'/>
+            <return type-id='type-id-1171'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <!-- void std::map<const void*, const char*, std::less<const void*>, std::allocator<std::pair<const void* const, const char*> > >::erase(std::_Rb_tree_iterator<std::pair<const void* const, const char*> >) -->
           <function-decl name='erase' mangled-name='_ZNSt3mapIPKvPKcSt4lessIS1_ESaISt4pairIKS1_S3_EEE5eraseESt17_Rb_tree_iteratorIS8_E' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_map.h' line='566' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::map<const void*, const char*, std::less<const void*>, std::allocator<std::pair<const void* const, const char*> > >*' -->
-            <parameter type-id='type-id-1219' is-artificial='yes'/>
+            <parameter type-id='type-id-1213' is-artificial='yes'/>
             <!-- parameter of type 'struct std::_Rb_tree_iterator<std::pair<const void* const, const char*> >' -->
-            <parameter type-id='type-id-1177'/>
+            <parameter type-id='type-id-1171'/>
             <!-- void -->
             <return type-id='type-id-56'/>
           </function-decl>
@@ -31264,7 +30873,7 @@
           <!-- size_t std::map<const void*, const char*, std::less<const void*>, std::allocator<std::pair<const void* const, const char*> > >::erase(void* const&) -->
           <function-decl name='erase' mangled-name='_ZNSt3mapIPKvPKcSt4lessIS1_ESaISt4pairIKS1_S3_EEE5eraseERS7_' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_map.h' line='581' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::map<const void*, const char*, std::less<const void*>, std::allocator<std::pair<const void* const, const char*> > >*' -->
-            <parameter type-id='type-id-1219' is-artificial='yes'/>
+            <parameter type-id='type-id-1213' is-artificial='yes'/>
             <!-- parameter of type 'void* const&' -->
             <parameter type-id='type-id-149'/>
             <!-- typedef size_t -->
@@ -31275,11 +30884,11 @@
           <!-- void std::map<const void*, const char*, std::less<const void*>, std::allocator<std::pair<const void* const, const char*> > >::erase(std::_Rb_tree_iterator<std::pair<const void* const, const char*> >, std::_Rb_tree_iterator<std::pair<const void* const, const char*> >) -->
           <function-decl name='erase' mangled-name='_ZNSt3mapIPKvPKcSt4lessIS1_ESaISt4pairIKS1_S3_EEE5eraseESt17_Rb_tree_iteratorIS8_ESC_' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_map.h' line='596' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::map<const void*, const char*, std::less<const void*>, std::allocator<std::pair<const void* const, const char*> > >*' -->
-            <parameter type-id='type-id-1219' is-artificial='yes'/>
+            <parameter type-id='type-id-1213' is-artificial='yes'/>
             <!-- parameter of type 'struct std::_Rb_tree_iterator<std::pair<const void* const, const char*> >' -->
-            <parameter type-id='type-id-1177'/>
+            <parameter type-id='type-id-1171'/>
             <!-- parameter of type 'struct std::_Rb_tree_iterator<std::pair<const void* const, const char*> >' -->
-            <parameter type-id='type-id-1177'/>
+            <parameter type-id='type-id-1171'/>
             <!-- void -->
             <return type-id='type-id-56'/>
           </function-decl>
@@ -31288,9 +30897,9 @@
           <!-- void std::map<const void*, const char*, std::less<const void*>, std::allocator<std::pair<const void* const, const char*> > >::swap(std::map<const void*, const char*, std::less<const void*>, std::allocator<std::pair<const void* const, const char*> > >&) -->
           <function-decl name='swap' mangled-name='_ZNSt3mapIPKvPKcSt4lessIS1_ESaISt4pairIKS1_S3_EEE4swapERSA_' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_map.h' line='614' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::map<const void*, const char*, std::less<const void*>, std::allocator<std::pair<const void* const, const char*> > >*' -->
-            <parameter type-id='type-id-1219' is-artificial='yes'/>
+            <parameter type-id='type-id-1213' is-artificial='yes'/>
             <!-- parameter of type 'std::map<const void*, const char*, std::less<const void*>, std::allocator<std::pair<const void* const, const char*> > >&' -->
-            <parameter type-id='type-id-1218'/>
+            <parameter type-id='type-id-1212'/>
             <!-- void -->
             <return type-id='type-id-56'/>
           </function-decl>
@@ -31299,7 +30908,7 @@
           <!-- void std::map<const void*, const char*, std::less<const void*>, std::allocator<std::pair<const void* const, const char*> > >::clear() -->
           <function-decl name='clear' mangled-name='_ZNSt3mapIPKvPKcSt4lessIS1_ESaISt4pairIKS1_S3_EEE5clearEv' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_map.h' line='625' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::map<const void*, const char*, std::less<const void*>, std::allocator<std::pair<const void* const, const char*> > >*' -->
-            <parameter type-id='type-id-1219' is-artificial='yes'/>
+            <parameter type-id='type-id-1213' is-artificial='yes'/>
             <!-- void -->
             <return type-id='type-id-56'/>
           </function-decl>
@@ -31308,47 +30917,47 @@
           <!-- std::less<const void*> std::map<const void*, const char*, std::less<const void*>, std::allocator<std::pair<const void* const, const char*> > >::key_comp() -->
           <function-decl name='key_comp' mangled-name='_ZNKSt3mapIPKvPKcSt4lessIS1_ESaISt4pairIKS1_S3_EEE8key_compEv' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_map.h' line='634' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const std::map<const void*, const char*, std::less<const void*>, std::allocator<std::pair<const void* const, const char*> > >*' -->
-            <parameter type-id='type-id-1200' is-artificial='yes'/>
+            <parameter type-id='type-id-1194' is-artificial='yes'/>
             <!-- struct std::less<const void*> -->
-            <return type-id='type-id-1194'/>
+            <return type-id='type-id-1188'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <!-- std::map<const void*, const char*, std::less<const void*>, std::allocator<std::pair<const void* const, const char*> > >::value_compare std::map<const void*, const char*, std::less<const void*>, std::allocator<std::pair<const void* const, const char*> > >::value_comp() -->
           <function-decl name='value_comp' mangled-name='_ZNKSt3mapIPKvPKcSt4lessIS1_ESaISt4pairIKS1_S3_EEE10value_compEv' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_map.h' line='642' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const std::map<const void*, const char*, std::less<const void*>, std::allocator<std::pair<const void* const, const char*> > >*' -->
-            <parameter type-id='type-id-1200' is-artificial='yes'/>
+            <parameter type-id='type-id-1194' is-artificial='yes'/>
             <!-- class std::map<const void*, const char*, std::less<const void*>, std::allocator<std::pair<const void* const, const char*> > >::value_compare -->
-            <return type-id='type-id-1230'/>
+            <return type-id='type-id-1224'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <!-- std::_Rb_tree_iterator<std::pair<const void* const, const char*> > std::map<const void*, const char*, std::less<const void*>, std::allocator<std::pair<const void* const, const char*> > >::find(void* const&) -->
           <function-decl name='find' mangled-name='_ZNSt3mapIPKvPKcSt4lessIS1_ESaISt4pairIKS1_S3_EEE4findERS7_' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_map.h' line='658' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::map<const void*, const char*, std::less<const void*>, std::allocator<std::pair<const void* const, const char*> > >*' -->
-            <parameter type-id='type-id-1219' is-artificial='yes'/>
+            <parameter type-id='type-id-1213' is-artificial='yes'/>
             <!-- parameter of type 'void* const&' -->
             <parameter type-id='type-id-149'/>
             <!-- struct std::_Rb_tree_iterator<std::pair<const void* const, const char*> > -->
-            <return type-id='type-id-1177'/>
+            <return type-id='type-id-1171'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <!-- std::_Rb_tree_const_iterator<std::pair<const void* const, const char*> > std::map<const void*, const char*, std::less<const void*>, std::allocator<std::pair<const void* const, const char*> > >::find(void* const&) -->
           <function-decl name='find' mangled-name='_ZNKSt3mapIPKvPKcSt4lessIS1_ESaISt4pairIKS1_S3_EEE4findERS7_' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_map.h' line='673' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const std::map<const void*, const char*, std::less<const void*>, std::allocator<std::pair<const void* const, const char*> > >*' -->
-            <parameter type-id='type-id-1200' is-artificial='yes'/>
+            <parameter type-id='type-id-1194' is-artificial='yes'/>
             <!-- parameter of type 'void* const&' -->
             <parameter type-id='type-id-149'/>
             <!-- struct std::_Rb_tree_const_iterator<std::pair<const void* const, const char*> > -->
-            <return type-id='type-id-1173'/>
+            <return type-id='type-id-1167'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <!-- size_t std::map<const void*, const char*, std::less<const void*>, std::allocator<std::pair<const void* const, const char*> > >::count(void* const&) -->
           <function-decl name='count' mangled-name='_ZNKSt3mapIPKvPKcSt4lessIS1_ESaISt4pairIKS1_S3_EEE5countERS7_' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_map.h' line='685' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const std::map<const void*, const char*, std::less<const void*>, std::allocator<std::pair<const void* const, const char*> > >*' -->
-            <parameter type-id='type-id-1200' is-artificial='yes'/>
+            <parameter type-id='type-id-1194' is-artificial='yes'/>
             <!-- parameter of type 'void* const&' -->
             <parameter type-id='type-id-149'/>
             <!-- typedef size_t -->
@@ -31359,66 +30968,66 @@
           <!-- std::_Rb_tree_iterator<std::pair<const void* const, const char*> > std::map<const void*, const char*, std::less<const void*>, std::allocator<std::pair<const void* const, const char*> > >::lower_bound(void* const&) -->
           <function-decl name='lower_bound' mangled-name='_ZNSt3mapIPKvPKcSt4lessIS1_ESaISt4pairIKS1_S3_EEE11lower_boundERS7_' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_map.h' line='700' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::map<const void*, const char*, std::less<const void*>, std::allocator<std::pair<const void* const, const char*> > >*' -->
-            <parameter type-id='type-id-1219' is-artificial='yes'/>
+            <parameter type-id='type-id-1213' is-artificial='yes'/>
             <!-- parameter of type 'void* const&' -->
             <parameter type-id='type-id-149'/>
             <!-- struct std::_Rb_tree_iterator<std::pair<const void* const, const char*> > -->
-            <return type-id='type-id-1177'/>
+            <return type-id='type-id-1171'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <!-- std::_Rb_tree_const_iterator<std::pair<const void* const, const char*> > std::map<const void*, const char*, std::less<const void*>, std::allocator<std::pair<const void* const, const char*> > >::lower_bound(void* const&) -->
           <function-decl name='lower_bound' mangled-name='_ZNKSt3mapIPKvPKcSt4lessIS1_ESaISt4pairIKS1_S3_EEE11lower_boundERS7_' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_map.h' line='715' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const std::map<const void*, const char*, std::less<const void*>, std::allocator<std::pair<const void* const, const char*> > >*' -->
-            <parameter type-id='type-id-1200' is-artificial='yes'/>
+            <parameter type-id='type-id-1194' is-artificial='yes'/>
             <!-- parameter of type 'void* const&' -->
             <parameter type-id='type-id-149'/>
             <!-- struct std::_Rb_tree_const_iterator<std::pair<const void* const, const char*> > -->
-            <return type-id='type-id-1173'/>
+            <return type-id='type-id-1167'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <!-- std::_Rb_tree_iterator<std::pair<const void* const, const char*> > std::map<const void*, const char*, std::less<const void*>, std::allocator<std::pair<const void* const, const char*> > >::upper_bound(void* const&) -->
           <function-decl name='upper_bound' mangled-name='_ZNSt3mapIPKvPKcSt4lessIS1_ESaISt4pairIKS1_S3_EEE11upper_boundERS7_' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_map.h' line='725' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::map<const void*, const char*, std::less<const void*>, std::allocator<std::pair<const void* const, const char*> > >*' -->
-            <parameter type-id='type-id-1219' is-artificial='yes'/>
+            <parameter type-id='type-id-1213' is-artificial='yes'/>
             <!-- parameter of type 'void* const&' -->
             <parameter type-id='type-id-149'/>
             <!-- struct std::_Rb_tree_iterator<std::pair<const void* const, const char*> > -->
-            <return type-id='type-id-1177'/>
+            <return type-id='type-id-1171'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <!-- std::_Rb_tree_const_iterator<std::pair<const void* const, const char*> > std::map<const void*, const char*, std::less<const void*>, std::allocator<std::pair<const void* const, const char*> > >::upper_bound(void* const&) -->
           <function-decl name='upper_bound' mangled-name='_ZNKSt3mapIPKvPKcSt4lessIS1_ESaISt4pairIKS1_S3_EEE11upper_boundERS7_' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_map.h' line='735' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const std::map<const void*, const char*, std::less<const void*>, std::allocator<std::pair<const void* const, const char*> > >*' -->
-            <parameter type-id='type-id-1200' is-artificial='yes'/>
+            <parameter type-id='type-id-1194' is-artificial='yes'/>
             <!-- parameter of type 'void* const&' -->
             <parameter type-id='type-id-149'/>
             <!-- struct std::_Rb_tree_const_iterator<std::pair<const void* const, const char*> > -->
-            <return type-id='type-id-1173'/>
+            <return type-id='type-id-1167'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <!-- std::pair<std::_Rb_tree_iterator<std::pair<const void* const, const char*> >, std::_Rb_tree_iterator<std::pair<const void* const, const char*> > > std::map<const void*, const char*, std::less<const void*>, std::allocator<std::pair<const void* const, const char*> > >::equal_range(void* const&) -->
           <function-decl name='equal_range' mangled-name='_ZNSt3mapIPKvPKcSt4lessIS1_ESaISt4pairIKS1_S3_EEE11equal_rangeERS7_' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_map.h' line='754' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::map<const void*, const char*, std::less<const void*>, std::allocator<std::pair<const void* const, const char*> > >*' -->
-            <parameter type-id='type-id-1219' is-artificial='yes'/>
+            <parameter type-id='type-id-1213' is-artificial='yes'/>
             <!-- parameter of type 'void* const&' -->
             <parameter type-id='type-id-149'/>
             <!-- struct std::pair<std::_Rb_tree_iterator<std::pair<const void* const, const char*> >, std::_Rb_tree_iterator<std::pair<const void* const, const char*> > > -->
-            <return type-id='type-id-1226'/>
+            <return type-id='type-id-1220'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <!-- std::pair<std::_Rb_tree_const_iterator<std::pair<const void* const, const char*> >, std::_Rb_tree_const_iterator<std::pair<const void* const, const char*> > > std::map<const void*, const char*, std::less<const void*>, std::allocator<std::pair<const void* const, const char*> > >::equal_range(void* const&) -->
           <function-decl name='equal_range' mangled-name='_ZNKSt3mapIPKvPKcSt4lessIS1_ESaISt4pairIKS1_S3_EEE11equal_rangeERS7_' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_map.h' line='773' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const std::map<const void*, const char*, std::less<const void*>, std::allocator<std::pair<const void* const, const char*> > >*' -->
-            <parameter type-id='type-id-1200' is-artificial='yes'/>
+            <parameter type-id='type-id-1194' is-artificial='yes'/>
             <!-- parameter of type 'void* const&' -->
             <parameter type-id='type-id-149'/>
             <!-- struct std::pair<std::_Rb_tree_const_iterator<std::pair<const void* const, const char*> >, std::_Rb_tree_const_iterator<std::pair<const void* const, const char*> > > -->
-            <return type-id='type-id-1227'/>
+            <return type-id='type-id-1221'/>
           </function-decl>
         </member-function>
       </class-decl>
@@ -31426,12 +31035,12 @@
     <!-- namespace __gnu_cxx -->
     <namespace-decl name='__gnu_cxx'>
       <!-- class __gnu_cxx::new_allocator<std::_Rb_tree_node<std::pair<const void* const, const char*> > > -->
-      <class-decl name='new_allocator&lt;std::_Rb_tree_node&lt;std::pair&lt;const void* const, const char*&gt; &gt; &gt;' size-in-bits='8' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/ext/new_allocator.h' line='52' column='1' id='type-id-1158'>
+      <class-decl name='new_allocator&lt;std::_Rb_tree_node&lt;std::pair&lt;const void* const, const char*&gt; &gt; &gt;' size-in-bits='8' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/ext/new_allocator.h' line='52' column='1' id='type-id-1152'>
         <member-function access='private'>
           <!-- void __gnu_cxx::new_allocator<std::_Rb_tree_node<std::pair<const void* const, const char*> > >::new_allocator() -->
           <function-decl name='new_allocator' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/ext/new_allocator.h' line='66' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type '__gnu_cxx::new_allocator<std::_Rb_tree_node<std::pair<const void* const, const char*> > >*' -->
-            <parameter type-id='type-id-1159' is-artificial='yes'/>
+            <parameter type-id='type-id-1153' is-artificial='yes'/>
             <!-- void -->
             <return type-id='type-id-56'/>
           </function-decl>
@@ -31440,9 +31049,9 @@
           <!-- void __gnu_cxx::new_allocator<std::_Rb_tree_node<std::pair<const void* const, const char*> > >::new_allocator(const __gnu_cxx::new_allocator<std::_Rb_tree_node<std::pair<const void* const, const char*> > >&) -->
           <function-decl name='new_allocator' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/ext/new_allocator.h' line='68' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type '__gnu_cxx::new_allocator<std::_Rb_tree_node<std::pair<const void* const, const char*> > >*' -->
-            <parameter type-id='type-id-1159' is-artificial='yes'/>
+            <parameter type-id='type-id-1153' is-artificial='yes'/>
             <!-- parameter of type 'const __gnu_cxx::new_allocator<std::_Rb_tree_node<std::pair<const void* const, const char*> > >&' -->
-            <parameter type-id='type-id-1163'/>
+            <parameter type-id='type-id-1157'/>
             <!-- void -->
             <return type-id='type-id-56'/>
           </function-decl>
@@ -31451,7 +31060,7 @@
           <!-- __gnu_cxx::new_allocator<std::_Rb_tree_node<std::pair<const void* const, const char*> > >::~new_allocator(int) -->
           <function-decl name='~new_allocator' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/ext/new_allocator.h' line='73' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type '__gnu_cxx::new_allocator<std::_Rb_tree_node<std::pair<const void* const, const char*> > >*' -->
-            <parameter type-id='type-id-1159' is-artificial='yes'/>
+            <parameter type-id='type-id-1153' is-artificial='yes'/>
             <!-- artificial parameter of type 'int' -->
             <parameter type-id='type-id-1' is-artificial='yes'/>
             <!-- void -->
@@ -31462,44 +31071,44 @@
           <!-- std::_Rb_tree_node<std::pair<const void* const, const char*> >* __gnu_cxx::new_allocator<std::_Rb_tree_node<std::pair<const void* const, const char*> > >::address(std::_Rb_tree_node<std::pair<const void* const, const char*> >&) -->
           <function-decl name='address' mangled-name='_ZNK9__gnu_cxx13new_allocatorISt13_Rb_tree_nodeISt4pairIKPKvPKcEEE7addressERS9_' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/ext/new_allocator.h' line='76' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const __gnu_cxx::new_allocator<std::_Rb_tree_node<std::pair<const void* const, const char*> > >*' -->
-            <parameter type-id='type-id-1164' is-artificial='yes'/>
+            <parameter type-id='type-id-1158' is-artificial='yes'/>
             <!-- parameter of type 'std::_Rb_tree_node<std::pair<const void* const, const char*> >&' -->
-            <parameter type-id='type-id-1213'/>
+            <parameter type-id='type-id-1207'/>
             <!-- std::_Rb_tree_node<std::pair<const void* const, const char*> >* -->
-            <return type-id='type-id-1214'/>
+            <return type-id='type-id-1208'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <!-- const std::_Rb_tree_node<std::pair<const void* const, const char*> >* __gnu_cxx::new_allocator<std::_Rb_tree_node<std::pair<const void* const, const char*> > >::address(const std::_Rb_tree_node<std::pair<const void* const, const char*> >&) -->
           <function-decl name='address' mangled-name='_ZNK9__gnu_cxx13new_allocatorISt13_Rb_tree_nodeISt4pairIKPKvPKcEEE7addressERKS9_' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/ext/new_allocator.h' line='79' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const __gnu_cxx::new_allocator<std::_Rb_tree_node<std::pair<const void* const, const char*> > >*' -->
-            <parameter type-id='type-id-1164' is-artificial='yes'/>
+            <parameter type-id='type-id-1158' is-artificial='yes'/>
             <!-- parameter of type 'const std::_Rb_tree_node<std::pair<const void* const, const char*> >&' -->
-            <parameter type-id='type-id-1183'/>
+            <parameter type-id='type-id-1177'/>
             <!-- const std::_Rb_tree_node<std::pair<const void* const, const char*> >* -->
-            <return type-id='type-id-1184'/>
+            <return type-id='type-id-1178'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <!-- std::_Rb_tree_node<std::pair<const void* const, const char*> >* __gnu_cxx::new_allocator<std::_Rb_tree_node<std::pair<const void* const, const char*> > >::allocate(unsigned long int, void*) -->
           <function-decl name='allocate' mangled-name='_ZN9__gnu_cxx13new_allocatorISt13_Rb_tree_nodeISt4pairIKPKvPKcEEE8allocateEmS4_' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/ext/new_allocator.h' line='84' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type '__gnu_cxx::new_allocator<std::_Rb_tree_node<std::pair<const void* const, const char*> > >*' -->
-            <parameter type-id='type-id-1159' is-artificial='yes'/>
+            <parameter type-id='type-id-1153' is-artificial='yes'/>
             <!-- parameter of type 'unsigned long int' -->
             <parameter type-id='type-id-5'/>
             <!-- parameter of type 'void*' -->
             <parameter type-id='type-id-53'/>
             <!-- std::_Rb_tree_node<std::pair<const void* const, const char*> >* -->
-            <return type-id='type-id-1214'/>
+            <return type-id='type-id-1208'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <!-- void __gnu_cxx::new_allocator<std::_Rb_tree_node<std::pair<const void* const, const char*> > >::deallocate(std::_Rb_tree_node<std::pair<const void* const, const char*> >*, unsigned long int) -->
           <function-decl name='deallocate' mangled-name='_ZN9__gnu_cxx13new_allocatorISt13_Rb_tree_nodeISt4pairIKPKvPKcEEE10deallocateEPS9_m' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/ext/new_allocator.h' line='94' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type '__gnu_cxx::new_allocator<std::_Rb_tree_node<std::pair<const void* const, const char*> > >*' -->
-            <parameter type-id='type-id-1159' is-artificial='yes'/>
+            <parameter type-id='type-id-1153' is-artificial='yes'/>
             <!-- parameter of type 'std::_Rb_tree_node<std::pair<const void* const, const char*> >*' -->
-            <parameter type-id='type-id-1214'/>
+            <parameter type-id='type-id-1208'/>
             <!-- parameter of type 'unsigned long int' -->
             <parameter type-id='type-id-5'/>
             <!-- void -->
@@ -31510,7 +31119,7 @@
           <!-- size_t __gnu_cxx::new_allocator<std::_Rb_tree_node<std::pair<const void* const, const char*> > >::max_size() -->
           <function-decl name='max_size' mangled-name='_ZNK9__gnu_cxx13new_allocatorISt13_Rb_tree_nodeISt4pairIKPKvPKcEEE8max_sizeEv' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/ext/new_allocator.h' line='98' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const __gnu_cxx::new_allocator<std::_Rb_tree_node<std::pair<const void* const, const char*> > >*' -->
-            <parameter type-id='type-id-1164' is-artificial='yes'/>
+            <parameter type-id='type-id-1158' is-artificial='yes'/>
             <!-- typedef size_t -->
             <return type-id='type-id-57'/>
           </function-decl>
@@ -31519,11 +31128,11 @@
           <!-- void __gnu_cxx::new_allocator<std::_Rb_tree_node<std::pair<const void* const, const char*> > >::construct(std::_Rb_tree_node<std::pair<const void* const, const char*> >*, const std::_Rb_tree_node<std::pair<const void* const, const char*> >&) -->
           <function-decl name='construct' mangled-name='_ZN9__gnu_cxx13new_allocatorISt13_Rb_tree_nodeISt4pairIKPKvPKcEEE9constructEPS9_RKS9_' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/ext/new_allocator.h' line='104' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type '__gnu_cxx::new_allocator<std::_Rb_tree_node<std::pair<const void* const, const char*> > >*' -->
-            <parameter type-id='type-id-1159' is-artificial='yes'/>
+            <parameter type-id='type-id-1153' is-artificial='yes'/>
             <!-- parameter of type 'std::_Rb_tree_node<std::pair<const void* const, const char*> >*' -->
-            <parameter type-id='type-id-1214'/>
+            <parameter type-id='type-id-1208'/>
             <!-- parameter of type 'const std::_Rb_tree_node<std::pair<const void* const, const char*> >&' -->
-            <parameter type-id='type-id-1183'/>
+            <parameter type-id='type-id-1177'/>
             <!-- void -->
             <return type-id='type-id-56'/>
           </function-decl>
@@ -31532,21 +31141,21 @@
           <!-- void __gnu_cxx::new_allocator<std::_Rb_tree_node<std::pair<const void* const, const char*> > >::destroy(std::_Rb_tree_node<std::pair<const void* const, const char*> >*) -->
           <function-decl name='destroy' mangled-name='_ZN9__gnu_cxx13new_allocatorISt13_Rb_tree_nodeISt4pairIKPKvPKcEEE7destroyEPS9_' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/ext/new_allocator.h' line='115' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type '__gnu_cxx::new_allocator<std::_Rb_tree_node<std::pair<const void* const, const char*> > >*' -->
-            <parameter type-id='type-id-1159' is-artificial='yes'/>
+            <parameter type-id='type-id-1153' is-artificial='yes'/>
             <!-- parameter of type 'std::_Rb_tree_node<std::pair<const void* const, const char*> >*' -->
-            <parameter type-id='type-id-1214'/>
+            <parameter type-id='type-id-1208'/>
             <!-- void -->
             <return type-id='type-id-56'/>
           </function-decl>
         </member-function>
       </class-decl>
       <!-- class __gnu_cxx::new_allocator<std::pair<const void* const, const char*> > -->
-      <class-decl name='new_allocator&lt;std::pair&lt;const void* const, const char*&gt; &gt;' size-in-bits='8' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/ext/new_allocator.h' line='52' column='1' id='type-id-1160'>
+      <class-decl name='new_allocator&lt;std::pair&lt;const void* const, const char*&gt; &gt;' size-in-bits='8' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/ext/new_allocator.h' line='52' column='1' id='type-id-1154'>
         <member-function access='private'>
           <!-- void __gnu_cxx::new_allocator<std::pair<const void* const, const char*> >::new_allocator() -->
           <function-decl name='new_allocator' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/ext/new_allocator.h' line='66' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type '__gnu_cxx::new_allocator<std::pair<const void* const, const char*> >*' -->
-            <parameter type-id='type-id-1161' is-artificial='yes'/>
+            <parameter type-id='type-id-1155' is-artificial='yes'/>
             <!-- void -->
             <return type-id='type-id-56'/>
           </function-decl>
@@ -31555,9 +31164,9 @@
           <!-- void __gnu_cxx::new_allocator<std::pair<const void* const, const char*> >::new_allocator(const __gnu_cxx::new_allocator<std::pair<const void* const, const char*> >&) -->
           <function-decl name='new_allocator' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/ext/new_allocator.h' line='68' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type '__gnu_cxx::new_allocator<std::pair<const void* const, const char*> >*' -->
-            <parameter type-id='type-id-1161' is-artificial='yes'/>
+            <parameter type-id='type-id-1155' is-artificial='yes'/>
             <!-- parameter of type 'const __gnu_cxx::new_allocator<std::pair<const void* const, const char*> >&' -->
-            <parameter type-id='type-id-1166'/>
+            <parameter type-id='type-id-1160'/>
             <!-- void -->
             <return type-id='type-id-56'/>
           </function-decl>
@@ -31566,7 +31175,7 @@
           <!-- __gnu_cxx::new_allocator<std::pair<const void* const, const char*> >::~new_allocator(int) -->
           <function-decl name='~new_allocator' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/ext/new_allocator.h' line='73' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type '__gnu_cxx::new_allocator<std::pair<const void* const, const char*> >*' -->
-            <parameter type-id='type-id-1161' is-artificial='yes'/>
+            <parameter type-id='type-id-1155' is-artificial='yes'/>
             <!-- artificial parameter of type 'int' -->
             <parameter type-id='type-id-1' is-artificial='yes'/>
             <!-- void -->
@@ -31577,44 +31186,44 @@
           <!-- std::pair<const void* const, const char*>* __gnu_cxx::new_allocator<std::pair<const void* const, const char*> >::address(std::pair<const void* const, const char*>&) -->
           <function-decl name='address' mangled-name='_ZNK9__gnu_cxx13new_allocatorISt4pairIKPKvPKcEE7addressERS7_' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/ext/new_allocator.h' line='76' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const __gnu_cxx::new_allocator<std::pair<const void* const, const char*> >*' -->
-            <parameter type-id='type-id-1167' is-artificial='yes'/>
+            <parameter type-id='type-id-1161' is-artificial='yes'/>
             <!-- parameter of type 'std::pair<const void* const, const char*>&' -->
-            <parameter type-id='type-id-1220'/>
+            <parameter type-id='type-id-1214'/>
             <!-- std::pair<const void* const, const char*>* -->
-            <return type-id='type-id-1221'/>
+            <return type-id='type-id-1215'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <!-- const std::pair<const void* const, const char*>* __gnu_cxx::new_allocator<std::pair<const void* const, const char*> >::address(const std::pair<const void* const, const char*>&) -->
           <function-decl name='address' mangled-name='_ZNK9__gnu_cxx13new_allocatorISt4pairIKPKvPKcEE7addressERKS7_' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/ext/new_allocator.h' line='79' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const __gnu_cxx::new_allocator<std::pair<const void* const, const char*> >*' -->
-            <parameter type-id='type-id-1167' is-artificial='yes'/>
+            <parameter type-id='type-id-1161' is-artificial='yes'/>
             <!-- parameter of type 'const std::pair<const void* const, const char*>&' -->
-            <parameter type-id='type-id-1203'/>
+            <parameter type-id='type-id-1197'/>
             <!-- const std::pair<const void* const, const char*>* -->
-            <return type-id='type-id-1204'/>
+            <return type-id='type-id-1198'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <!-- std::pair<const void* const, const char*>* __gnu_cxx::new_allocator<std::pair<const void* const, const char*> >::allocate(unsigned long int, void*) -->
           <function-decl name='allocate' mangled-name='_ZN9__gnu_cxx13new_allocatorISt4pairIKPKvPKcEE8allocateEmS3_' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/ext/new_allocator.h' line='84' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type '__gnu_cxx::new_allocator<std::pair<const void* const, const char*> >*' -->
-            <parameter type-id='type-id-1161' is-artificial='yes'/>
+            <parameter type-id='type-id-1155' is-artificial='yes'/>
             <!-- parameter of type 'unsigned long int' -->
             <parameter type-id='type-id-5'/>
             <!-- parameter of type 'void*' -->
             <parameter type-id='type-id-53'/>
             <!-- std::pair<const void* const, const char*>* -->
-            <return type-id='type-id-1221'/>
+            <return type-id='type-id-1215'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <!-- void __gnu_cxx::new_allocator<std::pair<const void* const, const char*> >::deallocate(std::pair<const void* const, const char*>*, unsigned long int) -->
           <function-decl name='deallocate' mangled-name='_ZN9__gnu_cxx13new_allocatorISt4pairIKPKvPKcEE10deallocateEPS7_m' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/ext/new_allocator.h' line='94' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type '__gnu_cxx::new_allocator<std::pair<const void* const, const char*> >*' -->
-            <parameter type-id='type-id-1161' is-artificial='yes'/>
+            <parameter type-id='type-id-1155' is-artificial='yes'/>
             <!-- parameter of type 'std::pair<const void* const, const char*>*' -->
-            <parameter type-id='type-id-1221'/>
+            <parameter type-id='type-id-1215'/>
             <!-- parameter of type 'unsigned long int' -->
             <parameter type-id='type-id-5'/>
             <!-- void -->
@@ -31625,7 +31234,7 @@
           <!-- size_t __gnu_cxx::new_allocator<std::pair<const void* const, const char*> >::max_size() -->
           <function-decl name='max_size' mangled-name='_ZNK9__gnu_cxx13new_allocatorISt4pairIKPKvPKcEE8max_sizeEv' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/ext/new_allocator.h' line='98' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const __gnu_cxx::new_allocator<std::pair<const void* const, const char*> >*' -->
-            <parameter type-id='type-id-1167' is-artificial='yes'/>
+            <parameter type-id='type-id-1161' is-artificial='yes'/>
             <!-- typedef size_t -->
             <return type-id='type-id-57'/>
           </function-decl>
@@ -31634,11 +31243,11 @@
           <!-- void __gnu_cxx::new_allocator<std::pair<const void* const, const char*> >::construct(std::pair<const void* const, const char*>*, const std::pair<const void* const, const char*>&) -->
           <function-decl name='construct' mangled-name='_ZN9__gnu_cxx13new_allocatorISt4pairIKPKvPKcEE9constructEPS7_RKS7_' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/ext/new_allocator.h' line='104' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type '__gnu_cxx::new_allocator<std::pair<const void* const, const char*> >*' -->
-            <parameter type-id='type-id-1161' is-artificial='yes'/>
+            <parameter type-id='type-id-1155' is-artificial='yes'/>
             <!-- parameter of type 'std::pair<const void* const, const char*>*' -->
-            <parameter type-id='type-id-1221'/>
+            <parameter type-id='type-id-1215'/>
             <!-- parameter of type 'const std::pair<const void* const, const char*>&' -->
-            <parameter type-id='type-id-1203'/>
+            <parameter type-id='type-id-1197'/>
             <!-- void -->
             <return type-id='type-id-56'/>
           </function-decl>
@@ -31647,9 +31256,9 @@
           <!-- void __gnu_cxx::new_allocator<std::pair<const void* const, const char*> >::destroy(std::pair<const void* const, const char*>*) -->
           <function-decl name='destroy' mangled-name='_ZN9__gnu_cxx13new_allocatorISt4pairIKPKvPKcEE7destroyEPS7_' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/ext/new_allocator.h' line='115' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type '__gnu_cxx::new_allocator<std::pair<const void* const, const char*> >*' -->
-            <parameter type-id='type-id-1161' is-artificial='yes'/>
+            <parameter type-id='type-id-1155' is-artificial='yes'/>
             <!-- parameter of type 'std::pair<const void* const, const char*>*' -->
-            <parameter type-id='type-id-1221'/>
+            <parameter type-id='type-id-1215'/>
             <!-- void -->
             <return type-id='type-id-56'/>
           </function-decl>
@@ -31676,29 +31285,29 @@
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='src/system-alloc.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-kFgaKP/gperftools-2.4' language='LANG_C_plus_plus'>
     <!-- SysAllocator*[2] -->
-    <array-type-def dimensions='1' type-id='type-id-902' size-in-bits='128' id='type-id-1231'>
+    <array-type-def dimensions='1' type-id='type-id-952' size-in-bits='128' id='type-id-1225'>
       <!-- <anonymous range>[2] -->
-      <subrange length='2' type-id='type-id-5' id='type-id-1232'/>
+      <subrange length='2' type-id='type-id-5' id='type-id-1226'/>
     </array-type-def>
     <!-- bool[2] -->
-    <array-type-def dimensions='1' type-id='type-id-55' size-in-bits='16' id='type-id-1233'>
+    <array-type-def dimensions='1' type-id='type-id-55' size-in-bits='16' id='type-id-1227'>
       <!-- <anonymous range>[2] -->
-      <subrange length='2' type-id='type-id-5' id='type-id-1232'/>
+      <subrange length='2' type-id='type-id-5' id='type-id-1226'/>
     </array-type-def>
     <!-- const char*[2] -->
-    <array-type-def dimensions='1' type-id='type-id-52' size-in-bits='128' id='type-id-1234'>
+    <array-type-def dimensions='1' type-id='type-id-52' size-in-bits='128' id='type-id-1228'>
       <!-- <anonymous range>[2] -->
-      <subrange length='2' type-id='type-id-5' id='type-id-1232'/>
+      <subrange length='2' type-id='type-id-5' id='type-id-1226'/>
     </array-type-def>
     <!-- class MmapSysAllocator -->
-    <class-decl name='MmapSysAllocator' size-in-bits='64' visibility='default' filepath='src/system-alloc.cc' line='158' column='1' id='type-id-1235'>
+    <class-decl name='MmapSysAllocator' size-in-bits='64' visibility='default' filepath='src/system-alloc.cc' line='158' column='1' id='type-id-1229'>
       <!-- class SysAllocator -->
-      <base-class access='public' layout-offset-in-bits='0' type-id='type-id-958'/>
+      <base-class access='public' layout-offset-in-bits='0' type-id='type-id-951'/>
       <member-function access='private' constructor='yes'>
         <!-- MmapSysAllocator::MmapSysAllocator() -->
         <function-decl name='MmapSysAllocator' filepath='src/system-alloc.cc' line='160' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'MmapSysAllocator*' -->
-          <parameter type-id='type-id-1236' is-artificial='yes'/>
+          <parameter type-id='type-id-1230' is-artificial='yes'/>
           <!-- void -->
           <return type-id='type-id-56'/>
         </function-decl>
@@ -31707,7 +31316,7 @@
         <!-- void* MmapSysAllocator::Alloc(size_t, size_t*, size_t) -->
         <function-decl name='Alloc' mangled-name='_ZN16MmapSysAllocator5AllocEmPmm' filepath='src/system-alloc.cc' line='274' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN16MmapSysAllocator5AllocEmPmm'>
           <!-- implicit parameter of type 'MmapSysAllocator*' -->
-          <parameter type-id='type-id-1236' is-artificial='yes'/>
+          <parameter type-id='type-id-1230' is-artificial='yes'/>
           <!-- parameter of type 'typedef size_t' -->
           <parameter type-id='type-id-57'/>
           <!-- parameter of type 'size_t*' -->
@@ -31720,14 +31329,14 @@
       </member-function>
     </class-decl>
     <!-- class SbrkSysAllocator -->
-    <class-decl name='SbrkSysAllocator' size-in-bits='64' visibility='default' filepath='src/system-alloc.cc' line='150' column='1' id='type-id-1237'>
+    <class-decl name='SbrkSysAllocator' size-in-bits='64' visibility='default' filepath='src/system-alloc.cc' line='150' column='1' id='type-id-1231'>
       <!-- class SysAllocator -->
-      <base-class access='public' layout-offset-in-bits='0' type-id='type-id-958'/>
+      <base-class access='public' layout-offset-in-bits='0' type-id='type-id-951'/>
       <member-function access='private' constructor='yes'>
         <!-- SbrkSysAllocator::SbrkSysAllocator() -->
         <function-decl name='SbrkSysAllocator' filepath='src/system-alloc.cc' line='152' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'SbrkSysAllocator*' -->
-          <parameter type-id='type-id-1238' is-artificial='yes'/>
+          <parameter type-id='type-id-1232' is-artificial='yes'/>
           <!-- void -->
           <return type-id='type-id-56'/>
         </function-decl>
@@ -31736,7 +31345,7 @@
         <!-- void* SbrkSysAllocator::Alloc(size_t, size_t*, size_t) -->
         <function-decl name='Alloc' mangled-name='_ZN16SbrkSysAllocator5AllocEmPmm' filepath='src/system-alloc.cc' line='203' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN16SbrkSysAllocator5AllocEmPmm'>
           <!-- implicit parameter of type 'SbrkSysAllocator*' -->
-          <parameter type-id='type-id-1238' is-artificial='yes'/>
+          <parameter type-id='type-id-1232' is-artificial='yes'/>
           <!-- parameter of type 'typedef size_t' -->
           <parameter type-id='type-id-57'/>
           <!-- parameter of type 'size_t*' -->
@@ -31749,30 +31358,30 @@
       </member-function>
     </class-decl>
     <!-- class DefaultSysAllocator -->
-    <class-decl name='DefaultSysAllocator' size-in-bits='384' visibility='default' filepath='src/system-alloc.cc' line='173' column='1' id='type-id-1239'>
+    <class-decl name='DefaultSysAllocator' size-in-bits='384' visibility='default' filepath='src/system-alloc.cc' line='173' column='1' id='type-id-1233'>
       <!-- class SysAllocator -->
-      <base-class access='public' layout-offset-in-bits='0' type-id='type-id-958'/>
+      <base-class access='public' layout-offset-in-bits='0' type-id='type-id-951'/>
       <data-member access='private' static='yes'>
         <!-- static const int DefaultSysAllocator::kMaxAllocators -->
         <var-decl name='kMaxAllocators' type-id='type-id-112' visibility='default' filepath='src/system-alloc.cc' line='193' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='64'>
         <!-- bool DefaultSysAllocator::failed_[2] -->
-        <var-decl name='failed_' type-id='type-id-1233' visibility='default' filepath='src/system-alloc.cc' line='194' column='1'/>
+        <var-decl name='failed_' type-id='type-id-1227' visibility='default' filepath='src/system-alloc.cc' line='194' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='128'>
         <!-- SysAllocator* DefaultSysAllocator::allocs_[2] -->
-        <var-decl name='allocs_' type-id='type-id-1231' visibility='default' filepath='src/system-alloc.cc' line='195' column='1'/>
+        <var-decl name='allocs_' type-id='type-id-1225' visibility='default' filepath='src/system-alloc.cc' line='195' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='256'>
         <!-- const char* DefaultSysAllocator::names_[2] -->
-        <var-decl name='names_' type-id='type-id-1234' visibility='default' filepath='src/system-alloc.cc' line='196' column='1'/>
+        <var-decl name='names_' type-id='type-id-1228' visibility='default' filepath='src/system-alloc.cc' line='196' column='1'/>
       </data-member>
       <member-function access='private' constructor='yes'>
         <!-- DefaultSysAllocator::DefaultSysAllocator() -->
         <function-decl name='DefaultSysAllocator' filepath='src/system-alloc.cc' line='175' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'DefaultSysAllocator*' -->
-          <parameter type-id='type-id-1240' is-artificial='yes'/>
+          <parameter type-id='type-id-1234' is-artificial='yes'/>
           <!-- void -->
           <return type-id='type-id-56'/>
         </function-decl>
@@ -31781,11 +31390,11 @@
         <!-- void DefaultSysAllocator::SetChildAllocator(SysAllocator*, unsigned int, const char*) -->
         <function-decl name='SetChildAllocator' mangled-name='_ZN19DefaultSysAllocator17SetChildAllocatorEP12SysAllocatorjPKc' filepath='src/system-alloc.cc' line='182' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'DefaultSysAllocator*' -->
-          <parameter type-id='type-id-1240' is-artificial='yes'/>
+          <parameter type-id='type-id-1234' is-artificial='yes'/>
           <!-- parameter of type 'SysAllocator*' -->
-          <parameter type-id='type-id-902'/>
+          <parameter type-id='type-id-952'/>
           <!-- parameter of type 'unsigned int' -->
-          <parameter type-id='type-id-1123'/>
+          <parameter type-id='type-id-1117'/>
           <!-- parameter of type 'const char*' -->
           <parameter type-id='type-id-52'/>
           <!-- void -->
@@ -31796,7 +31405,7 @@
         <!-- void* DefaultSysAllocator::Alloc(size_t, size_t*, size_t) -->
         <function-decl name='Alloc' mangled-name='_ZN19DefaultSysAllocator5AllocEmPmm' filepath='src/system-alloc.cc' line='431' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN19DefaultSysAllocator5AllocEmPmm'>
           <!-- implicit parameter of type 'DefaultSysAllocator*' -->
-          <parameter type-id='type-id-1240' is-artificial='yes'/>
+          <parameter type-id='type-id-1234' is-artificial='yes'/>
           <!-- parameter of type 'typedef size_t' -->
           <parameter type-id='type-id-57'/>
           <!-- parameter of type 'size_t*' -->
@@ -31809,14 +31418,14 @@
       </member-function>
     </class-decl>
     <!-- class DevMemSysAllocator -->
-    <class-decl name='DevMemSysAllocator' size-in-bits='64' visibility='default' filepath='src/system-alloc.cc' line='166' column='1' id='type-id-1241'>
+    <class-decl name='DevMemSysAllocator' size-in-bits='64' visibility='default' filepath='src/system-alloc.cc' line='166' column='1' id='type-id-1235'>
       <!-- class SysAllocator -->
-      <base-class access='public' layout-offset-in-bits='0' type-id='type-id-958'/>
+      <base-class access='public' layout-offset-in-bits='0' type-id='type-id-951'/>
       <member-function access='private' constructor='yes'>
         <!-- DevMemSysAllocator::DevMemSysAllocator() -->
         <function-decl name='DevMemSysAllocator' filepath='src/system-alloc.cc' line='168' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'DevMemSysAllocator*' -->
-          <parameter type-id='type-id-1242' is-artificial='yes'/>
+          <parameter type-id='type-id-1236' is-artificial='yes'/>
           <!-- void -->
           <return type-id='type-id-56'/>
         </function-decl>
@@ -31825,7 +31434,7 @@
         <!-- void* DevMemSysAllocator::Alloc(size_t, size_t*, size_t) -->
         <function-decl name='Alloc' mangled-name='_ZN18DevMemSysAllocator5AllocEmPmm' filepath='src/system-alloc.cc' line='342' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN18DevMemSysAllocator5AllocEmPmm'>
           <!-- implicit parameter of type 'DevMemSysAllocator*' -->
-          <parameter type-id='type-id-1242' is-artificial='yes'/>
+          <parameter type-id='type-id-1236' is-artificial='yes'/>
           <!-- parameter of type 'typedef size_t' -->
           <parameter type-id='type-id-57'/>
           <!-- parameter of type 'size_t*' -->
@@ -31838,13 +31447,13 @@
       </member-function>
     </class-decl>
     <!-- DefaultSysAllocator* -->
-    <pointer-type-def type-id='type-id-1239' size-in-bits='64' id='type-id-1240'/>
+    <pointer-type-def type-id='type-id-1233' size-in-bits='64' id='type-id-1234'/>
     <!-- DevMemSysAllocator* -->
-    <pointer-type-def type-id='type-id-1241' size-in-bits='64' id='type-id-1242'/>
-    <!-- MmapSysAllocator* -->
     <pointer-type-def type-id='type-id-1235' size-in-bits='64' id='type-id-1236'/>
+    <!-- MmapSysAllocator* -->
+    <pointer-type-def type-id='type-id-1229' size-in-bits='64' id='type-id-1230'/>
     <!-- SbrkSysAllocator* -->
-    <pointer-type-def type-id='type-id-1237' size-in-bits='64' id='type-id-1238'/>
+    <pointer-type-def type-id='type-id-1231' size-in-bits='64' id='type-id-1232'/>
     <!-- namespace FLAG__namespace_do_not_use_directly_use_DECLARE_int32_instead -->
     <namespace-decl name='FLAG__namespace_do_not_use_directly_use_DECLARE_int32_instead'>
       <!-- int32 FLAG__namespace_do_not_use_directly_use_DECLARE_int32_instead::FLAGS_malloc_devmem_start -->
@@ -31874,9 +31483,9 @@
     <!-- SysAllocator* tc_get_sysalloc_override(SysAllocator*) -->
     <function-decl name='tc_get_sysalloc_override' mangled-name='_Z24tc_get_sysalloc_overrideP12SysAllocator' filepath='src/system-alloc.cc' line='451' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z24tc_get_sysalloc_overrideP12SysAllocator'>
       <!-- parameter of type 'SysAllocator*' -->
-      <parameter type-id='type-id-902' name='def' filepath='src/system-alloc.cc' line='451' column='1'/>
+      <parameter type-id='type-id-952' name='def' filepath='src/system-alloc.cc' line='451' column='1'/>
       <!-- SysAllocator* -->
-      <return type-id='type-id-902'/>
+      <return type-id='type-id-952'/>
     </function-decl>
     <!-- void InitSystemAllocators() -->
     <function-decl name='InitSystemAllocators' mangled-name='_Z20InitSystemAllocatorsv' filepath='src/system-alloc.cc' line='457' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z20InitSystemAllocatorsv'>
@@ -31913,7 +31522,7 @@
       <return type-id='type-id-53'/>
     </function-decl>
     <!-- SysAllocator* sys_alloc -->
-    <var-decl name='sys_alloc' type-id='type-id-902' mangled-name='sys_alloc' visibility='default' filepath='src/system-alloc.cc' line='124' column='1' elf-symbol-id='sys_alloc'/>
+    <var-decl name='sys_alloc' type-id='type-id-952' mangled-name='sys_alloc' visibility='default' filepath='src/system-alloc.cc' line='124' column='1' elf-symbol-id='sys_alloc'/>
     <!-- size_t TCMalloc_SystemTaken -->
     <var-decl name='TCMalloc_SystemTaken' type-id='type-id-57' mangled-name='TCMalloc_SystemTaken' visibility='default' filepath='src/system-alloc.cc' line='127' column='1' elf-symbol-id='TCMalloc_SystemTaken'/>
   </abi-instr>
@@ -31921,41 +31530,41 @@
     <!-- AtomicWord[8] -->
     <array-type-def dimensions='1' type-id='type-id-781' size-in-bits='512' id='type-id-782'>
       <!-- <anonymous range>[8] -->
-      <subrange length='8' type-id='type-id-5' id='type-id-1243'/>
+      <subrange length='8' type-id='type-id-5' id='type-id-1237'/>
     </array-type-def>
     <!-- bool -->
     <type-decl name='bool' size-in-bits='8' id='type-id-55'/>
     <!-- char -->
     <type-decl name='char' size-in-bits='8' id='type-id-66'/>
     <!-- char[1] -->
-    <array-type-def dimensions='1' type-id='type-id-66' size-in-bits='8' id='type-id-1244'>
+    <array-type-def dimensions='1' type-id='type-id-66' size-in-bits='8' id='type-id-1238'>
       <!-- <anonymous range>[1] -->
-      <subrange length='1' type-id='type-id-5' id='type-id-1245'/>
+      <subrange length='1' type-id='type-id-5' id='type-id-1239'/>
     </array-type-def>
     <!-- char[20] -->
-    <array-type-def dimensions='1' type-id='type-id-66' size-in-bits='160' id='type-id-1246'>
+    <array-type-def dimensions='1' type-id='type-id-66' size-in-bits='160' id='type-id-1240'>
       <!-- <anonymous range>[20] -->
-      <subrange length='20' type-id='type-id-5' id='type-id-960'/>
+      <subrange length='20' type-id='type-id-5' id='type-id-954'/>
     </array-type-def>
     <!-- char[48] -->
     <array-type-def dimensions='1' type-id='type-id-66' size-in-bits='384' id='type-id-168'>
       <!-- <anonymous range>[48] -->
-      <subrange length='48' type-id='type-id-5' id='type-id-1247'/>
+      <subrange length='48' type-id='type-id-5' id='type-id-1241'/>
     </array-type-def>
     <!-- char[4] -->
-    <array-type-def dimensions='1' type-id='type-id-66' size-in-bits='32' id='type-id-1248'>
+    <array-type-def dimensions='1' type-id='type-id-66' size-in-bits='32' id='type-id-1242'>
       <!-- <anonymous range>[4] -->
       <subrange length='4' type-id='type-id-5' id='type-id-126'/>
     </array-type-def>
     <!-- struct typedef __va_list_tag __va_list_tag -->
-    <class-decl name='typedef __va_list_tag __va_list_tag' size-in-bits='192' is-struct='yes' visibility='default' id='type-id-1249'>
+    <class-decl name='typedef __va_list_tag __va_list_tag' size-in-bits='192' is-struct='yes' visibility='default' id='type-id-1243'>
       <data-member access='public' layout-offset-in-bits='0'>
         <!-- unsigned int typedef __va_list_tag __va_list_tag::gp_offset -->
-        <var-decl name='gp_offset' type-id='type-id-1123' visibility='default'/>
+        <var-decl name='gp_offset' type-id='type-id-1117' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='32'>
         <!-- unsigned int typedef __va_list_tag __va_list_tag::fp_offset -->
-        <var-decl name='fp_offset' type-id='type-id-1123' visibility='default'/>
+        <var-decl name='fp_offset' type-id='type-id-1117' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
         <!-- void* typedef __va_list_tag __va_list_tag::overflow_arg_area -->
@@ -31969,70 +31578,70 @@
     <!-- double -->
     <type-decl name='double' size-in-bits='64' id='type-id-2'/>
     <!-- double[1024] -->
-    <array-type-def dimensions='1' type-id='type-id-2' size-in-bits='65536' id='type-id-1250'>
+    <array-type-def dimensions='1' type-id='type-id-2' size-in-bits='65536' id='type-id-1244'>
       <!-- <anonymous range>[1024] -->
-      <subrange length='1024' type-id='type-id-5' id='type-id-1084'/>
+      <subrange length='1024' type-id='type-id-5' id='type-id-1078'/>
     </array-type-def>
     <!-- float -->
-    <type-decl name='float' size-in-bits='32' id='type-id-1251'/>
+    <type-decl name='float' size-in-bits='32' id='type-id-1245'/>
     <!-- int -->
     <type-decl name='int' size-in-bits='32' id='type-id-1'/>
     <!-- int64[128] -->
-    <array-type-def dimensions='1' type-id='type-id-76' size-in-bits='8192' id='type-id-1252'>
+    <array-type-def dimensions='1' type-id='type-id-76' size-in-bits='8192' id='type-id-1246'>
       <!-- <anonymous range>[128] -->
-      <subrange length='128' type-id='type-id-5' id='type-id-1253'/>
+      <subrange length='128' type-id='type-id-5' id='type-id-1247'/>
     </array-type-def>
     <!-- int[88] -->
-    <array-type-def dimensions='1' type-id='type-id-1' size-in-bits='2816' id='type-id-1254'>
+    <array-type-def dimensions='1' type-id='type-id-1' size-in-bits='2816' id='type-id-1248'>
       <!-- <anonymous range>[88] -->
-      <subrange length='88' type-id='type-id-5' id='type-id-1255'/>
+      <subrange length='88' type-id='type-id-5' id='type-id-1249'/>
     </array-type-def>
     <!-- long double -->
-    <type-decl name='long double' size-in-bits='128' id='type-id-1256'/>
+    <type-decl name='long double' size-in-bits='128' id='type-id-1250'/>
     <!-- long int -->
     <type-decl name='long int' size-in-bits='64' id='type-id-285'/>
     <!-- long long int -->
-    <type-decl name='long long int' size-in-bits='64' id='type-id-1257'/>
+    <type-decl name='long long int' size-in-bits='64' id='type-id-1251'/>
     <!-- long long unsigned int -->
-    <type-decl name='long long unsigned int' size-in-bits='64' id='type-id-1258'/>
+    <type-decl name='long long unsigned int' size-in-bits='64' id='type-id-1252'/>
     <!-- signed char -->
-    <type-decl name='signed char' size-in-bits='8' id='type-id-1259'/>
+    <type-decl name='signed char' size-in-bits='8' id='type-id-1253'/>
     <!-- size_t[88] -->
-    <array-type-def dimensions='1' type-id='type-id-57' size-in-bits='5632' id='type-id-1260'>
+    <array-type-def dimensions='1' type-id='type-id-57' size-in-bits='5632' id='type-id-1254'>
       <!-- <anonymous range>[88] -->
-      <subrange length='88' type-id='type-id-5' id='type-id-1255'/>
+      <subrange length='88' type-id='type-id-5' id='type-id-1249'/>
     </array-type-def>
     <!-- TCEntry[64] -->
-    <array-type-def dimensions='1' type-id='type-id-1261' size-in-bits='8192' id='type-id-1262'>
+    <array-type-def dimensions='1' type-id='type-id-1255' size-in-bits='8192' id='type-id-1256'>
       <!-- <anonymous range>[64] -->
-      <subrange length='64' type-id='type-id-5' id='type-id-1080'/>
+      <subrange length='64' type-id='type-id-5' id='type-id-1074'/>
     </array-type-def>
     <!-- CentralFreeListPadded[88] -->
-    <array-type-def dimensions='1' type-id='type-id-1263' size-in-bits='856064' id='type-id-1264'>
+    <array-type-def dimensions='1' type-id='type-id-1257' size-in-bits='856064' id='type-id-1258'>
       <!-- <anonymous range>[88] -->
-      <subrange length='88' type-id='type-id-5' id='type-id-1255'/>
+      <subrange length='88' type-id='type-id-5' id='type-id-1249'/>
     </array-type-def>
     <!-- SpanList[128] -->
-    <array-type-def dimensions='1' type-id='type-id-1265' size-in-bits='98304' id='type-id-1266'>
+    <array-type-def dimensions='1' type-id='type-id-1259' size-in-bits='98304' id='type-id-1260'>
       <!-- <anonymous range>[128] -->
-      <subrange length='128' type-id='type-id-5' id='type-id-1253'/>
+      <subrange length='128' type-id='type-id-5' id='type-id-1247'/>
     </array-type-def>
     <!-- FreeList[88] -->
-    <array-type-def dimensions='1' type-id='type-id-1267' size-in-bits='16896' id='type-id-1268'>
+    <array-type-def dimensions='1' type-id='type-id-1261' size-in-bits='16896' id='type-id-1262'>
       <!-- <anonymous range>[88] -->
-      <subrange length='88' type-id='type-id-5' id='type-id-1255'/>
+      <subrange length='88' type-id='type-id-5' id='type-id-1249'/>
     </array-type-def>
     <!-- unnamed&#45;enum&#45;underlying&#45;type -->
     <type-decl name='unnamed-enum-underlying-type' is-anonymous='yes' size-in-bits='32' alignment-in-bits='32' id='type-id-133'/>
     <!-- unsigned char -->
     <type-decl name='unsigned char' size-in-bits='8' id='type-id-3'/>
     <!-- unsigned char[2169] -->
-    <array-type-def dimensions='1' type-id='type-id-3' size-in-bits='17352' id='type-id-1269'>
+    <array-type-def dimensions='1' type-id='type-id-3' size-in-bits='17352' id='type-id-1263'>
       <!-- <anonymous range>[2169] -->
-      <subrange length='2169' type-id='type-id-5' id='type-id-1270'/>
+      <subrange length='2169' type-id='type-id-5' id='type-id-1264'/>
     </array-type-def>
     <!-- unsigned int -->
-    <type-decl name='unsigned int' size-in-bits='32' id='type-id-1123'/>
+    <type-decl name='unsigned int' size-in-bits='32' id='type-id-1117'/>
     <!-- unsigned long int -->
     <type-decl name='unsigned long int' size-in-bits='64' id='type-id-5'/>
     <!-- unsigned short int -->
@@ -32040,41 +31649,41 @@
     <!-- void -->
     <type-decl name='void' id='type-id-56'/>
     <!-- void*[31] -->
-    <array-type-def dimensions='1' type-id='type-id-53' size-in-bits='1984' id='type-id-1271'>
+    <array-type-def dimensions='1' type-id='type-id-53' size-in-bits='1984' id='type-id-1265'>
       <!-- <anonymous range>[31] -->
-      <subrange length='31' type-id='type-id-5' id='type-id-1272'/>
+      <subrange length='31' type-id='type-id-5' id='type-id-1266'/>
     </array-type-def>
     <!-- volatile unsigned long int[65536] -->
-    <array-type-def dimensions='1' type-id='type-id-1273' size-in-bits='4194304' id='type-id-1274'>
+    <array-type-def dimensions='1' type-id='type-id-1267' size-in-bits='4194304' id='type-id-1268'>
       <!-- <anonymous range>[65536] -->
-      <subrange length='65536' type-id='type-id-5' id='type-id-1275'/>
+      <subrange length='65536' type-id='type-id-5' id='type-id-1269'/>
     </array-type-def>
     <!-- wchar_t -->
-    <type-decl name='wchar_t' size-in-bits='32' id='type-id-1276'/>
+    <type-decl name='wchar_t' size-in-bits='32' id='type-id-1270'/>
     <!-- typedef unsigned long int size_t -->
     <typedef-decl name='size_t' type-id='type-id-5' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/include/stddef.h' line='211' column='1' id='type-id-57'/>
     <!-- struct lldiv_t -->
-    <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-1277'>
+    <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-1271'>
       <data-member access='public' layout-offset-in-bits='0'>
         <!-- long long int lldiv_t::quot -->
-        <var-decl name='quot' type-id='type-id-1257' visibility='default' filepath='/usr/include/stdlib.h' line='120' column='1'/>
+        <var-decl name='quot' type-id='type-id-1251' visibility='default' filepath='/usr/include/stdlib.h' line='120' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
         <!-- long long int lldiv_t::rem -->
-        <var-decl name='rem' type-id='type-id-1257' visibility='default' filepath='/usr/include/stdlib.h' line='121' column='1'/>
+        <var-decl name='rem' type-id='type-id-1251' visibility='default' filepath='/usr/include/stdlib.h' line='121' column='1'/>
       </data-member>
     </class-decl>
     <!-- typedef long int ptrdiff_t -->
     <typedef-decl name='ptrdiff_t' type-id='type-id-285' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/include/stddef.h' line='149' column='1' id='type-id-186'/>
     <!-- class TCMalloc_PageMap3<35> -->
-    <class-decl name='TCMalloc_PageMap3&lt;35&gt;' size-in-bits='128' visibility='default' filepath='src/pagemap.h' line='209' column='1' id='type-id-1278'>
+    <class-decl name='TCMalloc_PageMap3&lt;35&gt;' size-in-bits='128' visibility='default' filepath='src/pagemap.h' line='209' column='1' id='type-id-1272'>
       <member-type access='private'>
         <!-- struct TCMalloc_PageMap3<35>::Node -->
-        <class-decl name='Node' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-1279'/>
+        <class-decl name='Node' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-1273'/>
       </member-type>
       <member-type access='private'>
         <!-- struct TCMalloc_PageMap3<35>::Leaf -->
-        <class-decl name='Leaf' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-1280'/>
+        <class-decl name='Leaf' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-1274'/>
       </member-type>
       <data-member access='private' static='yes'>
         <!-- static const int TCMalloc_PageMap3<35>::INTERIOR_BITS -->
@@ -32094,7 +31703,7 @@
       </data-member>
       <data-member access='private' layout-offset-in-bits='0'>
         <!-- TCMalloc_PageMap3<35>::Node* TCMalloc_PageMap3<35>::root_ -->
-        <var-decl name='root_' type-id='type-id-1281' visibility='default' filepath='src/pagemap.h' line='229' column='1'/>
+        <var-decl name='root_' type-id='type-id-1275' visibility='default' filepath='src/pagemap.h' line='229' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='64'>
         <!-- void* (unsigned long int)* TCMalloc_PageMap3<35>::allocator_ -->
@@ -32104,16 +31713,16 @@
         <!-- TCMalloc_PageMap3<35>::Node* TCMalloc_PageMap3<35>::NewNode() -->
         <function-decl name='NewNode' mangled-name='_ZN17TCMalloc_PageMap3ILi35EE7NewNodeEv' filepath='src/pagemap.h' line='232' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'TCMalloc_PageMap3<35>*' -->
-          <parameter type-id='type-id-1282' is-artificial='yes'/>
+          <parameter type-id='type-id-1276' is-artificial='yes'/>
           <!-- TCMalloc_PageMap3<35>::Node* -->
-          <return type-id='type-id-1281'/>
+          <return type-id='type-id-1275'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
         <!-- void TCMalloc_PageMap3<35>::TCMalloc_PageMap3(void* (unsigned long int)*) -->
         <function-decl name='TCMalloc_PageMap3' filepath='src/pagemap.h' line='243' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'TCMalloc_PageMap3<35>*' -->
-          <parameter type-id='type-id-1282' is-artificial='yes'/>
+          <parameter type-id='type-id-1276' is-artificial='yes'/>
           <!-- parameter of type 'void* (unsigned long int)*' -->
           <parameter type-id='type-id-267'/>
           <!-- void -->
@@ -32124,7 +31733,7 @@
         <!-- void* TCMalloc_PageMap3<35>::get(unsigned long int) -->
         <function-decl name='get' mangled-name='_ZNK17TCMalloc_PageMap3ILi35EE3getEm' filepath='src/pagemap.h' line='248' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'const TCMalloc_PageMap3<35>*' -->
-          <parameter type-id='type-id-1283' is-artificial='yes'/>
+          <parameter type-id='type-id-1277' is-artificial='yes'/>
           <!-- parameter of type 'unsigned long int' -->
           <parameter type-id='type-id-5'/>
           <!-- void* -->
@@ -32135,7 +31744,7 @@
         <!-- void TCMalloc_PageMap3<35>::set(unsigned long int, void*) -->
         <function-decl name='set' mangled-name='_ZN17TCMalloc_PageMap3ILi35EE3setEmPv' filepath='src/pagemap.h' line='259' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'TCMalloc_PageMap3<35>*' -->
-          <parameter type-id='type-id-1282' is-artificial='yes'/>
+          <parameter type-id='type-id-1276' is-artificial='yes'/>
           <!-- parameter of type 'unsigned long int' -->
           <parameter type-id='type-id-5'/>
           <!-- parameter of type 'void*' -->
@@ -32148,7 +31757,7 @@
         <!-- bool TCMalloc_PageMap3<35>::Ensure(unsigned long int, unsigned long int) -->
         <function-decl name='Ensure' mangled-name='_ZN17TCMalloc_PageMap3ILi35EE6EnsureEmm' filepath='src/pagemap.h' line='267' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'TCMalloc_PageMap3<35>*' -->
-          <parameter type-id='type-id-1282' is-artificial='yes'/>
+          <parameter type-id='type-id-1276' is-artificial='yes'/>
           <!-- parameter of type 'unsigned long int' -->
           <parameter type-id='type-id-5'/>
           <!-- parameter of type 'unsigned long int' -->
@@ -32161,7 +31770,7 @@
         <!-- void TCMalloc_PageMap3<35>::PreallocateMoreMemory() -->
         <function-decl name='PreallocateMoreMemory' mangled-name='_ZN17TCMalloc_PageMap3ILi35EE21PreallocateMoreMemoryEv' filepath='src/pagemap.h' line='297' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'TCMalloc_PageMap3<35>*' -->
-          <parameter type-id='type-id-1282' is-artificial='yes'/>
+          <parameter type-id='type-id-1276' is-artificial='yes'/>
           <!-- void -->
           <return type-id='type-id-56'/>
         </function-decl>
@@ -32170,7 +31779,7 @@
         <!-- void* TCMalloc_PageMap3<35>::Next(unsigned long int) -->
         <function-decl name='Next' mangled-name='_ZNK17TCMalloc_PageMap3ILi35EE4NextEm' filepath='src/pagemap.h' line='300' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'const TCMalloc_PageMap3<35>*' -->
-          <parameter type-id='type-id-1283' is-artificial='yes'/>
+          <parameter type-id='type-id-1277' is-artificial='yes'/>
           <!-- parameter of type 'unsigned long int' -->
           <parameter type-id='type-id-5'/>
           <!-- void* -->
@@ -32179,9 +31788,9 @@
       </member-function>
     </class-decl>
     <!-- typedef int (void*, void*)* __compar_fn_t -->
-    <typedef-decl name='__compar_fn_t' type-id='type-id-1284' filepath='/usr/include/stdlib.h' line='742' column='1' id='type-id-1285'/>
+    <typedef-decl name='__compar_fn_t' type-id='type-id-1278' filepath='/usr/include/stdlib.h' line='742' column='1' id='type-id-1279'/>
     <!-- struct div_t -->
-    <class-decl name='div_t' size-in-bits='64' is-struct='yes' visibility='default' filepath='/usr/include/stdlib.h' line='99' column='1' id='type-id-1286'>
+    <class-decl name='div_t' size-in-bits='64' is-struct='yes' visibility='default' filepath='/usr/include/stdlib.h' line='99' column='1' id='type-id-1280'>
       <data-member access='public' layout-offset-in-bits='0'>
         <!-- int div_t::quot -->
         <var-decl name='quot' type-id='type-id-1' visibility='default' filepath='/usr/include/stdlib.h' line='100' column='1'/>
@@ -32195,32 +31804,32 @@
     <class-decl name='SpinLock' size-in-bits='32' visibility='default' filepath='./src/base/spinlock.h' line='48' column='1' id='type-id-176'>
       <member-type access='private'>
         <!-- enum SpinLock::__anonymous_enum__2 -->
-        <enum-decl name='__anonymous_enum__2' is-anonymous='yes' filepath='./src/base/spinlock.h' line='116' column='1' id='type-id-1287'>
+        <enum-decl name='__anonymous_enum__2' is-anonymous='yes' filepath='./src/base/spinlock.h' line='116' column='1' id='type-id-1281'>
           <underlying-type type-id='type-id-133'/>
           <enumerator name='kSpinLockSleeper' value='2'/>
         </enum-decl>
       </member-type>
       <member-type access='private'>
         <!-- enum SpinLock::__anonymous_enum__ -->
-        <enum-decl name='__anonymous_enum__' is-anonymous='yes' filepath='src/base/spinlock.h' line='114' column='1' id='type-id-1288'>
+        <enum-decl name='__anonymous_enum__' is-anonymous='yes' filepath='src/base/spinlock.h' line='114' column='1' id='type-id-1282'>
           <underlying-type type-id='type-id-133'/>
           <enumerator name='kSpinLockFree' value='0'/>
         </enum-decl>
       </member-type>
       <member-type access='private'>
         <!-- enum SpinLock::__anonymous_enum__1 -->
-        <enum-decl name='__anonymous_enum__1' is-anonymous='yes' filepath='src/base/spinlock.h' line='115' column='1' id='type-id-1289'>
+        <enum-decl name='__anonymous_enum__1' is-anonymous='yes' filepath='src/base/spinlock.h' line='115' column='1' id='type-id-1283'>
           <underlying-type type-id='type-id-133'/>
           <enumerator name='kSpinLockHeld' value='1'/>
         </enum-decl>
       </member-type>
       <data-member access='private' static='yes'>
         <!-- static const base::LinkerInitialized SpinLock::LINKER_INITIALIZED -->
-        <var-decl name='LINKER_INITIALIZED' type-id='type-id-1290' mangled-name='_ZN8SpinLock18LINKER_INITIALIZEDE' visibility='default' filepath='src/base/spinlock.h' line='112' column='1' elf-symbol-id='_ZN8SpinLock18LINKER_INITIALIZEDE'/>
+        <var-decl name='LINKER_INITIALIZED' type-id='type-id-1284' mangled-name='_ZN8SpinLock18LINKER_INITIALIZEDE' visibility='default' filepath='src/base/spinlock.h' line='112' column='1' elf-symbol-id='_ZN8SpinLock18LINKER_INITIALIZEDE'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='0'>
         <!-- volatile Atomic32 SpinLock::lockword_ -->
-        <var-decl name='lockword_' type-id='type-id-986' visibility='default' filepath='src/base/spinlock.h' line='118' column='1'/>
+        <var-decl name='lockword_' type-id='type-id-980' visibility='default' filepath='src/base/spinlock.h' line='118' column='1'/>
       </data-member>
       <member-function access='private' constructor='yes'>
         <!-- SpinLock::SpinLock() -->
@@ -32237,7 +31846,7 @@
           <!-- implicit parameter of type 'SpinLock*' -->
           <parameter type-id='type-id-254' is-artificial='yes'/>
           <!-- parameter of type 'enum base::LinkerInitialized' -->
-          <parameter type-id='type-id-1291'/>
+          <parameter type-id='type-id-1285'/>
           <!-- void -->
           <return type-id='type-id-56'/>
         </function-decl>
@@ -32273,7 +31882,7 @@
         <!-- bool SpinLock::IsHeld() -->
         <function-decl name='IsHeld' mangled-name='_ZNK8SpinLock6IsHeldEv' filepath='src/base/spinlock.h' line='108' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'const SpinLock*' -->
-          <parameter type-id='type-id-1292' is-artificial='yes'/>
+          <parameter type-id='type-id-1286' is-artificial='yes'/>
           <!-- bool -->
           <return type-id='type-id-55'/>
         </function-decl>
@@ -32306,7 +31915,7 @@
           <!-- parameter of type 'typedef int64' -->
           <parameter type-id='type-id-76'/>
           <!-- parameter of type 'Atomic32*' -->
-          <parameter type-id='type-id-1293'/>
+          <parameter type-id='type-id-1287'/>
           <!-- typedef Atomic32 -->
           <return type-id='type-id-82'/>
         </function-decl>
@@ -32328,7 +31937,7 @@
           <!-- implicit parameter of type 'SpinLock*' -->
           <parameter type-id='type-id-254' is-artificial='yes'/>
           <!-- parameter of type 'const SpinLock&' -->
-          <parameter type-id='type-id-1294'/>
+          <parameter type-id='type-id-1288'/>
           <!-- void -->
           <return type-id='type-id-56'/>
         </function-decl>
@@ -32339,14 +31948,14 @@
           <!-- implicit parameter of type 'SpinLock*' -->
           <parameter type-id='type-id-254' is-artificial='yes'/>
           <!-- parameter of type 'const SpinLock&' -->
-          <parameter type-id='type-id-1294'/>
+          <parameter type-id='type-id-1288'/>
           <!-- void -->
           <return type-id='type-id-56'/>
         </function-decl>
       </member-function>
     </class-decl>
     <!-- struct ldiv_t -->
-    <class-decl name='ldiv_t' size-in-bits='128' is-struct='yes' visibility='default' filepath='/usr/include/stdlib.h' line='107' column='1' id='type-id-1295'>
+    <class-decl name='ldiv_t' size-in-bits='128' is-struct='yes' visibility='default' filepath='/usr/include/stdlib.h' line='107' column='1' id='type-id-1289'>
       <data-member access='public' layout-offset-in-bits='0'>
         <!-- long int ldiv_t::quot -->
         <var-decl name='quot' type-id='type-id-285' visibility='default' filepath='/usr/include/stdlib.h' line='108' column='1'/>
@@ -32357,7 +31966,7 @@
       </data-member>
     </class-decl>
     <!-- class TCMalloc_Printer -->
-    <class-decl name='TCMalloc_Printer' size-in-bits='128' visibility='default' filepath='src/internal_logging.h' line='126' column='1' id='type-id-1296'>
+    <class-decl name='TCMalloc_Printer' size-in-bits='128' visibility='default' filepath='src/internal_logging.h' line='126' column='1' id='type-id-1290'>
       <data-member access='private' layout-offset-in-bits='0'>
         <!-- char* TCMalloc_Printer::buf_ -->
         <var-decl name='buf_' type-id='type-id-90' visibility='default' filepath='src/internal_logging.h' line='128' column='1'/>
@@ -32370,7 +31979,7 @@
         <!-- TCMalloc_Printer::TCMalloc_Printer(char*, int) -->
         <function-decl name='TCMalloc_Printer' filepath='src/internal_logging.h' line='133' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'TCMalloc_Printer*' -->
-          <parameter type-id='type-id-1297' is-artificial='yes'/>
+          <parameter type-id='type-id-1291' is-artificial='yes'/>
           <!-- parameter of type 'char*' -->
           <parameter type-id='type-id-90'/>
           <!-- parameter of type 'int' -->
@@ -32383,7 +31992,7 @@
         <!-- void TCMalloc_Printer::printf(const char*, ...) -->
         <function-decl name='printf' mangled-name='_ZN16TCMalloc_Printer6printfEPKcz' filepath='src/internal_logging.h' line='137' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN16TCMalloc_Printer6printfEPKcz'>
           <!-- implicit parameter of type 'TCMalloc_Printer*' -->
-          <parameter type-id='type-id-1297' is-artificial='yes'/>
+          <parameter type-id='type-id-1291' is-artificial='yes'/>
           <!-- parameter of type 'const char*' -->
           <parameter type-id='type-id-52'/>
           <parameter is-variadic='yes'/>
@@ -32393,9 +32002,9 @@
       </member-function>
     </class-decl>
     <!-- typedef unsigned int wint_t -->
-    <typedef-decl name='wint_t' type-id='type-id-1123' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/include/stddef.h' line='352' column='1' id='type-id-1298'/>
+    <typedef-decl name='wint_t' type-id='type-id-1117' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/include/stddef.h' line='352' column='1' id='type-id-1292'/>
     <!-- class PackedCache<35, long unsigned int> -->
-    <class-decl name='PackedCache&lt;35, long unsigned int&gt;' size-in-bits='4194304' visibility='default' filepath='src/packed-cache-inl.h' line='135' column='1' id='type-id-1299'>
+    <class-decl name='PackedCache&lt;35, long unsigned int&gt;' size-in-bits='4194304' visibility='default' filepath='src/packed-cache-inl.h' line='135' column='1' id='type-id-1293'>
       <data-member access='private' static='yes'>
         <!-- static const int PackedCache<35, long unsigned int>::kHashbits -->
         <var-decl name='kHashbits' type-id='type-id-112' visibility='default' filepath='src/packed-cache-inl.h' line='143' column='1'/>
@@ -32430,13 +32039,13 @@
       </data-member>
       <data-member access='private' layout-offset-in-bits='0'>
         <!-- volatile unsigned long int PackedCache<35, long unsigned int>::array_[65536] -->
-        <var-decl name='array_' type-id='type-id-1274' visibility='default' filepath='src/packed-cache-inl.h' line='234' column='1'/>
+        <var-decl name='array_' type-id='type-id-1268' visibility='default' filepath='src/packed-cache-inl.h' line='234' column='1'/>
       </data-member>
       <member-function access='private'>
         <!-- void PackedCache<35, long unsigned int>::PackedCache(unsigned long int) -->
         <function-decl name='PackedCache' filepath='src/packed-cache-inl.h' line='148' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'PackedCache<35, long unsigned int>*' -->
-          <parameter type-id='type-id-1300' is-artificial='yes'/>
+          <parameter type-id='type-id-1294' is-artificial='yes'/>
           <!-- parameter of type 'unsigned long int' -->
           <parameter type-id='type-id-5'/>
           <!-- void -->
@@ -32447,7 +32056,7 @@
         <!-- void PackedCache<35, long unsigned int>::Put(unsigned long int, unsigned long int) -->
         <function-decl name='Put' mangled-name='_ZN11PackedCacheILi35EmE3PutEmm' filepath='src/packed-cache-inl.h' line='157' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'PackedCache<35, long unsigned int>*' -->
-          <parameter type-id='type-id-1300' is-artificial='yes'/>
+          <parameter type-id='type-id-1294' is-artificial='yes'/>
           <!-- parameter of type 'unsigned long int' -->
           <parameter type-id='type-id-5'/>
           <!-- parameter of type 'unsigned long int' -->
@@ -32460,7 +32069,7 @@
         <!-- bool PackedCache<35, long unsigned int>::Has(unsigned long int) -->
         <function-decl name='Has' mangled-name='_ZNK11PackedCacheILi35EmE3HasEm' filepath='src/packed-cache-inl.h' line='163' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'const PackedCache<35, long unsigned int>*' -->
-          <parameter type-id='type-id-1301' is-artificial='yes'/>
+          <parameter type-id='type-id-1295' is-artificial='yes'/>
           <!-- parameter of type 'unsigned long int' -->
           <parameter type-id='type-id-5'/>
           <!-- bool -->
@@ -32471,7 +32080,7 @@
         <!-- size_t PackedCache<35, long unsigned int>::GetOrDefault(unsigned long int, unsigned long int) -->
         <function-decl name='GetOrDefault' mangled-name='_ZNK11PackedCacheILi35EmE12GetOrDefaultEmm' filepath='src/packed-cache-inl.h' line='168' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'const PackedCache<35, long unsigned int>*' -->
-          <parameter type-id='type-id-1301' is-artificial='yes'/>
+          <parameter type-id='type-id-1295' is-artificial='yes'/>
           <!-- parameter of type 'unsigned long int' -->
           <parameter type-id='type-id-5'/>
           <!-- parameter of type 'unsigned long int' -->
@@ -32484,7 +32093,7 @@
         <!-- void PackedCache<35, long unsigned int>::Clear(unsigned long int) -->
         <function-decl name='Clear' mangled-name='_ZN11PackedCacheILi35EmE5ClearEm' filepath='src/packed-cache-inl.h' line='178' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'PackedCache<35, long unsigned int>*' -->
-          <parameter type-id='type-id-1300' is-artificial='yes'/>
+          <parameter type-id='type-id-1294' is-artificial='yes'/>
           <!-- parameter of type 'unsigned long int' -->
           <parameter type-id='type-id-5'/>
           <!-- void -->
@@ -32531,9 +32140,353 @@
       </member-function>
     </class-decl>
     <!-- typedef _IO_FILE __FILE -->
-    <typedef-decl name='__FILE' type-id='type-id-1302' filepath='/usr/include/stdio.h' line='65' column='1' id='type-id-1303'/>
+    <typedef-decl name='__FILE' type-id='type-id-1296' filepath='/usr/include/stdio.h' line='65' column='1' id='type-id-1297'/>
+    <!-- class MallocExtension -->
+    <class-decl name='MallocExtension' size-in-bits='64' visibility='default' filepath='src/gperftools/malloc_extension.h' line='90' column='1' id='type-id-894'>
+      <member-type access='private'>
+        <!-- enum MallocExtension::Ownership -->
+        <enum-decl name='Ownership' filepath='./src/gperftools/malloc_extension.h' line='315' column='1' id='type-id-1298'>
+          <underlying-type type-id='type-id-133'/>
+          <enumerator name='kUnknownOwnership' value='0'/>
+          <enumerator name='kOwned' value='1'/>
+          <enumerator name='kNotOwned' value='2'/>
+        </enum-decl>
+      </member-type>
+      <member-type access='private'>
+        <!-- struct MallocExtension::FreeListInfo -->
+        <class-decl name='FreeListInfo' size-in-bits='256' is-struct='yes' visibility='default' filepath='./src/gperftools/malloc_extension.h' line='333' column='1' id='type-id-1299'>
+          <data-member access='public' layout-offset-in-bits='0'>
+            <!-- size_t MallocExtension::FreeListInfo::min_object_size -->
+            <var-decl name='min_object_size' type-id='type-id-57' visibility='default' filepath='./src/gperftools/malloc_extension.h' line='334' column='1'/>
+          </data-member>
+          <data-member access='public' layout-offset-in-bits='64'>
+            <!-- size_t MallocExtension::FreeListInfo::max_object_size -->
+            <var-decl name='max_object_size' type-id='type-id-57' visibility='default' filepath='./src/gperftools/malloc_extension.h' line='335' column='1'/>
+          </data-member>
+          <data-member access='public' layout-offset-in-bits='128'>
+            <!-- size_t MallocExtension::FreeListInfo::total_bytes_free -->
+            <var-decl name='total_bytes_free' type-id='type-id-57' visibility='default' filepath='./src/gperftools/malloc_extension.h' line='336' column='1'/>
+          </data-member>
+          <data-member access='public' layout-offset-in-bits='192'>
+            <!-- const char* MallocExtension::FreeListInfo::type -->
+            <var-decl name='type' type-id='type-id-52' visibility='default' filepath='./src/gperftools/malloc_extension.h' line='337' column='1'/>
+          </data-member>
+        </class-decl>
+      </member-type>
+      <member-type access='private'>
+        <!-- typedef void (void*, const base::MallocRange*) MallocExtension::RangeFunction -->
+        <typedef-decl name='RangeFunction' type-id='type-id-1300' filepath='src/gperftools/malloc_extension.h' line='143' column='1' id='type-id-895'/>
+      </member-type>
+      <member-function access='private' static='yes'>
+        <!-- void MallocExtension::Initialize() -->
+        <function-decl name='Initialize' mangled-name='_ZN15MallocExtension10InitializeEv' filepath='src/malloc_extension.cc' line='79' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN15MallocExtension10InitializeEv'>
+          <!-- void -->
+          <return type-id='type-id-56'/>
+        </function-decl>
+      </member-function>
+      <member-function access='private' static='yes'>
+        <!-- MallocExtension* MallocExtension::instance() -->
+        <function-decl name='instance' mangled-name='_ZN15MallocExtension8instanceEv' filepath='src/malloc_extension.cc' line='212' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN15MallocExtension8instanceEv'>
+          <!-- MallocExtension* -->
+          <return type-id='type-id-259'/>
+        </function-decl>
+      </member-function>
+      <member-function access='private'>
+        <!-- void MallocExtension::Register() -->
+        <function-decl name='Register' mangled-name='_ZN15MallocExtension8RegisterEPS_' filepath='src/malloc_extension.cc' line='217' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN15MallocExtension8RegisterEPS_'>
+          <!-- implicit parameter of type 'MallocExtension*' -->
+          <parameter type-id='type-id-259' is-artificial='yes'/>
+          <!-- void -->
+          <return type-id='type-id-56'/>
+        </function-decl>
+      </member-function>
+      <member-function access='private' destructor='yes' vtable-offset='-1'>
+        <!-- MallocExtension::~MallocExtension(int) -->
+        <function-decl name='~MallocExtension' mangled-name='_ZN15MallocExtensionD1Ev' filepath='src/malloc_extension.cc' line='111' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN15MallocExtensionD1Ev'>
+          <!-- implicit parameter of type 'MallocExtension*' -->
+          <parameter type-id='type-id-259' is-artificial='yes'/>
+          <!-- artificial parameter of type 'int' -->
+          <parameter type-id='type-id-1' is-artificial='yes'/>
+          <!-- void -->
+          <return type-id='type-id-56'/>
+        </function-decl>
+      </member-function>
+      <member-function access='private' vtable-offset='2'>
+        <!-- bool MallocExtension::VerifyAllMemory() -->
+        <function-decl name='VerifyAllMemory' mangled-name='_ZN15MallocExtension15VerifyAllMemoryEv' filepath='src/malloc_extension.cc' line='112' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN15MallocExtension15VerifyAllMemoryEv'>
+          <!-- implicit parameter of type 'MallocExtension*' -->
+          <parameter type-id='type-id-259' is-artificial='yes'/>
+          <!-- bool -->
+          <return type-id='type-id-55'/>
+        </function-decl>
+      </member-function>
+      <member-function access='private' vtable-offset='3'>
+        <!-- bool MallocExtension::VerifyNewMemory(void*) -->
+        <function-decl name='VerifyNewMemory' mangled-name='_ZN15MallocExtension15VerifyNewMemoryEPKv' filepath='src/malloc_extension.cc' line='113' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN15MallocExtension15VerifyNewMemoryEPKv'>
+          <!-- implicit parameter of type 'MallocExtension*' -->
+          <parameter type-id='type-id-259' is-artificial='yes'/>
+          <!-- parameter of type 'void*' -->
+          <parameter type-id='type-id-53'/>
+          <!-- bool -->
+          <return type-id='type-id-55'/>
+        </function-decl>
+      </member-function>
+      <member-function access='private' vtable-offset='4'>
+        <!-- bool MallocExtension::VerifyArrayNewMemory(void*) -->
+        <function-decl name='VerifyArrayNewMemory' mangled-name='_ZN15MallocExtension20VerifyArrayNewMemoryEPKv' filepath='src/malloc_extension.cc' line='114' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN15MallocExtension20VerifyArrayNewMemoryEPKv'>
+          <!-- implicit parameter of type 'MallocExtension*' -->
+          <parameter type-id='type-id-259' is-artificial='yes'/>
+          <!-- parameter of type 'void*' -->
+          <parameter type-id='type-id-53'/>
+          <!-- bool -->
+          <return type-id='type-id-55'/>
+        </function-decl>
+      </member-function>
+      <member-function access='private' vtable-offset='5'>
+        <!-- bool MallocExtension::VerifyMallocMemory(void*) -->
+        <function-decl name='VerifyMallocMemory' mangled-name='_ZN15MallocExtension18VerifyMallocMemoryEPKv' filepath='src/malloc_extension.cc' line='115' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN15MallocExtension18VerifyMallocMemoryEPKv'>
+          <!-- implicit parameter of type 'MallocExtension*' -->
+          <parameter type-id='type-id-259' is-artificial='yes'/>
+          <!-- parameter of type 'void*' -->
+          <parameter type-id='type-id-53'/>
+          <!-- bool -->
+          <return type-id='type-id-55'/>
+        </function-decl>
+      </member-function>
+      <member-function access='private' vtable-offset='6'>
+        <!-- bool MallocExtension::MallocMemoryStats(int*, size_t*, int*) -->
+        <function-decl name='MallocMemoryStats' mangled-name='_ZN15MallocExtension17MallocMemoryStatsEPiPmS0_' filepath='src/malloc_extension.cc' line='130' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN15MallocExtension17MallocMemoryStatsEPiPmS0_'>
+          <!-- implicit parameter of type 'MallocExtension*' -->
+          <parameter type-id='type-id-259' is-artificial='yes'/>
+          <!-- parameter of type 'int*' -->
+          <parameter type-id='type-id-897'/>
+          <!-- parameter of type 'size_t*' -->
+          <parameter type-id='type-id-230'/>
+          <!-- parameter of type 'int*' -->
+          <parameter type-id='type-id-897'/>
+          <!-- bool -->
+          <return type-id='type-id-55'/>
+        </function-decl>
+      </member-function>
+      <member-function access='private' vtable-offset='7'>
+        <!-- void MallocExtension::GetStats(char*, int) -->
+        <function-decl name='GetStats' mangled-name='_ZN15MallocExtension8GetStatsEPci' filepath='src/malloc_extension.cc' line='125' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN15MallocExtension8GetStatsEPci'>
+          <!-- implicit parameter of type 'MallocExtension*' -->
+          <parameter type-id='type-id-259' is-artificial='yes'/>
+          <!-- parameter of type 'char*' -->
+          <parameter type-id='type-id-90'/>
+          <!-- parameter of type 'int' -->
+          <parameter type-id='type-id-1'/>
+          <!-- void -->
+          <return type-id='type-id-56'/>
+        </function-decl>
+      </member-function>
+      <member-function access='private' vtable-offset='8'>
+        <!-- void MallocExtension::GetHeapSample(MallocExtensionWriter*) -->
+        <function-decl name='GetHeapSample' mangled-name='_ZN15MallocExtension13GetHeapSampleEPSs' filepath='src/malloc_extension.cc' line='292' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN15MallocExtension13GetHeapSampleEPSs'>
+          <!-- implicit parameter of type 'MallocExtension*' -->
+          <parameter type-id='type-id-259' is-artificial='yes'/>
+          <!-- parameter of type 'MallocExtensionWriter*' -->
+          <parameter type-id='type-id-1301'/>
+          <!-- void -->
+          <return type-id='type-id-56'/>
+        </function-decl>
+      </member-function>
+      <member-function access='private' vtable-offset='9'>
+        <!-- void MallocExtension::GetHeapGrowthStacks(MallocExtensionWriter*) -->
+        <function-decl name='GetHeapGrowthStacks' mangled-name='_ZN15MallocExtension19GetHeapGrowthStacksEPSs' filepath='src/malloc_extension.cc' line='316' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN15MallocExtension19GetHeapGrowthStacksEPSs'>
+          <!-- implicit parameter of type 'MallocExtension*' -->
+          <parameter type-id='type-id-259' is-artificial='yes'/>
+          <!-- parameter of type 'MallocExtensionWriter*' -->
+          <parameter type-id='type-id-1301'/>
+          <!-- void -->
+          <return type-id='type-id-56'/>
+        </function-decl>
+      </member-function>
+      <member-function access='private' vtable-offset='10'>
+        <!-- void MallocExtension::Ranges(void*, MallocExtension::RangeFunction*) -->
+        <function-decl name='Ranges' mangled-name='_ZN15MallocExtension6RangesEPvPFvS0_PKN4base11MallocRangeEE' filepath='src/malloc_extension.cc' line='340' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN15MallocExtension6RangesEPvPFvS0_PKN4base11MallocRangeEE'>
+          <!-- implicit parameter of type 'MallocExtension*' -->
+          <parameter type-id='type-id-259' is-artificial='yes'/>
+          <!-- parameter of type 'void*' -->
+          <parameter type-id='type-id-53'/>
+          <!-- parameter of type 'MallocExtension::RangeFunction*' -->
+          <parameter type-id='type-id-896'/>
+          <!-- void -->
+          <return type-id='type-id-56'/>
+        </function-decl>
+      </member-function>
+      <member-function access='private' vtable-offset='11'>
+        <!-- bool MallocExtension::GetNumericProperty(const char*, size_t*) -->
+        <function-decl name='GetNumericProperty' mangled-name='_ZN15MallocExtension18GetNumericPropertyEPKcPm' filepath='src/malloc_extension.cc' line='117' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN15MallocExtension18GetNumericPropertyEPKcPm'>
+          <!-- implicit parameter of type 'MallocExtension*' -->
+          <parameter type-id='type-id-259' is-artificial='yes'/>
+          <!-- parameter of type 'const char*' -->
+          <parameter type-id='type-id-52'/>
+          <!-- parameter of type 'size_t*' -->
+          <parameter type-id='type-id-230'/>
+          <!-- bool -->
+          <return type-id='type-id-55'/>
+        </function-decl>
+      </member-function>
+      <member-function access='private' vtable-offset='12'>
+        <!-- bool MallocExtension::SetNumericProperty(const char*, size_t) -->
+        <function-decl name='SetNumericProperty' mangled-name='_ZN15MallocExtension18SetNumericPropertyEPKcm' filepath='src/malloc_extension.cc' line='121' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN15MallocExtension18SetNumericPropertyEPKcm'>
+          <!-- implicit parameter of type 'MallocExtension*' -->
+          <parameter type-id='type-id-259' is-artificial='yes'/>
+          <!-- parameter of type 'const char*' -->
+          <parameter type-id='type-id-52'/>
+          <!-- parameter of type 'typedef size_t' -->
+          <parameter type-id='type-id-57'/>
+          <!-- bool -->
+          <return type-id='type-id-55'/>
+        </function-decl>
+      </member-function>
+      <member-function access='private' vtable-offset='13'>
+        <!-- void MallocExtension::MarkThreadIdle() -->
+        <function-decl name='MarkThreadIdle' mangled-name='_ZN15MallocExtension14MarkThreadIdleEv' filepath='src/malloc_extension.cc' line='146' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN15MallocExtension14MarkThreadIdleEv'>
+          <!-- implicit parameter of type 'MallocExtension*' -->
+          <parameter type-id='type-id-259' is-artificial='yes'/>
+          <!-- void -->
+          <return type-id='type-id-56'/>
+        </function-decl>
+      </member-function>
+      <member-function access='private' vtable-offset='14'>
+        <!-- void MallocExtension::MarkThreadBusy() -->
+        <function-decl name='MarkThreadBusy' mangled-name='_ZN15MallocExtension14MarkThreadBusyEv' filepath='src/malloc_extension.cc' line='150' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN15MallocExtension14MarkThreadBusyEv'>
+          <!-- implicit parameter of type 'MallocExtension*' -->
+          <parameter type-id='type-id-259' is-artificial='yes'/>
+          <!-- void -->
+          <return type-id='type-id-56'/>
+        </function-decl>
+      </member-function>
+      <member-function access='private' vtable-offset='15'>
+        <!-- SysAllocator* MallocExtension::GetSystemAllocator() -->
+        <function-decl name='GetSystemAllocator' mangled-name='_ZN15MallocExtension18GetSystemAllocatorEv' filepath='src/malloc_extension.cc' line='154' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN15MallocExtension18GetSystemAllocatorEv'>
+          <!-- implicit parameter of type 'MallocExtension*' -->
+          <parameter type-id='type-id-259' is-artificial='yes'/>
+          <!-- SysAllocator* -->
+          <return type-id='type-id-952'/>
+        </function-decl>
+      </member-function>
+      <member-function access='private' vtable-offset='16'>
+        <!-- void MallocExtension::SetSystemAllocator(SysAllocator*) -->
+        <function-decl name='SetSystemAllocator' mangled-name='_ZN15MallocExtension18SetSystemAllocatorEP12SysAllocator' filepath='src/malloc_extension.cc' line='158' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN15MallocExtension18SetSystemAllocatorEP12SysAllocator'>
+          <!-- implicit parameter of type 'MallocExtension*' -->
+          <parameter type-id='type-id-259' is-artificial='yes'/>
+          <!-- parameter of type 'SysAllocator*' -->
+          <parameter type-id='type-id-952'/>
+          <!-- void -->
+          <return type-id='type-id-56'/>
+        </function-decl>
+      </member-function>
+      <member-function access='private' vtable-offset='17'>
+        <!-- void MallocExtension::ReleaseToSystem(size_t) -->
+        <function-decl name='ReleaseToSystem' mangled-name='_ZN15MallocExtension15ReleaseToSystemEm' filepath='src/malloc_extension.cc' line='162' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN15MallocExtension15ReleaseToSystemEm'>
+          <!-- implicit parameter of type 'MallocExtension*' -->
+          <parameter type-id='type-id-259' is-artificial='yes'/>
+          <!-- parameter of type 'typedef size_t' -->
+          <parameter type-id='type-id-57'/>
+          <!-- void -->
+          <return type-id='type-id-56'/>
+        </function-decl>
+      </member-function>
+      <member-function access='private' vtable-offset='18'>
+        <!-- void MallocExtension::ReleaseFreeMemory() -->
+        <function-decl name='ReleaseFreeMemory' mangled-name='_ZN15MallocExtension17ReleaseFreeMemoryEv' filepath='src/malloc_extension.cc' line='166' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN15MallocExtension17ReleaseFreeMemoryEv'>
+          <!-- implicit parameter of type 'MallocExtension*' -->
+          <parameter type-id='type-id-259' is-artificial='yes'/>
+          <!-- void -->
+          <return type-id='type-id-56'/>
+        </function-decl>
+      </member-function>
+      <member-function access='private' vtable-offset='19'>
+        <!-- void MallocExtension::SetMemoryReleaseRate(double) -->
+        <function-decl name='SetMemoryReleaseRate' mangled-name='_ZN15MallocExtension20SetMemoryReleaseRateEd' filepath='src/malloc_extension.cc' line='170' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN15MallocExtension20SetMemoryReleaseRateEd'>
+          <!-- implicit parameter of type 'MallocExtension*' -->
+          <parameter type-id='type-id-259' is-artificial='yes'/>
+          <!-- parameter of type 'double' -->
+          <parameter type-id='type-id-2'/>
+          <!-- void -->
+          <return type-id='type-id-56'/>
+        </function-decl>
+      </member-function>
+      <member-function access='private' vtable-offset='20'>
+        <!-- double MallocExtension::GetMemoryReleaseRate() -->
+        <function-decl name='GetMemoryReleaseRate' mangled-name='_ZN15MallocExtension20GetMemoryReleaseRateEv' filepath='src/malloc_extension.cc' line='174' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN15MallocExtension20GetMemoryReleaseRateEv'>
+          <!-- implicit parameter of type 'MallocExtension*' -->
+          <parameter type-id='type-id-259' is-artificial='yes'/>
+          <!-- double -->
+          <return type-id='type-id-2'/>
+        </function-decl>
+      </member-function>
+      <member-function access='private' vtable-offset='21'>
+        <!-- size_t MallocExtension::GetEstimatedAllocatedSize(size_t) -->
+        <function-decl name='GetEstimatedAllocatedSize' mangled-name='_ZN15MallocExtension25GetEstimatedAllocatedSizeEm' filepath='src/malloc_extension.cc' line='178' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN15MallocExtension25GetEstimatedAllocatedSizeEm'>
+          <!-- implicit parameter of type 'MallocExtension*' -->
+          <parameter type-id='type-id-259' is-artificial='yes'/>
+          <!-- parameter of type 'typedef size_t' -->
+          <parameter type-id='type-id-57'/>
+          <!-- typedef size_t -->
+          <return type-id='type-id-57'/>
+        </function-decl>
+      </member-function>
+      <member-function access='private' vtable-offset='22'>
+        <!-- size_t MallocExtension::GetAllocatedSize(void*) -->
+        <function-decl name='GetAllocatedSize' mangled-name='_ZN15MallocExtension16GetAllocatedSizeEPKv' filepath='src/malloc_extension.cc' line='182' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN15MallocExtension16GetAllocatedSizeEPKv'>
+          <!-- implicit parameter of type 'MallocExtension*' -->
+          <parameter type-id='type-id-259' is-artificial='yes'/>
+          <!-- parameter of type 'void*' -->
+          <parameter type-id='type-id-53'/>
+          <!-- typedef size_t -->
+          <return type-id='type-id-57'/>
+        </function-decl>
+      </member-function>
+      <member-function access='private' vtable-offset='23'>
+        <!-- MallocExtension::Ownership MallocExtension::GetOwnership(void*) -->
+        <function-decl name='GetOwnership' mangled-name='_ZN15MallocExtension12GetOwnershipEPKv' filepath='src/malloc_extension.cc' line='187' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN15MallocExtension12GetOwnershipEPKv'>
+          <!-- implicit parameter of type 'MallocExtension*' -->
+          <parameter type-id='type-id-259' is-artificial='yes'/>
+          <!-- parameter of type 'void*' -->
+          <parameter type-id='type-id-53'/>
+          <!-- enum MallocExtension::Ownership -->
+          <return type-id='type-id-1298'/>
+        </function-decl>
+      </member-function>
+      <member-function access='private' vtable-offset='24'>
+        <!-- void MallocExtension::GetFreeListSizes(std::vector<MallocExtension::FreeListInfo, std::allocator<MallocExtension::FreeListInfo> >*) -->
+        <function-decl name='GetFreeListSizes' mangled-name='_ZN15MallocExtension16GetFreeListSizesEPSt6vectorINS_12FreeListInfoESaIS1_EE' filepath='src/malloc_extension.cc' line='191' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN15MallocExtension16GetFreeListSizesEPSt6vectorINS_12FreeListInfoESaIS1_EE'>
+          <!-- implicit parameter of type 'MallocExtension*' -->
+          <parameter type-id='type-id-259' is-artificial='yes'/>
+          <!-- parameter of type 'std::vector<MallocExtension::FreeListInfo, std::allocator<MallocExtension::FreeListInfo> >*' -->
+          <parameter type-id='type-id-1302'/>
+          <!-- void -->
+          <return type-id='type-id-56'/>
+        </function-decl>
+      </member-function>
+      <member-function access='private' vtable-offset='25'>
+        <!-- void** MallocExtension::ReadStackTraces(int*) -->
+        <function-decl name='ReadStackTraces' mangled-name='_ZN15MallocExtension15ReadStackTracesEPi' filepath='src/malloc_extension.cc' line='138' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN15MallocExtension15ReadStackTracesEPi'>
+          <!-- implicit parameter of type 'MallocExtension*' -->
+          <parameter type-id='type-id-259' is-artificial='yes'/>
+          <!-- parameter of type 'int*' -->
+          <parameter type-id='type-id-897'/>
+          <!-- void** -->
+          <return type-id='type-id-120'/>
+        </function-decl>
+      </member-function>
+      <member-function access='private' vtable-offset='26'>
+        <!-- void** MallocExtension::ReadHeapGrowthStackTraces() -->
+        <function-decl name='ReadHeapGrowthStackTraces' mangled-name='_ZN15MallocExtension25ReadHeapGrowthStackTracesEv' filepath='src/malloc_extension.cc' line='142' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN15MallocExtension25ReadHeapGrowthStackTracesEv'>
+          <!-- implicit parameter of type 'MallocExtension*' -->
+          <parameter type-id='type-id-259' is-artificial='yes'/>
+          <!-- void** -->
+          <return type-id='type-id-120'/>
+        </function-decl>
+      </member-function>
+    </class-decl>
     <!-- struct _IO_FILE -->
-    <class-decl name='_IO_FILE' size-in-bits='1728' is-struct='yes' visibility='default' filepath='/usr/include/libio.h' line='271' column='1' id='type-id-1302'>
+    <class-decl name='_IO_FILE' size-in-bits='1728' is-struct='yes' visibility='default' filepath='/usr/include/libio.h' line='271' column='1' id='type-id-1296'>
       <data-member access='public' layout-offset-in-bits='0'>
         <!-- int _IO_FILE::_flags -->
         <var-decl name='_flags' type-id='type-id-1' visibility='default' filepath='/usr/include/libio.h' line='272' column='1'/>
@@ -32584,11 +32537,11 @@
       </data-member>
       <data-member access='public' layout-offset-in-bits='768'>
         <!-- _IO_marker* _IO_FILE::_markers -->
-        <var-decl name='_markers' type-id='type-id-1304' visibility='default' filepath='/usr/include/libio.h' line='290' column='1'/>
+        <var-decl name='_markers' type-id='type-id-1303' visibility='default' filepath='/usr/include/libio.h' line='290' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='832'>
         <!-- _IO_FILE* _IO_FILE::_chain -->
-        <var-decl name='_chain' type-id='type-id-1305' visibility='default' filepath='/usr/include/libio.h' line='292' column='1'/>
+        <var-decl name='_chain' type-id='type-id-1304' visibility='default' filepath='/usr/include/libio.h' line='292' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='896'>
         <!-- int _IO_FILE::_fileno -->
@@ -32608,19 +32561,19 @@
       </data-member>
       <data-member access='public' layout-offset-in-bits='1040'>
         <!-- signed char _IO_FILE::_vtable_offset -->
-        <var-decl name='_vtable_offset' type-id='type-id-1259' visibility='default' filepath='/usr/include/libio.h' line='305' column='1'/>
+        <var-decl name='_vtable_offset' type-id='type-id-1253' visibility='default' filepath='/usr/include/libio.h' line='305' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1048'>
         <!-- char _IO_FILE::_shortbuf[1] -->
-        <var-decl name='_shortbuf' type-id='type-id-1244' visibility='default' filepath='/usr/include/libio.h' line='306' column='1'/>
+        <var-decl name='_shortbuf' type-id='type-id-1238' visibility='default' filepath='/usr/include/libio.h' line='306' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1088'>
         <!-- _IO_lock_t* _IO_FILE::_lock -->
-        <var-decl name='_lock' type-id='type-id-1306' visibility='default' filepath='/usr/include/libio.h' line='310' column='1'/>
+        <var-decl name='_lock' type-id='type-id-1305' visibility='default' filepath='/usr/include/libio.h' line='310' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1152'>
         <!-- __off64_t _IO_FILE::_offset -->
-        <var-decl name='_offset' type-id='type-id-951' visibility='default' filepath='/usr/include/libio.h' line='319' column='1'/>
+        <var-decl name='_offset' type-id='type-id-945' visibility='default' filepath='/usr/include/libio.h' line='319' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1216'>
         <!-- void* _IO_FILE::__pad1 -->
@@ -32648,44 +32601,82 @@
       </data-member>
       <data-member access='public' layout-offset-in-bits='1568'>
         <!-- char _IO_FILE::_unused2[20] -->
-        <var-decl name='_unused2' type-id='type-id-1246' visibility='default' filepath='/usr/include/libio.h' line='336' column='1'/>
+        <var-decl name='_unused2' type-id='type-id-1240' visibility='default' filepath='/usr/include/libio.h' line='336' column='1'/>
       </data-member>
     </class-decl>
     <!-- struct _IO_marker -->
-    <class-decl name='_IO_marker' size-in-bits='192' is-struct='yes' visibility='default' filepath='/usr/include/libio.h' line='186' column='1' id='type-id-1307'>
+    <class-decl name='_IO_marker' size-in-bits='192' is-struct='yes' visibility='default' filepath='/usr/include/libio.h' line='186' column='1' id='type-id-1306'>
       <data-member access='public' layout-offset-in-bits='0'>
         <!-- _IO_marker* _IO_marker::_next -->
-        <var-decl name='_next' type-id='type-id-1304' visibility='default' filepath='/usr/include/libio.h' line='187' column='1'/>
+        <var-decl name='_next' type-id='type-id-1303' visibility='default' filepath='/usr/include/libio.h' line='187' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
         <!-- _IO_FILE* _IO_marker::_sbuf -->
-        <var-decl name='_sbuf' type-id='type-id-1305' visibility='default' filepath='/usr/include/libio.h' line='188' column='1'/>
+        <var-decl name='_sbuf' type-id='type-id-1304' visibility='default' filepath='/usr/include/libio.h' line='188' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
         <!-- int _IO_marker::_pos -->
         <var-decl name='_pos' type-id='type-id-1' visibility='default' filepath='/usr/include/libio.h' line='192' column='1'/>
       </data-member>
     </class-decl>
+    <!-- class SysAllocator -->
+    <class-decl name='SysAllocator' size-in-bits='64' visibility='default' filepath='src/gperftools/malloc_extension.h' line='75' column='1' id='type-id-951'>
+      <member-function access='private' constructor='yes'>
+        <!-- SysAllocator::SysAllocator() -->
+        <function-decl name='SysAllocator' filepath='./src/gperftools/malloc_extension.h' line='77' column='1' visibility='default' binding='global' size-in-bits='64'>
+          <!-- implicit parameter of type 'SysAllocator*' -->
+          <parameter type-id='type-id-952' is-artificial='yes'/>
+          <!-- void -->
+          <return type-id='type-id-56'/>
+        </function-decl>
+      </member-function>
+      <member-function access='private' destructor='yes' vtable-offset='-1'>
+        <!-- SysAllocator::~SysAllocator(int) -->
+        <function-decl name='~SysAllocator' mangled-name='_ZN12SysAllocatorD1Ev' filepath='src/malloc_extension.cc' line='108' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN12SysAllocatorD1Ev'>
+          <!-- implicit parameter of type 'SysAllocator*' -->
+          <parameter type-id='type-id-952' is-artificial='yes'/>
+          <!-- artificial parameter of type 'int' -->
+          <parameter type-id='type-id-1' is-artificial='yes'/>
+          <!-- void -->
+          <return type-id='type-id-56'/>
+        </function-decl>
+      </member-function>
+      <member-function access='private' vtable-offset='2'>
+        <!-- void* SysAllocator::Alloc(size_t, size_t*, size_t) -->
+        <function-decl name='Alloc' mangled-name='_ZN12SysAllocator5AllocEmPmm' filepath='src/gperftools/malloc_extension.h' line='84' column='1' visibility='default' binding='global' size-in-bits='64'>
+          <!-- implicit parameter of type 'SysAllocator*' -->
+          <parameter type-id='type-id-952' is-artificial='yes'/>
+          <!-- parameter of type 'typedef size_t' -->
+          <parameter type-id='type-id-57'/>
+          <!-- parameter of type 'size_t*' -->
+          <parameter type-id='type-id-230'/>
+          <!-- parameter of type 'typedef size_t' -->
+          <parameter type-id='type-id-57'/>
+          <!-- void* -->
+          <return type-id='type-id-53'/>
+        </function-decl>
+      </member-function>
+    </class-decl>
     <!-- typedef long int __off_t -->
     <typedef-decl name='__off_t' type-id='type-id-285' filepath='/usr/include/bits/types.h' line='141' column='1' id='type-id-287'/>
     <!-- typedef void _IO_lock_t -->
-    <typedef-decl name='_IO_lock_t' type-id='type-id-56' filepath='/usr/include/libio.h' line='180' column='1' id='type-id-1308'/>
+    <typedef-decl name='_IO_lock_t' type-id='type-id-56' filepath='/usr/include/libio.h' line='180' column='1' id='type-id-1307'/>
     <!-- typedef long int __off64_t -->
-    <typedef-decl name='__off64_t' type-id='type-id-285' filepath='/usr/include/bits/types.h' line='142' column='1' id='type-id-951'/>
+    <typedef-decl name='__off64_t' type-id='type-id-285' filepath='/usr/include/bits/types.h' line='142' column='1' id='type-id-945'/>
     <!-- typedef __mbstate_t mbstate_t -->
-    <typedef-decl name='mbstate_t' type-id='type-id-1309' filepath='/usr/include/wchar.h' line='106' column='1' id='type-id-1310'/>
+    <typedef-decl name='mbstate_t' type-id='type-id-1308' filepath='/usr/include/wchar.h' line='106' column='1' id='type-id-1309'/>
     <!-- struct __mbstate_t -->
-    <class-decl name='__mbstate_t' size-in-bits='64' is-struct='yes' visibility='default' filepath='/usr/include/wchar.h' line='84' column='1' id='type-id-1309'>
+    <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-1308'>
       <member-type access='public'>
         <!-- union {unsigned int __wch; char __wchb[4];} -->
-        <union-decl name='__anonymous_union__' size-in-bits='32' is-anonymous='yes' visibility='default' filepath='/usr/include/wchar.h' line='87' column='1' id='type-id-1311'>
+        <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-1310'>
           <data-member access='private'>
             <!-- unsigned int __wch -->
-            <var-decl name='__wch' type-id='type-id-1123' visibility='default' filepath='/usr/include/wchar.h' line='89' column='1'/>
+            <var-decl name='__wch' type-id='type-id-1117' visibility='default' filepath='/usr/include/wchar.h' line='89' column='1'/>
           </data-member>
           <data-member access='private'>
             <!-- char __wchb[4] -->
-            <var-decl name='__wchb' type-id='type-id-1248' visibility='default' filepath='/usr/include/wchar.h' line='93' column='1'/>
+            <var-decl name='__wchb' type-id='type-id-1242' visibility='default' filepath='/usr/include/wchar.h' line='93' column='1'/>
           </data-member>
         </union-decl>
       </member-type>
@@ -32695,11 +32686,11 @@
       </data-member>
       <data-member access='public' layout-offset-in-bits='32'>
         <!-- union {unsigned int __wch; char __wchb[4];} __mbstate_t::__value -->
-        <var-decl name='__value' type-id='type-id-1311' visibility='default' filepath='/usr/include/wchar.h' line='94' column='1'/>
+        <var-decl name='__value' type-id='type-id-1310' visibility='default' filepath='/usr/include/wchar.h' line='94' column='1'/>
       </data-member>
     </class-decl>
     <!-- struct tm -->
-    <class-decl name='tm' size-in-bits='448' is-struct='yes' visibility='default' filepath='/usr/include/time.h' line='134' column='1' id='type-id-1312'>
+    <class-decl name='tm' size-in-bits='448' is-struct='yes' visibility='default' filepath='/usr/include/time.h' line='134' column='1' id='type-id-1311'>
       <data-member access='public' layout-offset-in-bits='0'>
         <!-- int tm::tm_sec -->
         <var-decl name='tm_sec' type-id='type-id-1' visibility='default' filepath='/usr/include/time.h' line='135' column='1'/>
@@ -32746,7 +32737,7 @@
       </data-member>
     </class-decl>
     <!-- struct lconv -->
-    <class-decl name='lconv' size-in-bits='768' is-struct='yes' visibility='default' filepath='/usr/include/locale.h' line='55' column='1' id='type-id-1313'>
+    <class-decl name='lconv' size-in-bits='768' is-struct='yes' visibility='default' filepath='/usr/include/locale.h' line='55' column='1' id='type-id-1312'>
       <data-member access='public' layout-offset-in-bits='0'>
         <!-- char* lconv::decimal_point -->
         <var-decl name='decimal_point' type-id='type-id-90' visibility='default' filepath='/usr/include/locale.h' line='58' column='1'/>
@@ -32849,23 +32840,23 @@
     <!-- typedef int int32_t -->
     <typedef-decl name='int32_t' type-id='type-id-1' filepath='/usr/include/stdint.h' line='39' column='1' id='type-id-114'/>
     <!-- typedef long int int64_t -->
-    <typedef-decl name='int64_t' type-id='type-id-285' filepath='/usr/include/stdint.h' line='41' column='1' id='type-id-1314'/>
+    <typedef-decl name='int64_t' type-id='type-id-285' filepath='/usr/include/stdint.h' line='41' column='1' id='type-id-1313'/>
     <!-- typedef unsigned long int uint64_t -->
     <typedef-decl name='uint64_t' type-id='type-id-5' filepath='/usr/include/stdint.h' line='56' column='1' id='type-id-15'/>
     <!-- typedef uintptr_t Length -->
-    <typedef-decl name='Length' type-id='type-id-130' filepath='src/common.h' line='59' column='1' id='type-id-1138'/>
+    <typedef-decl name='Length' type-id='type-id-130' filepath='src/common.h' line='59' column='1' id='type-id-1132'/>
     <!-- typedef unsigned long int uintptr_t -->
     <typedef-decl name='uintptr_t' type-id='type-id-5' filepath='/usr/include/stdint.h' line='123' column='1' id='type-id-130'/>
     <!-- typedef uint64_t uint64 -->
     <typedef-decl name='uint64' type-id='type-id-15' filepath='src/base/basictypes.h' line='72' column='1' id='type-id-94'/>
     <!-- typedef int64_t int64 -->
-    <typedef-decl name='int64' type-id='type-id-1314' filepath='src/base/basictypes.h' line='61' column='1' id='type-id-76'/>
+    <typedef-decl name='int64' type-id='type-id-1313' filepath='src/base/basictypes.h' line='61' column='1' id='type-id-76'/>
     <!-- typedef int32_t int32 -->
     <typedef-decl name='int32' type-id='type-id-114' filepath='src/base/basictypes.h' line='60' column='1' id='type-id-65'/>
     <!-- typedef uintptr_t PageID -->
-    <typedef-decl name='PageID' type-id='type-id-130' filepath='src/common.h' line='56' column='1' id='type-id-1137'/>
+    <typedef-decl name='PageID' type-id='type-id-130' filepath='src/common.h' line='56' column='1' id='type-id-1131'/>
     <!-- class SpinLockHolder -->
-    <class-decl name='SpinLockHolder' size-in-bits='64' visibility='default' filepath='src/base/spinlock.h' line='130' column='1' id='type-id-1315'>
+    <class-decl name='SpinLockHolder' size-in-bits='64' visibility='default' filepath='src/base/spinlock.h' line='130' column='1' id='type-id-1314'>
       <data-member access='private' layout-offset-in-bits='0'>
         <!-- SpinLock* SpinLockHolder::lock_ -->
         <var-decl name='lock_' type-id='type-id-254' visibility='default' filepath='src/base/spinlock.h' line='132' column='1'/>
@@ -32874,7 +32865,7 @@
         <!-- SpinLockHolder::SpinLockHolder(SpinLock*) -->
         <function-decl name='SpinLockHolder' mangled-name='_ZN14SpinLockHolderC2EP8SpinLock' filepath='src/base/spinlock.h' line='134' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN14SpinLockHolderC2EP8SpinLock'>
           <!-- implicit parameter of type 'SpinLockHolder*' -->
-          <parameter type-id='type-id-1316' is-artificial='yes'/>
+          <parameter type-id='type-id-1315' is-artificial='yes'/>
           <!-- parameter of type 'SpinLock*' -->
           <parameter type-id='type-id-254'/>
           <!-- void -->
@@ -32885,7 +32876,7 @@
         <!-- SpinLockHolder::~SpinLockHolder(int) -->
         <function-decl name='~SpinLockHolder' mangled-name='_ZN14SpinLockHolderD1Ev' filepath='src/base/spinlock.h' line='140' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN14SpinLockHolderD1Ev'>
           <!-- implicit parameter of type 'SpinLockHolder*' -->
-          <parameter type-id='type-id-1316' is-artificial='yes'/>
+          <parameter type-id='type-id-1315' is-artificial='yes'/>
           <!-- artificial parameter of type 'int' -->
           <parameter type-id='type-id-1' is-artificial='yes'/>
           <!-- void -->
@@ -32894,46 +32885,46 @@
       </member-function>
     </class-decl>
     <!-- class MallocHook -->
-    <class-decl name='MallocHook' size-in-bits='8' visibility='default' filepath='./src/gperftools/malloc_hook.h' line='98' column='1' id='type-id-1317'>
+    <class-decl name='MallocHook' size-in-bits='8' visibility='default' filepath='./src/gperftools/malloc_hook.h' line='98' column='1' id='type-id-1316'>
       <member-type access='private'>
         <!-- typedef MallocHook_PreMmapHook MallocHook::PreMmapHook -->
-        <typedef-decl name='PreMmapHook' type-id='type-id-905' filepath='./src/gperftools/malloc_hook.h' line='126' column='1' id='type-id-1318'/>
+        <typedef-decl name='PreMmapHook' type-id='type-id-899' filepath='./src/gperftools/malloc_hook.h' line='126' column='1' id='type-id-1317'/>
       </member-type>
       <member-type access='private'>
         <!-- typedef MallocHook_MmapReplacement MallocHook::MmapReplacement -->
-        <typedef-decl name='MmapReplacement' type-id='type-id-907' filepath='./src/gperftools/malloc_hook.h' line='150' column='1' id='type-id-1319'/>
+        <typedef-decl name='MmapReplacement' type-id='type-id-901' filepath='./src/gperftools/malloc_hook.h' line='150' column='1' id='type-id-1318'/>
       </member-type>
       <member-type access='private'>
         <!-- typedef MallocHook_MunmapReplacement MallocHook::MunmapReplacement -->
-        <typedef-decl name='MunmapReplacement' type-id='type-id-909' filepath='./src/gperftools/malloc_hook.h' line='192' column='1' id='type-id-1320'/>
+        <typedef-decl name='MunmapReplacement' type-id='type-id-903' filepath='./src/gperftools/malloc_hook.h' line='192' column='1' id='type-id-1319'/>
       </member-type>
       <member-type access='private'>
         <!-- typedef MallocHook_MunmapHook MallocHook::MunmapHook -->
-        <typedef-decl name='MunmapHook' type-id='type-id-910' filepath='./src/gperftools/malloc_hook.h' line='204' column='1' id='type-id-1321'/>
+        <typedef-decl name='MunmapHook' type-id='type-id-904' filepath='./src/gperftools/malloc_hook.h' line='204' column='1' id='type-id-1320'/>
       </member-type>
       <member-type access='private'>
         <!-- typedef MallocHook_MremapHook MallocHook::MremapHook -->
-        <typedef-decl name='MremapHook' type-id='type-id-912' filepath='./src/gperftools/malloc_hook.h' line='214' column='1' id='type-id-1322'/>
+        <typedef-decl name='MremapHook' type-id='type-id-906' filepath='./src/gperftools/malloc_hook.h' line='214' column='1' id='type-id-1321'/>
       </member-type>
       <member-type access='private'>
         <!-- typedef MallocHook_PreSbrkHook MallocHook::PreSbrkHook -->
-        <typedef-decl name='PreSbrkHook' type-id='type-id-914' filepath='./src/gperftools/malloc_hook.h' line='234' column='1' id='type-id-1323'/>
+        <typedef-decl name='PreSbrkHook' type-id='type-id-908' filepath='./src/gperftools/malloc_hook.h' line='234' column='1' id='type-id-1322'/>
       </member-type>
       <member-type access='private'>
         <!-- typedef MallocHook_NewHook MallocHook::NewHook -->
-        <typedef-decl name='NewHook' type-id='type-id-364' filepath='./src/gperftools/malloc_hook.h' line='102' column='1' id='type-id-1324'/>
+        <typedef-decl name='NewHook' type-id='type-id-364' filepath='./src/gperftools/malloc_hook.h' line='102' column='1' id='type-id-1323'/>
       </member-type>
       <member-type access='private'>
         <!-- typedef MallocHook_DeleteHook MallocHook::DeleteHook -->
-        <typedef-decl name='DeleteHook' type-id='type-id-365' filepath='./src/gperftools/malloc_hook.h' line='113' column='1' id='type-id-1325'/>
+        <typedef-decl name='DeleteHook' type-id='type-id-365' filepath='./src/gperftools/malloc_hook.h' line='113' column='1' id='type-id-1324'/>
       </member-type>
       <member-type access='private'>
         <!-- typedef MallocHook_MmapHook MallocHook::MmapHook -->
-        <typedef-decl name='MmapHook' type-id='type-id-367' filepath='./src/gperftools/malloc_hook.h' line='168' column='1' id='type-id-1326'/>
+        <typedef-decl name='MmapHook' type-id='type-id-367' filepath='./src/gperftools/malloc_hook.h' line='168' column='1' id='type-id-1325'/>
       </member-type>
       <member-type access='private'>
         <!-- typedef MallocHook_SbrkHook MallocHook::SbrkHook -->
-        <typedef-decl name='SbrkHook' type-id='type-id-369' filepath='./src/gperftools/malloc_hook.h' line='247' column='1' id='type-id-1327'/>
+        <typedef-decl name='SbrkHook' type-id='type-id-369' filepath='./src/gperftools/malloc_hook.h' line='247' column='1' id='type-id-1326'/>
       </member-type>
       <member-function access='private' static='yes'>
         <!-- void MallocHook::InvokeNewHook(size_t) -->
@@ -32959,7 +32950,7 @@
         <!-- bool MallocHook::AddNewHook() -->
         <function-decl name='AddNewHook' mangled-name='_ZN10MallocHook10AddNewHookEPFvPKvmE' filepath='./src/gperftools/malloc_hook.h' line='103' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- parameter of type 'typedef MallocHook::NewHook' -->
-          <parameter type-id='type-id-1324'/>
+          <parameter type-id='type-id-1323'/>
           <!-- bool -->
           <return type-id='type-id-55'/>
         </function-decl>
@@ -32968,7 +32959,7 @@
         <!-- bool MallocHook::RemoveNewHook() -->
         <function-decl name='RemoveNewHook' mangled-name='_ZN10MallocHook13RemoveNewHookEPFvPKvmE' filepath='./src/gperftools/malloc_hook.h' line='106' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- parameter of type 'typedef MallocHook::NewHook' -->
-          <parameter type-id='type-id-1324'/>
+          <parameter type-id='type-id-1323'/>
           <!-- bool -->
           <return type-id='type-id-55'/>
         </function-decl>
@@ -32977,7 +32968,7 @@
         <!-- bool MallocHook::AddDeleteHook() -->
         <function-decl name='AddDeleteHook' mangled-name='_ZN10MallocHook13AddDeleteHookEPFvPKvE' filepath='./src/gperftools/malloc_hook.h' line='114' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- parameter of type 'typedef MallocHook::DeleteHook' -->
-          <parameter type-id='type-id-1325'/>
+          <parameter type-id='type-id-1324'/>
           <!-- bool -->
           <return type-id='type-id-55'/>
         </function-decl>
@@ -32986,7 +32977,7 @@
         <!-- bool MallocHook::RemoveDeleteHook() -->
         <function-decl name='RemoveDeleteHook' mangled-name='_ZN10MallocHook16RemoveDeleteHookEPFvPKvE' filepath='./src/gperftools/malloc_hook.h' line='117' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- parameter of type 'typedef MallocHook::DeleteHook' -->
-          <parameter type-id='type-id-1325'/>
+          <parameter type-id='type-id-1324'/>
           <!-- bool -->
           <return type-id='type-id-55'/>
         </function-decl>
@@ -32995,53 +32986,53 @@
         <!-- MallocHook::NewHook MallocHook::GetNewHook() -->
         <function-decl name='GetNewHook' mangled-name='_ZN10MallocHook10GetNewHookEv' filepath='./src/gperftools/malloc_hook.h' line='275' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- typedef MallocHook::NewHook -->
-          <return type-id='type-id-1324'/>
+          <return type-id='type-id-1323'/>
         </function-decl>
       </member-function>
       <member-function access='private' static='yes'>
         <!-- MallocHook::NewHook MallocHook::SetNewHook() -->
         <function-decl name='SetNewHook' mangled-name='_ZN10MallocHook10SetNewHookEPFvPKvmE' filepath='./src/gperftools/malloc_hook.h' line='276' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- parameter of type 'typedef MallocHook::NewHook' -->
-          <parameter type-id='type-id-1324'/>
+          <parameter type-id='type-id-1323'/>
           <!-- typedef MallocHook::NewHook -->
-          <return type-id='type-id-1324'/>
+          <return type-id='type-id-1323'/>
         </function-decl>
       </member-function>
       <member-function access='private' static='yes'>
         <!-- MallocHook::DeleteHook MallocHook::GetDeleteHook() -->
         <function-decl name='GetDeleteHook' mangled-name='_ZN10MallocHook13GetDeleteHookEv' filepath='./src/gperftools/malloc_hook.h' line='280' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- typedef MallocHook::DeleteHook -->
-          <return type-id='type-id-1325'/>
+          <return type-id='type-id-1324'/>
         </function-decl>
       </member-function>
       <member-function access='private' static='yes'>
         <!-- MallocHook::DeleteHook MallocHook::SetDeleteHook() -->
         <function-decl name='SetDeleteHook' mangled-name='_ZN10MallocHook13SetDeleteHookEPFvPKvE' filepath='./src/gperftools/malloc_hook.h' line='281' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- parameter of type 'typedef MallocHook::DeleteHook' -->
-          <parameter type-id='type-id-1325'/>
+          <parameter type-id='type-id-1324'/>
           <!-- typedef MallocHook::DeleteHook -->
-          <return type-id='type-id-1325'/>
+          <return type-id='type-id-1324'/>
         </function-decl>
       </member-function>
       <member-function access='private' static='yes'>
         <!-- MallocHook::MmapHook MallocHook::GetMmapHook() -->
         <function-decl name='GetMmapHook' mangled-name='_ZN10MallocHook11GetMmapHookEv' filepath='./src/gperftools/malloc_hook.h' line='290' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- typedef MallocHook::MmapHook -->
-          <return type-id='type-id-1326'/>
+          <return type-id='type-id-1325'/>
         </function-decl>
       </member-function>
       <member-function access='private' static='yes'>
         <!-- MallocHook::SbrkHook MallocHook::GetSbrkHook() -->
         <function-decl name='GetSbrkHook' mangled-name='_ZN10MallocHook11GetSbrkHookEv' filepath='./src/gperftools/malloc_hook.h' line='310' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- typedef MallocHook::SbrkHook -->
-          <return type-id='type-id-1327'/>
+          <return type-id='type-id-1326'/>
         </function-decl>
       </member-function>
       <member-function access='private' static='yes'>
         <!-- bool MallocHook::RemovePreMmapHook() -->
         <function-decl name='RemovePreMmapHook' mangled-name='_ZN10MallocHook17RemovePreMmapHookEPFvPKvmiiilE' filepath='./src/gperftools/malloc_hook.h' line='130' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- parameter of type 'typedef MallocHook::PreMmapHook' -->
-          <parameter type-id='type-id-1318'/>
+          <parameter type-id='type-id-1317'/>
           <!-- bool -->
           <return type-id='type-id-55'/>
         </function-decl>
@@ -33154,7 +33145,7 @@
         <!-- bool MallocHook::RemovePreSbrkHook() -->
         <function-decl name='RemovePreSbrkHook' mangled-name='_ZN10MallocHook17RemovePreSbrkHookEPFvlE' filepath='./src/gperftools/malloc_hook.h' line='238' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- parameter of type 'typedef MallocHook::PreSbrkHook' -->
-          <parameter type-id='type-id-1323'/>
+          <parameter type-id='type-id-1322'/>
           <!-- bool -->
           <return type-id='type-id-55'/>
         </function-decl>
@@ -33370,7 +33361,7 @@
         <!-- bool MallocHook::AddMmapHook() -->
         <function-decl name='AddMmapHook' mangled-name='_ZN10MallocHook11AddMmapHookEPFvPKvS1_miiilE' filepath='./src/gperftools/malloc_hook.h' line='169' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- parameter of type 'typedef MallocHook::MmapHook' -->
-          <parameter type-id='type-id-1326'/>
+          <parameter type-id='type-id-1325'/>
           <!-- bool -->
           <return type-id='type-id-55'/>
         </function-decl>
@@ -33379,7 +33370,7 @@
         <!-- bool MallocHook::RemoveMmapHook() -->
         <function-decl name='RemoveMmapHook' mangled-name='_ZN10MallocHook14RemoveMmapHookEPFvPKvS1_miiilE' filepath='./src/gperftools/malloc_hook.h' line='172' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- parameter of type 'typedef MallocHook::MmapHook' -->
-          <parameter type-id='type-id-1326'/>
+          <parameter type-id='type-id-1325'/>
           <!-- bool -->
           <return type-id='type-id-55'/>
         </function-decl>
@@ -33388,7 +33379,7 @@
         <!-- bool MallocHook::AddMunmapHook() -->
         <function-decl name='AddMunmapHook' mangled-name='_ZN10MallocHook13AddMunmapHookEPFvPKvmE' filepath='./src/gperftools/malloc_hook.h' line='205' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- parameter of type 'typedef MallocHook::MunmapHook' -->
-          <parameter type-id='type-id-1321'/>
+          <parameter type-id='type-id-1320'/>
           <!-- bool -->
           <return type-id='type-id-55'/>
         </function-decl>
@@ -33397,7 +33388,7 @@
         <!-- bool MallocHook::RemoveMunmapHook() -->
         <function-decl name='RemoveMunmapHook' mangled-name='_ZN10MallocHook16RemoveMunmapHookEPFvPKvmE' filepath='./src/gperftools/malloc_hook.h' line='208' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- parameter of type 'typedef MallocHook::MunmapHook' -->
-          <parameter type-id='type-id-1321'/>
+          <parameter type-id='type-id-1320'/>
           <!-- bool -->
           <return type-id='type-id-55'/>
         </function-decl>
@@ -33406,7 +33397,7 @@
         <!-- bool MallocHook::AddMremapHook() -->
         <function-decl name='AddMremapHook' mangled-name='_ZN10MallocHook13AddMremapHookEPFvPKvS1_mmiS1_E' filepath='./src/gperftools/malloc_hook.h' line='215' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- parameter of type 'typedef MallocHook::MremapHook' -->
-          <parameter type-id='type-id-1322'/>
+          <parameter type-id='type-id-1321'/>
           <!-- bool -->
           <return type-id='type-id-55'/>
         </function-decl>
@@ -33415,7 +33406,7 @@
         <!-- bool MallocHook::RemoveMremapHook() -->
         <function-decl name='RemoveMremapHook' mangled-name='_ZN10MallocHook16RemoveMremapHookEPFvPKvS1_mmiS1_E' filepath='./src/gperftools/malloc_hook.h' line='218' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- parameter of type 'typedef MallocHook::MremapHook' -->
-          <parameter type-id='type-id-1322'/>
+          <parameter type-id='type-id-1321'/>
           <!-- bool -->
           <return type-id='type-id-55'/>
         </function-decl>
@@ -33424,7 +33415,7 @@
         <!-- bool MallocHook::AddSbrkHook() -->
         <function-decl name='AddSbrkHook' mangled-name='_ZN10MallocHook11AddSbrkHookEPFvPKvlE' filepath='./src/gperftools/malloc_hook.h' line='248' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- parameter of type 'typedef MallocHook::SbrkHook' -->
-          <parameter type-id='type-id-1327'/>
+          <parameter type-id='type-id-1326'/>
           <!-- bool -->
           <return type-id='type-id-55'/>
         </function-decl>
@@ -33433,24 +33424,24 @@
         <!-- bool MallocHook::RemoveSbrkHook() -->
         <function-decl name='RemoveSbrkHook' mangled-name='_ZN10MallocHook14RemoveSbrkHookEPFvPKvlE' filepath='./src/gperftools/malloc_hook.h' line='251' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- parameter of type 'typedef MallocHook::SbrkHook' -->
-          <parameter type-id='type-id-1327'/>
+          <parameter type-id='type-id-1326'/>
           <!-- bool -->
           <return type-id='type-id-55'/>
         </function-decl>
       </member-function>
     </class-decl>
     <!-- typedef unsigned int uint32_t -->
-    <typedef-decl name='uint32_t' type-id='type-id-1123' filepath='/usr/include/stdint.h' line='52' column='1' id='type-id-12'/>
+    <typedef-decl name='uint32_t' type-id='type-id-1117' filepath='/usr/include/stdint.h' line='52' column='1' id='type-id-12'/>
     <!-- typedef unsigned int pthread_key_t -->
-    <typedef-decl name='pthread_key_t' type-id='type-id-1123' filepath='/usr/include/bits/pthreadtypes.h' line='140' column='1' id='type-id-953'/>
+    <typedef-decl name='pthread_key_t' type-id='type-id-1117' filepath='/usr/include/bits/pthreadtypes.h' line='140' column='1' id='type-id-946'/>
     <!-- typedef __ssize_t ssize_t -->
-    <typedef-decl name='ssize_t' type-id='type-id-1328' filepath='/usr/include/stdio.h' line='103' column='1' id='type-id-255'/>
+    <typedef-decl name='ssize_t' type-id='type-id-1327' filepath='/usr/include/stdio.h' line='103' column='1' id='type-id-255'/>
     <!-- typedef long int __ssize_t -->
-    <typedef-decl name='__ssize_t' type-id='type-id-285' filepath='/usr/include/bits/types.h' line='180' column='1' id='type-id-1328'/>
+    <typedef-decl name='__ssize_t' type-id='type-id-285' filepath='/usr/include/bits/types.h' line='180' column='1' id='type-id-1327'/>
     <!-- typedef unsigned long int pthread_t -->
     <typedef-decl name='pthread_t' type-id='type-id-5' filepath='/usr/include/bits/pthreadtypes.h' line='50' column='1' id='type-id-177'/>
     <!-- struct TCMallocStats -->
-    <class-decl name='TCMallocStats' size-in-bits='512' is-struct='yes' visibility='default' filepath='src/tcmalloc.cc' line='295' column='1' id='type-id-1329'>
+    <class-decl name='TCMallocStats' size-in-bits='512' is-struct='yes' visibility='default' filepath='src/tcmalloc.cc' line='295' column='1' id='type-id-1328'>
       <data-member access='public' layout-offset-in-bits='0'>
         <!-- uint64_t TCMallocStats::thread_bytes -->
         <var-decl name='thread_bytes' type-id='type-id-15' visibility='default' filepath='src/tcmalloc.cc' line='296' column='1'/>
@@ -33469,7 +33460,7 @@
       </data-member>
       <data-member access='public' layout-offset-in-bits='256'>
         <!-- tcmalloc::PageHeap::Stats TCMallocStats::pageheap -->
-        <var-decl name='pageheap' type-id='type-id-1330' visibility='default' filepath='src/tcmalloc.cc' line='300' column='1'/>
+        <var-decl name='pageheap' type-id='type-id-1329' visibility='default' filepath='src/tcmalloc.cc' line='300' column='1'/>
       </data-member>
     </class-decl>
     <!-- typedef intptr_t AtomicWord -->
@@ -33477,12 +33468,12 @@
     <!-- typedef long int intptr_t -->
     <typedef-decl name='intptr_t' type-id='type-id-285' filepath='/usr/include/stdint.h' line='120' column='1' id='type-id-73'/>
     <!-- class TCMallocImplementation -->
-    <class-decl name='TCMallocImplementation' size-in-bits='128' visibility='default' filepath='src/tcmalloc.cc' line='562' column='1' id='type-id-1331'>
+    <class-decl name='TCMallocImplementation' size-in-bits='128' visibility='default' filepath='src/tcmalloc.cc' line='562' column='1' id='type-id-1330'>
       <!-- class MallocExtension -->
       <base-class access='public' layout-offset-in-bits='0' type-id='type-id-894'/>
       <member-type access='private'>
         <!-- typedef void (void*, const base::MallocRange*) TCMallocImplementation::RangeFunction -->
-        <typedef-decl name='RangeFunction' type-id='type-id-900' filepath='./src/gperftools/malloc_extension.h' line='143' column='1' id='type-id-1332'/>
+        <typedef-decl name='RangeFunction' type-id='type-id-1300' filepath='./src/gperftools/malloc_extension.h' line='143' column='1' id='type-id-1331'/>
       </member-type>
       <data-member access='private' layout-offset-in-bits='64'>
         <!-- size_t TCMallocImplementation::extra_bytes_released_ -->
@@ -33492,7 +33483,7 @@
         <!-- TCMallocImplementation::TCMallocImplementation() -->
         <function-decl name='TCMallocImplementation' filepath='src/tcmalloc.cc' line='573' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'TCMallocImplementation*' -->
-          <parameter type-id='type-id-1333' is-artificial='yes'/>
+          <parameter type-id='type-id-1332' is-artificial='yes'/>
           <!-- void -->
           <return type-id='type-id-56'/>
         </function-decl>
@@ -33501,7 +33492,7 @@
         <!-- void TCMallocImplementation::GetStats(char*, int) -->
         <function-decl name='GetStats' mangled-name='_ZN22TCMallocImplementation8GetStatsEPci' filepath='src/tcmalloc.cc' line='577' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN22TCMallocImplementation8GetStatsEPci'>
           <!-- implicit parameter of type 'TCMallocImplementation*' -->
-          <parameter type-id='type-id-1333' is-artificial='yes'/>
+          <parameter type-id='type-id-1332' is-artificial='yes'/>
           <!-- parameter of type 'char*' -->
           <parameter type-id='type-id-90'/>
           <!-- parameter of type 'int' -->
@@ -33514,9 +33505,9 @@
         <!-- void TCMallocImplementation::GetHeapSample(MallocExtensionWriter*) -->
         <function-decl name='GetHeapSample' mangled-name='_ZN22TCMallocImplementation13GetHeapSampleEPSs' filepath='src/tcmalloc.cc' line='590' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN22TCMallocImplementation13GetHeapSampleEPSs'>
           <!-- implicit parameter of type 'TCMallocImplementation*' -->
-          <parameter type-id='type-id-1333' is-artificial='yes'/>
+          <parameter type-id='type-id-1332' is-artificial='yes'/>
           <!-- parameter of type 'MallocExtensionWriter*' -->
-          <parameter type-id='type-id-901'/>
+          <parameter type-id='type-id-1301'/>
           <!-- void -->
           <return type-id='type-id-56'/>
         </function-decl>
@@ -33525,11 +33516,11 @@
         <!-- void TCMallocImplementation::Ranges(void*, TCMallocImplementation::RangeFunction*) -->
         <function-decl name='Ranges' mangled-name='_ZN22TCMallocImplementation6RangesEPvPFvS0_PKN4base11MallocRangeEE' filepath='src/tcmalloc.cc' line='622' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN22TCMallocImplementation6RangesEPvPFvS0_PKN4base11MallocRangeEE'>
           <!-- implicit parameter of type 'TCMallocImplementation*' -->
-          <parameter type-id='type-id-1333' is-artificial='yes'/>
+          <parameter type-id='type-id-1332' is-artificial='yes'/>
           <!-- parameter of type 'void*' -->
           <parameter type-id='type-id-53'/>
           <!-- parameter of type 'TCMallocImplementation::RangeFunction*' -->
-          <parameter type-id='type-id-1334'/>
+          <parameter type-id='type-id-1333'/>
           <!-- void -->
           <return type-id='type-id-56'/>
         </function-decl>
@@ -33538,7 +33529,7 @@
         <!-- bool TCMallocImplementation::GetNumericProperty(const char*, size_t*) -->
         <function-decl name='GetNumericProperty' mangled-name='_ZN22TCMallocImplementation18GetNumericPropertyEPKcPm' filepath='src/tcmalloc.cc' line='626' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN22TCMallocImplementation18GetNumericPropertyEPKcPm'>
           <!-- implicit parameter of type 'TCMallocImplementation*' -->
-          <parameter type-id='type-id-1333' is-artificial='yes'/>
+          <parameter type-id='type-id-1332' is-artificial='yes'/>
           <!-- parameter of type 'const char*' -->
           <parameter type-id='type-id-52'/>
           <!-- parameter of type 'size_t*' -->
@@ -33551,7 +33542,7 @@
         <!-- bool TCMallocImplementation::SetNumericProperty(const char*, size_t) -->
         <function-decl name='SetNumericProperty' mangled-name='_ZN22TCMallocImplementation18SetNumericPropertyEPKcm' filepath='src/tcmalloc.cc' line='711' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN22TCMallocImplementation18SetNumericPropertyEPKcm'>
           <!-- implicit parameter of type 'TCMallocImplementation*' -->
-          <parameter type-id='type-id-1333' is-artificial='yes'/>
+          <parameter type-id='type-id-1332' is-artificial='yes'/>
           <!-- parameter of type 'const char*' -->
           <parameter type-id='type-id-52'/>
           <!-- parameter of type 'typedef size_t' -->
@@ -33564,7 +33555,7 @@
         <!-- void TCMallocImplementation::MarkThreadIdle() -->
         <function-decl name='MarkThreadIdle' mangled-name='_ZN22TCMallocImplementation14MarkThreadIdleEv' filepath='src/tcmalloc.cc' line='728' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN22TCMallocImplementation14MarkThreadIdleEv'>
           <!-- implicit parameter of type 'TCMallocImplementation*' -->
-          <parameter type-id='type-id-1333' is-artificial='yes'/>
+          <parameter type-id='type-id-1332' is-artificial='yes'/>
           <!-- void -->
           <return type-id='type-id-56'/>
         </function-decl>
@@ -33573,7 +33564,7 @@
         <!-- void TCMallocImplementation::MarkThreadBusy() -->
         <function-decl name='MarkThreadBusy' mangled-name='_ZN22TCMallocImplementation14MarkThreadBusyEv' filepath='src/tcmalloc.cc' line='1537' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN22TCMallocImplementation14MarkThreadBusyEv'>
           <!-- implicit parameter of type 'TCMallocImplementation*' -->
-          <parameter type-id='type-id-1333' is-artificial='yes'/>
+          <parameter type-id='type-id-1332' is-artificial='yes'/>
           <!-- void -->
           <return type-id='type-id-56'/>
         </function-decl>
@@ -33582,18 +33573,18 @@
         <!-- SysAllocator* TCMallocImplementation::GetSystemAllocator() -->
         <function-decl name='GetSystemAllocator' mangled-name='_ZN22TCMallocImplementation18GetSystemAllocatorEv' filepath='src/tcmalloc.cc' line='734' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN22TCMallocImplementation18GetSystemAllocatorEv'>
           <!-- implicit parameter of type 'TCMallocImplementation*' -->
-          <parameter type-id='type-id-1333' is-artificial='yes'/>
+          <parameter type-id='type-id-1332' is-artificial='yes'/>
           <!-- SysAllocator* -->
-          <return type-id='type-id-902'/>
+          <return type-id='type-id-952'/>
         </function-decl>
       </member-function>
       <member-function access='private' vtable-offset='16'>
         <!-- void TCMallocImplementation::SetSystemAllocator(SysAllocator*) -->
         <function-decl name='SetSystemAllocator' mangled-name='_ZN22TCMallocImplementation18SetSystemAllocatorEP12SysAllocator' filepath='src/tcmalloc.cc' line='739' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN22TCMallocImplementation18SetSystemAllocatorEP12SysAllocator'>
           <!-- implicit parameter of type 'TCMallocImplementation*' -->
-          <parameter type-id='type-id-1333' is-artificial='yes'/>
+          <parameter type-id='type-id-1332' is-artificial='yes'/>
           <!-- parameter of type 'SysAllocator*' -->
-          <parameter type-id='type-id-902'/>
+          <parameter type-id='type-id-952'/>
           <!-- void -->
           <return type-id='type-id-56'/>
         </function-decl>
@@ -33602,7 +33593,7 @@
         <!-- void TCMallocImplementation::ReleaseToSystem(size_t) -->
         <function-decl name='ReleaseToSystem' mangled-name='_ZN22TCMallocImplementation15ReleaseToSystemEm' filepath='src/tcmalloc.cc' line='744' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN22TCMallocImplementation15ReleaseToSystemEm'>
           <!-- implicit parameter of type 'TCMallocImplementation*' -->
-          <parameter type-id='type-id-1333' is-artificial='yes'/>
+          <parameter type-id='type-id-1332' is-artificial='yes'/>
           <!-- parameter of type 'typedef size_t' -->
           <parameter type-id='type-id-57'/>
           <!-- void -->
@@ -33613,7 +33604,7 @@
         <!-- void TCMallocImplementation::SetMemoryReleaseRate(double) -->
         <function-decl name='SetMemoryReleaseRate' mangled-name='_ZN22TCMallocImplementation20SetMemoryReleaseRateEd' filepath='src/tcmalloc.cc' line='769' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN22TCMallocImplementation20SetMemoryReleaseRateEd'>
           <!-- implicit parameter of type 'TCMallocImplementation*' -->
-          <parameter type-id='type-id-1333' is-artificial='yes'/>
+          <parameter type-id='type-id-1332' is-artificial='yes'/>
           <!-- parameter of type 'double' -->
           <parameter type-id='type-id-2'/>
           <!-- void -->
@@ -33624,7 +33615,7 @@
         <!-- double TCMallocImplementation::GetMemoryReleaseRate() -->
         <function-decl name='GetMemoryReleaseRate' mangled-name='_ZN22TCMallocImplementation20GetMemoryReleaseRateEv' filepath='src/tcmalloc.cc' line='773' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN22TCMallocImplementation20GetMemoryReleaseRateEv'>
           <!-- implicit parameter of type 'TCMallocImplementation*' -->
-          <parameter type-id='type-id-1333' is-artificial='yes'/>
+          <parameter type-id='type-id-1332' is-artificial='yes'/>
           <!-- double -->
           <return type-id='type-id-2'/>
         </function-decl>
@@ -33633,7 +33624,7 @@
         <!-- size_t TCMallocImplementation::GetEstimatedAllocatedSize(size_t) -->
         <function-decl name='GetEstimatedAllocatedSize' mangled-name='_ZN22TCMallocImplementation25GetEstimatedAllocatedSizeEm' filepath='src/tcmalloc.cc' line='776' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN22TCMallocImplementation25GetEstimatedAllocatedSizeEm'>
           <!-- implicit parameter of type 'TCMallocImplementation*' -->
-          <parameter type-id='type-id-1333' is-artificial='yes'/>
+          <parameter type-id='type-id-1332' is-artificial='yes'/>
           <!-- parameter of type 'typedef size_t' -->
           <parameter type-id='type-id-57'/>
           <!-- typedef size_t -->
@@ -33644,7 +33635,7 @@
         <!-- size_t TCMallocImplementation::GetAllocatedSize(void*) -->
         <function-decl name='GetAllocatedSize' mangled-name='_ZN22TCMallocImplementation16GetAllocatedSizeEPKv' filepath='src/tcmalloc.cc' line='1529' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN22TCMallocImplementation16GetAllocatedSizeEPKv'>
           <!-- implicit parameter of type 'TCMallocImplementation*' -->
-          <parameter type-id='type-id-1333' is-artificial='yes'/>
+          <parameter type-id='type-id-1332' is-artificial='yes'/>
           <!-- parameter of type 'void*' -->
           <parameter type-id='type-id-53'/>
           <!-- typedef size_t -->
@@ -33655,20 +33646,20 @@
         <!-- MallocExtension::Ownership TCMallocImplementation::GetOwnership(void*) -->
         <function-decl name='GetOwnership' mangled-name='_ZN22TCMallocImplementation12GetOwnershipEPKv' filepath='src/tcmalloc.cc' line='794' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN22TCMallocImplementation12GetOwnershipEPKv'>
           <!-- implicit parameter of type 'TCMallocImplementation*' -->
-          <parameter type-id='type-id-1333' is-artificial='yes'/>
+          <parameter type-id='type-id-1332' is-artificial='yes'/>
           <!-- parameter of type 'void*' -->
           <parameter type-id='type-id-53'/>
           <!-- enum MallocExtension::Ownership -->
-          <return type-id='type-id-898'/>
+          <return type-id='type-id-1298'/>
         </function-decl>
       </member-function>
       <member-function access='private' vtable-offset='24'>
         <!-- void TCMallocImplementation::GetFreeListSizes(std::vector<MallocExtension::FreeListInfo, std::allocator<MallocExtension::FreeListInfo> >*) -->
         <function-decl name='GetFreeListSizes' mangled-name='_ZN22TCMallocImplementation16GetFreeListSizesEPSt6vectorIN15MallocExtension12FreeListInfoESaIS2_EE' filepath='src/tcmalloc.cc' line='810' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN22TCMallocImplementation16GetFreeListSizesEPSt6vectorIN15MallocExtension12FreeListInfoESaIS2_EE'>
           <!-- implicit parameter of type 'TCMallocImplementation*' -->
-          <parameter type-id='type-id-1333' is-artificial='yes'/>
+          <parameter type-id='type-id-1332' is-artificial='yes'/>
           <!-- parameter of type 'std::vector<MallocExtension::FreeListInfo, std::allocator<MallocExtension::FreeListInfo> >*' -->
-          <parameter type-id='type-id-903'/>
+          <parameter type-id='type-id-1302'/>
           <!-- void -->
           <return type-id='type-id-56'/>
         </function-decl>
@@ -33677,7 +33668,7 @@
         <!-- void** TCMallocImplementation::ReadStackTraces(int*) -->
         <function-decl name='ReadStackTraces' mangled-name='_ZN22TCMallocImplementation15ReadStackTracesEPi' filepath='src/tcmalloc.cc' line='605' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN22TCMallocImplementation15ReadStackTracesEPi'>
           <!-- implicit parameter of type 'TCMallocImplementation*' -->
-          <parameter type-id='type-id-1333' is-artificial='yes'/>
+          <parameter type-id='type-id-1332' is-artificial='yes'/>
           <!-- parameter of type 'int*' -->
           <parameter type-id='type-id-897'/>
           <!-- void** -->
@@ -33688,21 +33679,21 @@
         <!-- void** TCMallocImplementation::ReadHeapGrowthStackTraces() -->
         <function-decl name='ReadHeapGrowthStackTraces' mangled-name='_ZN22TCMallocImplementation25ReadHeapGrowthStackTracesEv' filepath='src/tcmalloc.cc' line='618' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN22TCMallocImplementation25ReadHeapGrowthStackTracesEv'>
           <!-- implicit parameter of type 'TCMallocImplementation*' -->
-          <parameter type-id='type-id-1333' is-artificial='yes'/>
+          <parameter type-id='type-id-1332' is-artificial='yes'/>
           <!-- void** -->
           <return type-id='type-id-120'/>
         </function-decl>
       </member-function>
     </class-decl>
     <!-- typedef std::string MallocExtensionWriter -->
-    <typedef-decl name='MallocExtensionWriter' type-id='type-id-783' filepath='./src/gperftools/malloc_extension.h' line='68' column='1' id='type-id-1335'/>
+    <typedef-decl name='MallocExtensionWriter' type-id='type-id-783' filepath='./src/gperftools/malloc_extension.h' line='68' column='1' id='type-id-1334'/>
     <!-- class TCMallocGuard -->
-    <class-decl name='TCMallocGuard' size-in-bits='8' visibility='default' filepath='src/tcmalloc_guard.h' line='43' column='1' id='type-id-1336'>
+    <class-decl name='TCMallocGuard' size-in-bits='8' visibility='default' filepath='src/tcmalloc_guard.h' line='43' column='1' id='type-id-1335'>
       <member-function access='private' constructor='yes'>
         <!-- TCMallocGuard::TCMallocGuard() -->
         <function-decl name='TCMallocGuard' mangled-name='_ZN13TCMallocGuardC1Ev' filepath='src/tcmalloc_guard.h' line='45' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN13TCMallocGuardC1Ev'>
           <!-- implicit parameter of type 'TCMallocGuard*' -->
-          <parameter type-id='type-id-1337' is-artificial='yes'/>
+          <parameter type-id='type-id-1336' is-artificial='yes'/>
           <!-- void -->
           <return type-id='type-id-56'/>
         </function-decl>
@@ -33711,7 +33702,7 @@
         <!-- TCMallocGuard::~TCMallocGuard(int) -->
         <function-decl name='~TCMallocGuard' mangled-name='_ZN13TCMallocGuardD1Ev' filepath='src/tcmalloc_guard.h' line='46' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN13TCMallocGuardD1Ev'>
           <!-- implicit parameter of type 'TCMallocGuard*' -->
-          <parameter type-id='type-id-1337' is-artificial='yes'/>
+          <parameter type-id='type-id-1336' is-artificial='yes'/>
           <!-- artificial parameter of type 'int' -->
           <parameter type-id='type-id-1' is-artificial='yes'/>
           <!-- void -->
@@ -33720,7 +33711,7 @@
       </member-function>
     </class-decl>
     <!-- struct mallinfo -->
-    <class-decl name='mallinfo' size-in-bits='320' is-struct='yes' visibility='default' filepath='/usr/include/malloc.h' line='94' column='1' id='type-id-1338'>
+    <class-decl name='mallinfo' size-in-bits='320' is-struct='yes' visibility='default' filepath='/usr/include/malloc.h' line='94' column='1' id='type-id-1337'>
       <data-member access='public' layout-offset-in-bits='0'>
         <!-- int mallinfo::arena -->
         <var-decl name='arena' type-id='type-id-1' visibility='default' filepath='/usr/include/malloc.h' line='95' column='1'/>
@@ -33763,59 +33754,59 @@
       </data-member>
     </class-decl>
     <!-- Atomic32* -->
-    <pointer-type-def type-id='type-id-82' size-in-bits='64' id='type-id-1293'/>
+    <pointer-type-def type-id='type-id-82' size-in-bits='64' id='type-id-1287'/>
     <!-- MallocExtension::FreeListInfo& -->
-    <reference-type-def kind='lvalue' type-id='type-id-899' size-in-bits='64' id='type-id-1339'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1299' size-in-bits='64' id='type-id-1338'/>
     <!-- MallocExtension::FreeListInfo* -->
-    <pointer-type-def type-id='type-id-899' size-in-bits='64' id='type-id-1340'/>
+    <pointer-type-def type-id='type-id-1299' size-in-bits='64' id='type-id-1339'/>
     <!-- MallocExtension::FreeListInfo* const -->
-    <qualified-type-def type-id='type-id-1340' const='yes' id='type-id-1341'/>
+    <qualified-type-def type-id='type-id-1339' const='yes' id='type-id-1340'/>
     <!-- MallocExtension::FreeListInfo* const& -->
-    <reference-type-def kind='lvalue' type-id='type-id-1341' size-in-bits='64' id='type-id-1342'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1340' size-in-bits='64' id='type-id-1341'/>
     <!-- MallocExtensionWriter* -->
-    <pointer-type-def type-id='type-id-1335' size-in-bits='64' id='type-id-901'/>
+    <pointer-type-def type-id='type-id-1334' size-in-bits='64' id='type-id-1301'/>
     <!-- PackedCache<35, long unsigned int>* -->
-    <pointer-type-def type-id='type-id-1299' size-in-bits='64' id='type-id-1300'/>
+    <pointer-type-def type-id='type-id-1293' size-in-bits='64' id='type-id-1294'/>
     <!-- SpinLock* -->
     <pointer-type-def type-id='type-id-176' size-in-bits='64' id='type-id-254'/>
     <!-- SpinLockHolder* -->
-    <pointer-type-def type-id='type-id-1315' size-in-bits='64' id='type-id-1316'/>
+    <pointer-type-def type-id='type-id-1314' size-in-bits='64' id='type-id-1315'/>
     <!-- SysAllocator* -->
-    <pointer-type-def type-id='type-id-958' size-in-bits='64' id='type-id-902'/>
+    <pointer-type-def type-id='type-id-951' size-in-bits='64' id='type-id-952'/>
     <!-- TCMallocGuard* -->
-    <pointer-type-def type-id='type-id-1336' size-in-bits='64' id='type-id-1337'/>
+    <pointer-type-def type-id='type-id-1335' size-in-bits='64' id='type-id-1336'/>
     <!-- TCMallocImplementation* -->
-    <pointer-type-def type-id='type-id-1331' size-in-bits='64' id='type-id-1333'/>
+    <pointer-type-def type-id='type-id-1330' size-in-bits='64' id='type-id-1332'/>
     <!-- TCMallocImplementation::RangeFunction* -->
-    <pointer-type-def type-id='type-id-1332' size-in-bits='64' id='type-id-1334'/>
+    <pointer-type-def type-id='type-id-1331' size-in-bits='64' id='type-id-1333'/>
     <!-- TCMalloc_PageMap3<35>* -->
-    <pointer-type-def type-id='type-id-1278' size-in-bits='64' id='type-id-1282'/>
+    <pointer-type-def type-id='type-id-1272' size-in-bits='64' id='type-id-1276'/>
     <!-- TCMalloc_PageMap3<35>::Node* -->
-    <pointer-type-def type-id='type-id-1279' size-in-bits='64' id='type-id-1281'/>
+    <pointer-type-def type-id='type-id-1273' size-in-bits='64' id='type-id-1275'/>
     <!-- TCMalloc_Printer* -->
-    <pointer-type-def type-id='type-id-1296' size-in-bits='64' id='type-id-1297'/>
+    <pointer-type-def type-id='type-id-1290' size-in-bits='64' id='type-id-1291'/>
     <!-- _IO_FILE* -->
-    <pointer-type-def type-id='type-id-1302' size-in-bits='64' id='type-id-1305'/>
+    <pointer-type-def type-id='type-id-1296' size-in-bits='64' id='type-id-1304'/>
     <!-- _IO_lock_t* -->
-    <pointer-type-def type-id='type-id-1308' size-in-bits='64' id='type-id-1306'/>
+    <pointer-type-def type-id='type-id-1307' size-in-bits='64' id='type-id-1305'/>
     <!-- _IO_marker* -->
-    <pointer-type-def type-id='type-id-1307' size-in-bits='64' id='type-id-1304'/>
+    <pointer-type-def type-id='type-id-1306' size-in-bits='64' id='type-id-1303'/>
     <!-- __FILE* -->
-    <pointer-type-def type-id='type-id-1303' size-in-bits='64' id='type-id-1343'/>
+    <pointer-type-def type-id='type-id-1297' size-in-bits='64' id='type-id-1342'/>
     <!-- __gnu_cxx::__normal_iterator<MallocExtension::FreeListInfo*, std::vector<MallocExtension::FreeListInfo, std::allocator<MallocExtension::FreeListInfo> > >& -->
-    <reference-type-def kind='lvalue' type-id='type-id-1344' size-in-bits='64' id='type-id-1345'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1343' size-in-bits='64' id='type-id-1344'/>
     <!-- __gnu_cxx::__normal_iterator<MallocExtension::FreeListInfo*, std::vector<MallocExtension::FreeListInfo, std::allocator<MallocExtension::FreeListInfo> > >* -->
-    <pointer-type-def type-id='type-id-1344' size-in-bits='64' id='type-id-1346'/>
+    <pointer-type-def type-id='type-id-1343' size-in-bits='64' id='type-id-1345'/>
     <!-- __gnu_cxx::new_allocator<MallocExtension::FreeListInfo>* -->
-    <pointer-type-def type-id='type-id-1347' size-in-bits='64' id='type-id-1348'/>
+    <pointer-type-def type-id='type-id-1346' size-in-bits='64' id='type-id-1347'/>
     <!-- __gnu_cxx::new_allocator<char>* -->
-    <pointer-type-def type-id='type-id-1349' size-in-bits='64' id='type-id-1350'/>
+    <pointer-type-def type-id='type-id-1348' size-in-bits='64' id='type-id-1349'/>
     <!-- base::MallocRange* -->
-    <pointer-type-def type-id='type-id-1351' size-in-bits='64' id='type-id-1352'/>
+    <pointer-type-def type-id='type-id-1350' size-in-bits='64' id='type-id-1351'/>
     <!-- base::internal::HookList<void (*)(const void*)>* -->
-    <pointer-type-def type-id='type-id-948' size-in-bits='64' id='type-id-1353'/>
+    <pointer-type-def type-id='type-id-942' size-in-bits='64' id='type-id-1352'/>
     <!-- base::internal::HookList<void (*)(const void*, size_t)>* -->
-    <pointer-type-def type-id='type-id-947' size-in-bits='64' id='type-id-1354'/>
+    <pointer-type-def type-id='type-id-941' size-in-bits='64' id='type-id-1353'/>
     <!-- char& -->
     <reference-type-def kind='lvalue' type-id='type-id-66' size-in-bits='64' id='type-id-283'/>
     <!-- char* -->
@@ -33823,55 +33814,55 @@
     <!-- char** -->
     <pointer-type-def type-id='type-id-90' size-in-bits='64' id='type-id-97'/>
     <!-- const MallocExtension::FreeListInfo -->
-    <qualified-type-def type-id='type-id-899' const='yes' id='type-id-1355'/>
+    <qualified-type-def type-id='type-id-1299' const='yes' id='type-id-1354'/>
     <!-- const MallocExtension::FreeListInfo& -->
-    <reference-type-def kind='lvalue' type-id='type-id-1355' size-in-bits='64' id='type-id-1356'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1354' size-in-bits='64' id='type-id-1355'/>
     <!-- const MallocExtension::FreeListInfo* -->
-    <pointer-type-def type-id='type-id-1355' size-in-bits='64' id='type-id-1357'/>
+    <pointer-type-def type-id='type-id-1354' size-in-bits='64' id='type-id-1356'/>
     <!-- const PackedCache<35, long unsigned int> -->
-    <qualified-type-def type-id='type-id-1299' const='yes' id='type-id-1358'/>
+    <qualified-type-def type-id='type-id-1293' const='yes' id='type-id-1357'/>
     <!-- const PackedCache<35, long unsigned int>* -->
-    <pointer-type-def type-id='type-id-1358' size-in-bits='64' id='type-id-1301'/>
+    <pointer-type-def type-id='type-id-1357' size-in-bits='64' id='type-id-1295'/>
     <!-- const SpinLock -->
-    <qualified-type-def type-id='type-id-176' const='yes' id='type-id-1359'/>
+    <qualified-type-def type-id='type-id-176' const='yes' id='type-id-1358'/>
     <!-- const SpinLock& -->
-    <reference-type-def kind='lvalue' type-id='type-id-1359' size-in-bits='64' id='type-id-1294'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1358' size-in-bits='64' id='type-id-1288'/>
     <!-- const SpinLock* -->
-    <pointer-type-def type-id='type-id-1359' size-in-bits='64' id='type-id-1292'/>
+    <pointer-type-def type-id='type-id-1358' size-in-bits='64' id='type-id-1286'/>
     <!-- const TCMalloc_PageMap3<35> -->
-    <qualified-type-def type-id='type-id-1278' const='yes' id='type-id-1360'/>
+    <qualified-type-def type-id='type-id-1272' const='yes' id='type-id-1359'/>
     <!-- const TCMalloc_PageMap3<35>* -->
-    <pointer-type-def type-id='type-id-1360' size-in-bits='64' id='type-id-1283'/>
+    <pointer-type-def type-id='type-id-1359' size-in-bits='64' id='type-id-1277'/>
     <!-- const __gnu_cxx::__normal_iterator<MallocExtension::FreeListInfo*, std::vector<MallocExtension::FreeListInfo, std::allocator<MallocExtension::FreeListInfo> > > -->
-    <qualified-type-def type-id='type-id-1344' const='yes' id='type-id-1361'/>
+    <qualified-type-def type-id='type-id-1343' const='yes' id='type-id-1360'/>
     <!-- const __gnu_cxx::__normal_iterator<MallocExtension::FreeListInfo*, std::vector<MallocExtension::FreeListInfo, std::allocator<MallocExtension::FreeListInfo> > >& -->
-    <reference-type-def kind='lvalue' type-id='type-id-1361' size-in-bits='64' id='type-id-1362'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1360' size-in-bits='64' id='type-id-1361'/>
     <!-- const __gnu_cxx::__normal_iterator<MallocExtension::FreeListInfo*, std::vector<MallocExtension::FreeListInfo, std::allocator<MallocExtension::FreeListInfo> > >* -->
-    <pointer-type-def type-id='type-id-1361' size-in-bits='64' id='type-id-1363'/>
+    <pointer-type-def type-id='type-id-1360' size-in-bits='64' id='type-id-1362'/>
     <!-- const __gnu_cxx::new_allocator<MallocExtension::FreeListInfo> -->
-    <qualified-type-def type-id='type-id-1347' const='yes' id='type-id-1364'/>
+    <qualified-type-def type-id='type-id-1346' const='yes' id='type-id-1363'/>
     <!-- const __gnu_cxx::new_allocator<MallocExtension::FreeListInfo>& -->
-    <reference-type-def kind='lvalue' type-id='type-id-1364' size-in-bits='64' id='type-id-1365'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1363' size-in-bits='64' id='type-id-1364'/>
     <!-- const __gnu_cxx::new_allocator<MallocExtension::FreeListInfo>* -->
-    <pointer-type-def type-id='type-id-1364' size-in-bits='64' id='type-id-1366'/>
+    <pointer-type-def type-id='type-id-1363' size-in-bits='64' id='type-id-1365'/>
     <!-- const __gnu_cxx::new_allocator<char> -->
-    <qualified-type-def type-id='type-id-1349' const='yes' id='type-id-1367'/>
+    <qualified-type-def type-id='type-id-1348' const='yes' id='type-id-1366'/>
     <!-- const __gnu_cxx::new_allocator<char>& -->
-    <reference-type-def kind='lvalue' type-id='type-id-1367' size-in-bits='64' id='type-id-1368'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1366' size-in-bits='64' id='type-id-1367'/>
     <!-- const __gnu_cxx::new_allocator<char>* -->
-    <pointer-type-def type-id='type-id-1367' size-in-bits='64' id='type-id-1369'/>
+    <pointer-type-def type-id='type-id-1366' size-in-bits='64' id='type-id-1368'/>
     <!-- const base::LinkerInitialized -->
-    <qualified-type-def type-id='type-id-1291' const='yes' id='type-id-1290'/>
+    <qualified-type-def type-id='type-id-1285' const='yes' id='type-id-1284'/>
     <!-- const base::MallocRange -->
-    <qualified-type-def type-id='type-id-1351' const='yes' id='type-id-1370'/>
+    <qualified-type-def type-id='type-id-1350' const='yes' id='type-id-1369'/>
     <!-- const base::MallocRange* -->
-    <pointer-type-def type-id='type-id-1370' size-in-bits='64' id='type-id-952'/>
+    <pointer-type-def type-id='type-id-1369' size-in-bits='64' id='type-id-1370'/>
     <!-- const base::internal::HookList<void (*)(const void*)> -->
-    <qualified-type-def type-id='type-id-948' const='yes' id='type-id-1371'/>
+    <qualified-type-def type-id='type-id-942' const='yes' id='type-id-1371'/>
     <!-- const base::internal::HookList<void (*)(const void*)>* -->
     <pointer-type-def type-id='type-id-1371' size-in-bits='64' id='type-id-1372'/>
     <!-- const base::internal::HookList<void (*)(const void*, size_t)> -->
-    <qualified-type-def type-id='type-id-947' const='yes' id='type-id-1373'/>
+    <qualified-type-def type-id='type-id-941' const='yes' id='type-id-1373'/>
     <!-- const base::internal::HookList<void (*)(const void*, size_t)>* -->
     <pointer-type-def type-id='type-id-1373' size-in-bits='64' id='type-id-1374'/>
     <!-- const bool -->
@@ -33887,11 +33878,11 @@
     <!-- const double -->
     <qualified-type-def type-id='type-id-2' const='yes' id='type-id-1376'/>
     <!-- const double& -->
-    <reference-type-def kind='lvalue' type-id='type-id-1376' size-in-bits='64' id='type-id-1135'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1376' size-in-bits='64' id='type-id-1129'/>
     <!-- const int -->
     <qualified-type-def type-id='type-id-1' const='yes' id='type-id-112'/>
     <!-- const mbstate_t -->
-    <qualified-type-def type-id='type-id-1310' const='yes' id='type-id-1377'/>
+    <qualified-type-def type-id='type-id-1309' const='yes' id='type-id-1377'/>
     <!-- const mbstate_t* -->
     <pointer-type-def type-id='type-id-1377' size-in-bits='64' id='type-id-1378'/>
     <!-- const ptrdiff_t -->
@@ -33955,11 +33946,11 @@
     <!-- const tcmalloc::ThreadCache* -->
     <pointer-type-def type-id='type-id-1416' size-in-bits='64' id='type-id-1417'/>
     <!-- const tcmalloc::ThreadCache::FreeList -->
-    <qualified-type-def type-id='type-id-1267' const='yes' id='type-id-1418'/>
+    <qualified-type-def type-id='type-id-1261' const='yes' id='type-id-1418'/>
     <!-- const tcmalloc::ThreadCache::FreeList* -->
     <pointer-type-def type-id='type-id-1418' size-in-bits='64' id='type-id-1419'/>
     <!-- const tm -->
-    <qualified-type-def type-id='type-id-1312' const='yes' id='type-id-1420'/>
+    <qualified-type-def type-id='type-id-1311' const='yes' id='type-id-1420'/>
     <!-- const tm* -->
     <pointer-type-def type-id='type-id-1420' size-in-bits='64' id='type-id-1421'/>
     <!-- const uintptr_t -->
@@ -33969,23 +33960,23 @@
     <!-- const unsigned long int& -->
     <reference-type-def kind='lvalue' type-id='type-id-615' size-in-bits='64' id='type-id-334'/>
     <!-- const volatile base::subtle::Atomic64 -->
-    <qualified-type-def type-id='type-id-945' const='yes' id='type-id-1422'/>
+    <qualified-type-def type-id='type-id-939' const='yes' id='type-id-1422'/>
     <!-- const volatile base::subtle::Atomic64* -->
-    <pointer-type-def type-id='type-id-1422' size-in-bits='64' id='type-id-950'/>
+    <pointer-type-def type-id='type-id-1422' size-in-bits='64' id='type-id-944'/>
     <!-- const wchar_t -->
-    <qualified-type-def type-id='type-id-1276' const='yes' id='type-id-1423'/>
+    <qualified-type-def type-id='type-id-1270' const='yes' id='type-id-1423'/>
     <!-- const wchar_t* -->
     <pointer-type-def type-id='type-id-1423' size-in-bits='64' id='type-id-1424'/>
     <!-- const wchar_t** -->
     <pointer-type-def type-id='type-id-1424' size-in-bits='64' id='type-id-1425'/>
     <!-- int (void*, void*)* -->
-    <pointer-type-def type-id='type-id-1426' size-in-bits='64' id='type-id-1284'/>
+    <pointer-type-def type-id='type-id-1426' size-in-bits='64' id='type-id-1278'/>
     <!-- int* -->
     <pointer-type-def type-id='type-id-1' size-in-bits='64' id='type-id-897'/>
     <!-- lconv* -->
-    <pointer-type-def type-id='type-id-1313' size-in-bits='64' id='type-id-1427'/>
+    <pointer-type-def type-id='type-id-1312' size-in-bits='64' id='type-id-1427'/>
     <!-- mbstate_t* -->
-    <pointer-type-def type-id='type-id-1310' size-in-bits='64' id='type-id-1428'/>
+    <pointer-type-def type-id='type-id-1309' size-in-bits='64' id='type-id-1428'/>
     <!-- size_t* -->
     <pointer-type-def type-id='type-id-57' size-in-bits='64' id='type-id-230'/>
     <!-- std::_Vector_base<MallocExtension::FreeListInfo, std::allocator<MallocExtension::FreeListInfo> >* -->
@@ -34015,11 +34006,11 @@
     <!-- std::vector<MallocExtension::FreeListInfo, std::allocator<MallocExtension::FreeListInfo> >& -->
     <reference-type-def kind='lvalue' type-id='type-id-1399' size-in-bits='64' id='type-id-1445'/>
     <!-- std::vector<MallocExtension::FreeListInfo, std::allocator<MallocExtension::FreeListInfo> >* -->
-    <pointer-type-def type-id='type-id-1399' size-in-bits='64' id='type-id-903'/>
+    <pointer-type-def type-id='type-id-1399' size-in-bits='64' id='type-id-1302'/>
     <!-- tcmalloc::CentralFreeList* -->
     <pointer-type-def type-id='type-id-1446' size-in-bits='64' id='type-id-1447'/>
     <!-- tcmalloc::CentralFreeListPadded* -->
-    <pointer-type-def type-id='type-id-1263' size-in-bits='64' id='type-id-1448'/>
+    <pointer-type-def type-id='type-id-1257' size-in-bits='64' id='type-id-1448'/>
     <!-- tcmalloc::LogItem* -->
     <pointer-type-def type-id='type-id-886' size-in-bits='64' id='type-id-1449'/>
     <!-- tcmalloc::PageHeap* -->
@@ -34029,15 +34020,15 @@
     <!-- tcmalloc::PageHeap::SmallSpanStats* -->
     <pointer-type-def type-id='type-id-1453' size-in-bits='64' id='type-id-1454'/>
     <!-- tcmalloc::PageHeap::SpanList* -->
-    <pointer-type-def type-id='type-id-1265' size-in-bits='64' id='type-id-1455'/>
+    <pointer-type-def type-id='type-id-1259' size-in-bits='64' id='type-id-1455'/>
     <!-- tcmalloc::PageHeap::Stats* -->
-    <pointer-type-def type-id='type-id-1330' size-in-bits='64' id='type-id-1456'/>
+    <pointer-type-def type-id='type-id-1329' size-in-bits='64' id='type-id-1456'/>
     <!-- tcmalloc::PageHeapAllocator<tcmalloc::Span>* -->
     <pointer-type-def type-id='type-id-1406' size-in-bits='64' id='type-id-1457'/>
     <!-- tcmalloc::PageHeapAllocator<tcmalloc::StackTrace>* -->
     <pointer-type-def type-id='type-id-1409' size-in-bits='64' id='type-id-1458'/>
     <!-- tcmalloc::PageHeapAllocator<tcmalloc::StackTraceTable::Bucket>* -->
-    <pointer-type-def type-id='type-id-1139' size-in-bits='64' id='type-id-1459'/>
+    <pointer-type-def type-id='type-id-1133' size-in-bits='64' id='type-id-1459'/>
     <!-- tcmalloc::PageHeapAllocator<tcmalloc::ThreadCache>* -->
     <pointer-type-def type-id='type-id-1412' size-in-bits='64' id='type-id-1460'/>
     <!-- tcmalloc::Sampler* -->
@@ -34045,15 +34036,15 @@
     <!-- tcmalloc::SizeMap* -->
     <pointer-type-def type-id='type-id-1463' size-in-bits='64' id='type-id-1464'/>
     <!-- tcmalloc::Span* -->
-    <pointer-type-def type-id='type-id-117' size-in-bits='64' id='type-id-1136'/>
+    <pointer-type-def type-id='type-id-117' size-in-bits='64' id='type-id-1130'/>
     <!-- tcmalloc::StackTrace* -->
-    <pointer-type-def type-id='type-id-1142' size-in-bits='64' id='type-id-1465'/>
+    <pointer-type-def type-id='type-id-1136' size-in-bits='64' id='type-id-1465'/>
     <!-- tcmalloc::ThreadCache* -->
     <pointer-type-def type-id='type-id-1415' size-in-bits='64' id='type-id-1466'/>
     <!-- tcmalloc::ThreadCache::FreeList* -->
-    <pointer-type-def type-id='type-id-1267' size-in-bits='64' id='type-id-1467'/>
+    <pointer-type-def type-id='type-id-1261' size-in-bits='64' id='type-id-1467'/>
     <!-- typedef __va_list_tag __va_list_tag* -->
-    <pointer-type-def type-id='type-id-1249' size-in-bits='64' id='type-id-64'/>
+    <pointer-type-def type-id='type-id-1243' size-in-bits='64' id='type-id-64'/>
     <!-- uint64_t* -->
     <pointer-type-def type-id='type-id-15' size-in-bits='64' id='type-id-1468'/>
     <!-- void ()* -->
@@ -34081,17 +34072,17 @@
     <!-- void** -->
     <pointer-type-def type-id='type-id-53' size-in-bits='64' id='type-id-120'/>
     <!-- volatile Atomic32 -->
-    <qualified-type-def type-id='type-id-82' volatile='yes' id='type-id-986'/>
+    <qualified-type-def type-id='type-id-82' volatile='yes' id='type-id-980'/>
     <!-- volatile Atomic32* -->
-    <pointer-type-def type-id='type-id-986' size-in-bits='64' id='type-id-80'/>
+    <pointer-type-def type-id='type-id-980' size-in-bits='64' id='type-id-80'/>
     <!-- volatile base::subtle::Atomic64 -->
-    <qualified-type-def type-id='type-id-949' volatile='yes' id='type-id-945'/>
+    <qualified-type-def type-id='type-id-943' volatile='yes' id='type-id-939'/>
     <!-- volatile size_t -->
     <qualified-type-def type-id='type-id-57' volatile='yes' id='type-id-1483'/>
     <!-- volatile unsigned long int -->
-    <qualified-type-def type-id='type-id-5' volatile='yes' id='type-id-1273'/>
+    <qualified-type-def type-id='type-id-5' volatile='yes' id='type-id-1267'/>
     <!-- wchar_t* -->
-    <pointer-type-def type-id='type-id-1276' size-in-bits='64' id='type-id-1484'/>
+    <pointer-type-def type-id='type-id-1270' size-in-bits='64' id='type-id-1484'/>
     <!-- wchar_t** -->
     <pointer-type-def type-id='type-id-1484' size-in-bits='64' id='type-id-1485'/>
     <!-- namespace std -->
@@ -34099,16 +34090,16 @@
       <!-- void std::_Destroy<MallocExtension::FreeListInfo*>(MallocExtension::FreeListInfo*, MallocExtension::FreeListInfo*) -->
       <function-decl name='_Destroy&lt;MallocExtension::FreeListInfo*&gt;' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_construct.h' line='119' column='1' visibility='default' binding='global' size-in-bits='64'>
         <!-- parameter of type 'MallocExtension::FreeListInfo*' -->
-        <parameter type-id='type-id-1340'/>
+        <parameter type-id='type-id-1339'/>
         <!-- parameter of type 'MallocExtension::FreeListInfo*' -->
-        <parameter type-id='type-id-1340'/>
+        <parameter type-id='type-id-1339'/>
         <!-- void -->
         <return type-id='type-id-56'/>
       </function-decl>
       <!-- class std::allocator<MallocExtension::FreeListInfo> -->
       <class-decl name='allocator&lt;MallocExtension::FreeListInfo&gt;' size-in-bits='8' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/allocator.h' line='87' column='1' id='type-id-1383'>
         <!-- class __gnu_cxx::new_allocator<MallocExtension::FreeListInfo> -->
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1347'/>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1346'/>
         <member-function access='private'>
           <!-- void std::allocator<MallocExtension::FreeListInfo>::allocator() -->
           <function-decl name='allocator' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/allocator.h' line='101' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -34144,9 +34135,9 @@
       <!-- void std::_Destroy<MallocExtension::FreeListInfo*, MallocExtension::FreeListInfo>(MallocExtension::FreeListInfo*, MallocExtension::FreeListInfo*, std::allocator<MallocExtension::FreeListInfo>&) -->
       <function-decl name='_Destroy&lt;MallocExtension::FreeListInfo*, MallocExtension::FreeListInfo&gt;' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_construct.h' line='146' column='1' visibility='default' binding='global' size-in-bits='64'>
         <!-- parameter of type 'MallocExtension::FreeListInfo*' -->
-        <parameter type-id='type-id-1340'/>
+        <parameter type-id='type-id-1339'/>
         <!-- parameter of type 'MallocExtension::FreeListInfo*' -->
-        <parameter type-id='type-id-1340'/>
+        <parameter type-id='type-id-1339'/>
         <!-- parameter of type 'std::allocator<MallocExtension::FreeListInfo>&' -->
         <parameter type-id='type-id-1432'/>
         <!-- void -->
@@ -34155,81 +34146,81 @@
       <!-- MallocExtension::FreeListInfo* std::__copy_move_backward_a<false, MallocExtension::FreeListInfo*, MallocExtension::FreeListInfo*>(MallocExtension::FreeListInfo*, MallocExtension::FreeListInfo*, MallocExtension::FreeListInfo*) -->
       <function-decl name='__copy_move_backward_a&lt;false, MallocExtension::FreeListInfo*, MallocExtension::FreeListInfo*&gt;' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_algobase.h' line='582' column='1' visibility='default' binding='global' size-in-bits='64'>
         <!-- parameter of type 'MallocExtension::FreeListInfo*' -->
-        <parameter type-id='type-id-1340'/>
+        <parameter type-id='type-id-1339'/>
         <!-- parameter of type 'MallocExtension::FreeListInfo*' -->
-        <parameter type-id='type-id-1340'/>
+        <parameter type-id='type-id-1339'/>
         <!-- parameter of type 'MallocExtension::FreeListInfo*' -->
-        <parameter type-id='type-id-1340'/>
+        <parameter type-id='type-id-1339'/>
         <!-- MallocExtension::FreeListInfo* -->
-        <return type-id='type-id-1340'/>
+        <return type-id='type-id-1339'/>
       </function-decl>
       <!-- MallocExtension::FreeListInfo* std::__copy_move_backward_a2<false, MallocExtension::FreeListInfo*, MallocExtension::FreeListInfo*>(MallocExtension::FreeListInfo*, MallocExtension::FreeListInfo*, MallocExtension::FreeListInfo*) -->
       <function-decl name='__copy_move_backward_a2&lt;false, MallocExtension::FreeListInfo*, MallocExtension::FreeListInfo*&gt;' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_algobase.h' line='600' column='1' visibility='default' binding='global' size-in-bits='64'>
         <!-- parameter of type 'MallocExtension::FreeListInfo*' -->
-        <parameter type-id='type-id-1340'/>
+        <parameter type-id='type-id-1339'/>
         <!-- parameter of type 'MallocExtension::FreeListInfo*' -->
-        <parameter type-id='type-id-1340'/>
+        <parameter type-id='type-id-1339'/>
         <!-- parameter of type 'MallocExtension::FreeListInfo*' -->
-        <parameter type-id='type-id-1340'/>
+        <parameter type-id='type-id-1339'/>
         <!-- MallocExtension::FreeListInfo* -->
-        <return type-id='type-id-1340'/>
+        <return type-id='type-id-1339'/>
       </function-decl>
       <!-- MallocExtension::FreeListInfo* std::__copy_move_a<false, MallocExtension::FreeListInfo*, MallocExtension::FreeListInfo*>(MallocExtension::FreeListInfo*, MallocExtension::FreeListInfo*, MallocExtension::FreeListInfo*) -->
       <function-decl name='__copy_move_a&lt;false, MallocExtension::FreeListInfo*, MallocExtension::FreeListInfo*&gt;' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_algobase.h' line='386' column='1' visibility='default' binding='global' size-in-bits='64'>
         <!-- parameter of type 'MallocExtension::FreeListInfo*' -->
-        <parameter type-id='type-id-1340'/>
+        <parameter type-id='type-id-1339'/>
         <!-- parameter of type 'MallocExtension::FreeListInfo*' -->
-        <parameter type-id='type-id-1340'/>
+        <parameter type-id='type-id-1339'/>
         <!-- parameter of type 'MallocExtension::FreeListInfo*' -->
-        <parameter type-id='type-id-1340'/>
+        <parameter type-id='type-id-1339'/>
         <!-- MallocExtension::FreeListInfo* -->
-        <return type-id='type-id-1340'/>
+        <return type-id='type-id-1339'/>
       </function-decl>
       <!-- MallocExtension::FreeListInfo* std::__copy_move_a2<false, MallocExtension::FreeListInfo*, MallocExtension::FreeListInfo*>(MallocExtension::FreeListInfo*, MallocExtension::FreeListInfo*, MallocExtension::FreeListInfo*) -->
       <function-decl name='__copy_move_a2&lt;false, MallocExtension::FreeListInfo*, MallocExtension::FreeListInfo*&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 of type 'MallocExtension::FreeListInfo*' -->
-        <parameter type-id='type-id-1340'/>
+        <parameter type-id='type-id-1339'/>
         <!-- parameter of type 'MallocExtension::FreeListInfo*' -->
-        <parameter type-id='type-id-1340'/>
+        <parameter type-id='type-id-1339'/>
         <!-- parameter of type 'MallocExtension::FreeListInfo*' -->
-        <parameter type-id='type-id-1340'/>
+        <parameter type-id='type-id-1339'/>
         <!-- MallocExtension::FreeListInfo* -->
-        <return type-id='type-id-1340'/>
+        <return type-id='type-id-1339'/>
       </function-decl>
       <!-- MallocExtension::FreeListInfo* std::copy<MallocExtension::FreeListInfo*, MallocExtension::FreeListInfo*>(MallocExtension::FreeListInfo*, MallocExtension::FreeListInfo*, MallocExtension::FreeListInfo*) -->
       <function-decl name='copy&lt;MallocExtension::FreeListInfo*, MallocExtension::FreeListInfo*&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 of type 'MallocExtension::FreeListInfo*' -->
-        <parameter type-id='type-id-1340'/>
+        <parameter type-id='type-id-1339'/>
         <!-- parameter of type 'MallocExtension::FreeListInfo*' -->
-        <parameter type-id='type-id-1340'/>
+        <parameter type-id='type-id-1339'/>
         <!-- parameter of type 'MallocExtension::FreeListInfo*' -->
-        <parameter type-id='type-id-1340'/>
+        <parameter type-id='type-id-1339'/>
         <!-- MallocExtension::FreeListInfo* -->
-        <return type-id='type-id-1340'/>
+        <return type-id='type-id-1339'/>
       </function-decl>
       <!-- MallocExtension::FreeListInfo* std::uninitialized_copy<MallocExtension::FreeListInfo*, MallocExtension::FreeListInfo*>(MallocExtension::FreeListInfo*, MallocExtension::FreeListInfo*, MallocExtension::FreeListInfo*) -->
       <function-decl name='uninitialized_copy&lt;MallocExtension::FreeListInfo*, MallocExtension::FreeListInfo*&gt;' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_uninitialized.h' line='106' column='1' visibility='default' binding='global' size-in-bits='64'>
         <!-- parameter of type 'MallocExtension::FreeListInfo*' -->
-        <parameter type-id='type-id-1340'/>
+        <parameter type-id='type-id-1339'/>
         <!-- parameter of type 'MallocExtension::FreeListInfo*' -->
-        <parameter type-id='type-id-1340'/>
+        <parameter type-id='type-id-1339'/>
         <!-- parameter of type 'MallocExtension::FreeListInfo*' -->
-        <parameter type-id='type-id-1340'/>
+        <parameter type-id='type-id-1339'/>
         <!-- MallocExtension::FreeListInfo* -->
-        <return type-id='type-id-1340'/>
+        <return type-id='type-id-1339'/>
       </function-decl>
       <!-- MallocExtension::FreeListInfo* std::__uninitialized_copy_a<MallocExtension::FreeListInfo*, MallocExtension::FreeListInfo*, MallocExtension::FreeListInfo>(MallocExtension::FreeListInfo*, MallocExtension::FreeListInfo*, MallocExtension::FreeListInfo*, std::allocator<MallocExtension::FreeListInfo>&) -->
       <function-decl name='__uninitialized_copy_a&lt;MallocExtension::FreeListInfo*, MallocExtension::FreeListInfo*, MallocExtension::FreeListInfo&gt;' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_uninitialized.h' line='254' column='1' visibility='default' binding='global' size-in-bits='64'>
         <!-- parameter of type 'MallocExtension::FreeListInfo*' -->
-        <parameter type-id='type-id-1340'/>
+        <parameter type-id='type-id-1339'/>
         <!-- parameter of type 'MallocExtension::FreeListInfo*' -->
-        <parameter type-id='type-id-1340'/>
+        <parameter type-id='type-id-1339'/>
         <!-- parameter of type 'MallocExtension::FreeListInfo*' -->
-        <parameter type-id='type-id-1340'/>
+        <parameter type-id='type-id-1339'/>
         <!-- parameter of type 'std::allocator<MallocExtension::FreeListInfo>&' -->
         <parameter type-id='type-id-1432'/>
         <!-- MallocExtension::FreeListInfo* -->
-        <return type-id='type-id-1340'/>
+        <return type-id='type-id-1339'/>
       </function-decl>
       <!-- const unsigned long int& std::max<long unsigned int>(const unsigned long int&, const unsigned long int&) -->
       <function-decl name='max&lt;long unsigned int&gt;' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_algobase.h' line='209' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -34243,26 +34234,26 @@
       <!-- MallocExtension::FreeListInfo* std::copy_backward<MallocExtension::FreeListInfo*, MallocExtension::FreeListInfo*>(MallocExtension::FreeListInfo*, MallocExtension::FreeListInfo*, MallocExtension::FreeListInfo*) -->
       <function-decl name='copy_backward&lt;MallocExtension::FreeListInfo*, MallocExtension::FreeListInfo*&gt;' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_algobase.h' line='628' column='1' visibility='default' binding='global' size-in-bits='64'>
         <!-- parameter of type 'MallocExtension::FreeListInfo*' -->
-        <parameter type-id='type-id-1340'/>
+        <parameter type-id='type-id-1339'/>
         <!-- parameter of type 'MallocExtension::FreeListInfo*' -->
-        <parameter type-id='type-id-1340'/>
+        <parameter type-id='type-id-1339'/>
         <!-- parameter of type 'MallocExtension::FreeListInfo*' -->
-        <parameter type-id='type-id-1340'/>
+        <parameter type-id='type-id-1339'/>
         <!-- MallocExtension::FreeListInfo* -->
-        <return type-id='type-id-1340'/>
+        <return type-id='type-id-1339'/>
       </function-decl>
       <!-- MallocExtension::FreeListInfo* std::__uninitialized_move_a<MallocExtension::FreeListInfo*, MallocExtension::FreeListInfo*, std::allocator<MallocExtension::FreeListInfo> >(MallocExtension::FreeListInfo*, MallocExtension::FreeListInfo*, MallocExtension::FreeListInfo*, std::allocator<MallocExtension::FreeListInfo>&) -->
       <function-decl name='__uninitialized_move_a&lt;MallocExtension::FreeListInfo*, MallocExtension::FreeListInfo*, std::allocator&lt;MallocExtension::FreeListInfo&gt; &gt;' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_uninitialized.h' line='261' column='1' visibility='default' binding='global' size-in-bits='64'>
         <!-- parameter of type 'MallocExtension::FreeListInfo*' -->
-        <parameter type-id='type-id-1340'/>
+        <parameter type-id='type-id-1339'/>
         <!-- parameter of type 'MallocExtension::FreeListInfo*' -->
-        <parameter type-id='type-id-1340'/>
+        <parameter type-id='type-id-1339'/>
         <!-- parameter of type 'MallocExtension::FreeListInfo*' -->
-        <parameter type-id='type-id-1340'/>
+        <parameter type-id='type-id-1339'/>
         <!-- parameter of type 'std::allocator<MallocExtension::FreeListInfo>&' -->
         <parameter type-id='type-id-1432'/>
         <!-- MallocExtension::FreeListInfo* -->
-        <return type-id='type-id-1340'/>
+        <return type-id='type-id-1339'/>
       </function-decl>
       <!-- struct std::_Destroy_aux<true> -->
       <class-decl name='_Destroy_aux&lt;true&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_construct.h' line='106' column='1' id='type-id-1486'>
@@ -34270,9 +34261,9 @@
           <!-- void std::_Destroy_aux<true>::__destroy<MallocExtension::FreeListInfo*>(MallocExtension::FreeListInfo*) -->
           <function-decl name='__destroy&lt;MallocExtension::FreeListInfo*&gt;' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_construct.h' line='109' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- parameter of type 'MallocExtension::FreeListInfo*' -->
-            <parameter type-id='type-id-1340'/>
+            <parameter type-id='type-id-1339'/>
             <!-- parameter of type 'MallocExtension::FreeListInfo*' -->
-            <parameter type-id='type-id-1340'/>
+            <parameter type-id='type-id-1339'/>
             <!-- void -->
             <return type-id='type-id-56'/>
           </function-decl>
@@ -34298,15 +34289,15 @@
             <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1383'/>
             <data-member access='public' layout-offset-in-bits='0'>
               <!-- MallocExtension::FreeListInfo* std::_Vector_base<MallocExtension::FreeListInfo, std::allocator<MallocExtension::FreeListInfo> >::_Vector_impl::_M_start -->
-              <var-decl name='_M_start' type-id='type-id-1340' 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'/>
+              <var-decl name='_M_start' type-id='type-id-1339' 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'>
               <!-- MallocExtension::FreeListInfo* std::_Vector_base<MallocExtension::FreeListInfo, std::allocator<MallocExtension::FreeListInfo> >::_Vector_impl::_M_finish -->
-              <var-decl name='_M_finish' type-id='type-id-1340' 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'/>
+              <var-decl name='_M_finish' type-id='type-id-1339' 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'>
               <!-- MallocExtension::FreeListInfo* std::_Vector_base<MallocExtension::FreeListInfo, std::allocator<MallocExtension::FreeListInfo> >::_Vector_impl::_M_end_of_storage -->
-              <var-decl name='_M_end_of_storage' type-id='type-id-1340' 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'/>
+              <var-decl name='_M_end_of_storage' type-id='type-id-1339' 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'>
               <!-- std::_Vector_base<MallocExtension::FreeListInfo, std::allocator<MallocExtension::FreeListInfo> >::_Vector_impl::_Vector_impl() -->
@@ -34413,7 +34404,7 @@
             <!-- parameter of type 'unsigned long int' -->
             <parameter type-id='type-id-5'/>
             <!-- MallocExtension::FreeListInfo* -->
-            <return type-id='type-id-1340'/>
+            <return type-id='type-id-1339'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
@@ -34422,7 +34413,7 @@
             <!-- implicit parameter of type 'std::_Vector_base<MallocExtension::FreeListInfo, std::allocator<MallocExtension::FreeListInfo> >*' -->
             <parameter type-id='type-id-1429' is-artificial='yes'/>
             <!-- parameter of type 'MallocExtension::FreeListInfo*' -->
-            <parameter type-id='type-id-1340'/>
+            <parameter type-id='type-id-1339'/>
             <!-- parameter of type 'unsigned long int' -->
             <parameter type-id='type-id-5'/>
             <!-- void -->
@@ -34438,7 +34429,7 @@
           <!-- void std::vector<MallocExtension::FreeListInfo, std::allocator<MallocExtension::FreeListInfo> >::vector() -->
           <function-decl name='vector' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='207' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::vector<MallocExtension::FreeListInfo, std::allocator<MallocExtension::FreeListInfo> >*' -->
-            <parameter type-id='type-id-903' is-artificial='yes'/>
+            <parameter type-id='type-id-1302' is-artificial='yes'/>
             <!-- void -->
             <return type-id='type-id-56'/>
           </function-decl>
@@ -34447,7 +34438,7 @@
           <!-- void std::vector<MallocExtension::FreeListInfo, std::allocator<MallocExtension::FreeListInfo> >::vector(const std::allocator<MallocExtension::FreeListInfo>&) -->
           <function-decl name='vector' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='215' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::vector<MallocExtension::FreeListInfo, std::allocator<MallocExtension::FreeListInfo> >*' -->
-            <parameter type-id='type-id-903' is-artificial='yes'/>
+            <parameter type-id='type-id-1302' is-artificial='yes'/>
             <!-- parameter of type 'const std::allocator<MallocExtension::FreeListInfo>&' -->
             <parameter type-id='type-id-1385'/>
             <!-- void -->
@@ -34458,11 +34449,11 @@
           <!-- void std::vector<MallocExtension::FreeListInfo, std::allocator<MallocExtension::FreeListInfo> >::vector(unsigned long int, const MallocExtension::FreeListInfo&, const std::allocator<MallocExtension::FreeListInfo>&) -->
           <function-decl name='vector' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='227' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::vector<MallocExtension::FreeListInfo, std::allocator<MallocExtension::FreeListInfo> >*' -->
-            <parameter type-id='type-id-903' is-artificial='yes'/>
+            <parameter type-id='type-id-1302' is-artificial='yes'/>
             <!-- parameter of type 'unsigned long int' -->
             <parameter type-id='type-id-5'/>
             <!-- parameter of type 'const MallocExtension::FreeListInfo&' -->
-            <parameter type-id='type-id-1356'/>
+            <parameter type-id='type-id-1355'/>
             <!-- parameter of type 'const std::allocator<MallocExtension::FreeListInfo>&' -->
             <parameter type-id='type-id-1385'/>
             <!-- void -->
@@ -34473,7 +34464,7 @@
           <!-- void std::vector<MallocExtension::FreeListInfo, std::allocator<MallocExtension::FreeListInfo> >::vector(const std::vector<MallocExtension::FreeListInfo, std::allocator<MallocExtension::FreeListInfo> >&) -->
           <function-decl name='vector' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='241' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::vector<MallocExtension::FreeListInfo, std::allocator<MallocExtension::FreeListInfo> >*' -->
-            <parameter type-id='type-id-903' is-artificial='yes'/>
+            <parameter type-id='type-id-1302' is-artificial='yes'/>
             <!-- parameter of type 'const std::vector<MallocExtension::FreeListInfo, std::allocator<MallocExtension::FreeListInfo> >&' -->
             <parameter type-id='type-id-1401'/>
             <!-- void -->
@@ -34484,7 +34475,7 @@
           <!-- std::vector<MallocExtension::FreeListInfo, std::allocator<MallocExtension::FreeListInfo> >::~vector(int) -->
           <function-decl name='~vector' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='312' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::vector<MallocExtension::FreeListInfo, std::allocator<MallocExtension::FreeListInfo> >*' -->
-            <parameter type-id='type-id-903' is-artificial='yes'/>
+            <parameter type-id='type-id-1302' is-artificial='yes'/>
             <!-- artificial parameter of type 'int' -->
             <parameter type-id='type-id-1' is-artificial='yes'/>
             <!-- void -->
@@ -34495,7 +34486,7 @@
           <!-- std::vector<MallocExtension::FreeListInfo, std::allocator<MallocExtension::FreeListInfo> >& std::vector<MallocExtension::FreeListInfo, std::allocator<MallocExtension::FreeListInfo> >::operator=(const std::vector<MallocExtension::FreeListInfo, std::allocator<MallocExtension::FreeListInfo> >&) -->
           <function-decl name='operator=' mangled-name='_ZNSt6vectorIN15MallocExtension12FreeListInfoESaIS1_EEaSERKS3_' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/vector.tcc' line='156' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::vector<MallocExtension::FreeListInfo, std::allocator<MallocExtension::FreeListInfo> >*' -->
-            <parameter type-id='type-id-903' is-artificial='yes'/>
+            <parameter type-id='type-id-1302' is-artificial='yes'/>
             <!-- parameter of type 'const std::vector<MallocExtension::FreeListInfo, std::allocator<MallocExtension::FreeListInfo> >&' -->
             <parameter type-id='type-id-1401'/>
             <!-- std::vector<MallocExtension::FreeListInfo, std::allocator<MallocExtension::FreeListInfo> >& -->
@@ -34506,11 +34497,11 @@
           <!-- void std::vector<MallocExtension::FreeListInfo, std::allocator<MallocExtension::FreeListInfo> >::assign(unsigned long int, const MallocExtension::FreeListInfo&) -->
           <function-decl name='assign' mangled-name='_ZNSt6vectorIN15MallocExtension12FreeListInfoESaIS1_EE6assignEmRKS1_' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='374' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::vector<MallocExtension::FreeListInfo, std::allocator<MallocExtension::FreeListInfo> >*' -->
-            <parameter type-id='type-id-903' is-artificial='yes'/>
+            <parameter type-id='type-id-1302' is-artificial='yes'/>
             <!-- parameter of type 'unsigned long int' -->
             <parameter type-id='type-id-5'/>
             <!-- parameter of type 'const MallocExtension::FreeListInfo&' -->
-            <parameter type-id='type-id-1356'/>
+            <parameter type-id='type-id-1355'/>
             <!-- void -->
             <return type-id='type-id-56'/>
           </function-decl>
@@ -34519,9 +34510,9 @@
           <!-- __gnu_cxx::__normal_iterator<MallocExtension::FreeListInfo*, std::vector<MallocExtension::FreeListInfo, std::allocator<MallocExtension::FreeListInfo> > > std::vector<MallocExtension::FreeListInfo, std::allocator<MallocExtension::FreeListInfo> >::begin() -->
           <function-decl name='begin' mangled-name='_ZNSt6vectorIN15MallocExtension12FreeListInfoESaIS1_EE5beginEv' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='425' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::vector<MallocExtension::FreeListInfo, std::allocator<MallocExtension::FreeListInfo> >*' -->
-            <parameter type-id='type-id-903' is-artificial='yes'/>
+            <parameter type-id='type-id-1302' is-artificial='yes'/>
             <!-- class __gnu_cxx::__normal_iterator<MallocExtension::FreeListInfo*, std::vector<MallocExtension::FreeListInfo, std::allocator<MallocExtension::FreeListInfo> > > -->
-            <return type-id='type-id-1344'/>
+            <return type-id='type-id-1343'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
@@ -34537,9 +34528,9 @@
           <!-- __gnu_cxx::__normal_iterator<MallocExtension::FreeListInfo*, std::vector<MallocExtension::FreeListInfo, std::allocator<MallocExtension::FreeListInfo> > > std::vector<MallocExtension::FreeListInfo, std::allocator<MallocExtension::FreeListInfo> >::end() -->
           <function-decl name='end' mangled-name='_ZNSt6vectorIN15MallocExtension12FreeListInfoESaIS1_EE3endEv' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='443' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::vector<MallocExtension::FreeListInfo, std::allocator<MallocExtension::FreeListInfo> >*' -->
-            <parameter type-id='type-id-903' is-artificial='yes'/>
+            <parameter type-id='type-id-1302' is-artificial='yes'/>
             <!-- class __gnu_cxx::__normal_iterator<MallocExtension::FreeListInfo*, std::vector<MallocExtension::FreeListInfo, std::allocator<MallocExtension::FreeListInfo> > > -->
-            <return type-id='type-id-1344'/>
+            <return type-id='type-id-1343'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
@@ -34555,7 +34546,7 @@
           <!-- std::reverse_iterator<__gnu_cxx::__normal_iterator<MallocExtension::FreeListInfo*, std::vector<MallocExtension::FreeListInfo, std::allocator<MallocExtension::FreeListInfo> > > > std::vector<MallocExtension::FreeListInfo, std::allocator<MallocExtension::FreeListInfo> >::rbegin() -->
           <function-decl name='rbegin' mangled-name='_ZNSt6vectorIN15MallocExtension12FreeListInfoESaIS1_EE6rbeginEv' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='461' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::vector<MallocExtension::FreeListInfo, std::allocator<MallocExtension::FreeListInfo> >*' -->
-            <parameter type-id='type-id-903' is-artificial='yes'/>
+            <parameter type-id='type-id-1302' is-artificial='yes'/>
             <!-- class std::reverse_iterator<__gnu_cxx::__normal_iterator<MallocExtension::FreeListInfo*, std::vector<MallocExtension::FreeListInfo, std::allocator<MallocExtension::FreeListInfo> > > > -->
             <return type-id='type-id-1488'/>
           </function-decl>
@@ -34573,7 +34564,7 @@
           <!-- std::reverse_iterator<__gnu_cxx::__normal_iterator<MallocExtension::FreeListInfo*, std::vector<MallocExtension::FreeListInfo, std::allocator<MallocExtension::FreeListInfo> > > > std::vector<MallocExtension::FreeListInfo, std::allocator<MallocExtension::FreeListInfo> >::rend() -->
           <function-decl name='rend' mangled-name='_ZNSt6vectorIN15MallocExtension12FreeListInfoESaIS1_EE4rendEv' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='479' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::vector<MallocExtension::FreeListInfo, std::allocator<MallocExtension::FreeListInfo> >*' -->
-            <parameter type-id='type-id-903' is-artificial='yes'/>
+            <parameter type-id='type-id-1302' is-artificial='yes'/>
             <!-- class std::reverse_iterator<__gnu_cxx::__normal_iterator<MallocExtension::FreeListInfo*, std::vector<MallocExtension::FreeListInfo, std::allocator<MallocExtension::FreeListInfo> > > > -->
             <return type-id='type-id-1488'/>
           </function-decl>
@@ -34609,11 +34600,11 @@
           <!-- void std::vector<MallocExtension::FreeListInfo, std::allocator<MallocExtension::FreeListInfo> >::resize(unsigned long int, MallocExtension::FreeListInfo) -->
           <function-decl name='resize' mangled-name='_ZNSt6vectorIN15MallocExtension12FreeListInfoESaIS1_EE6resizeEmS1_' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='552' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::vector<MallocExtension::FreeListInfo, std::allocator<MallocExtension::FreeListInfo> >*' -->
-            <parameter type-id='type-id-903' is-artificial='yes'/>
+            <parameter type-id='type-id-1302' is-artificial='yes'/>
             <!-- parameter of type 'unsigned long int' -->
             <parameter type-id='type-id-5'/>
             <!-- parameter of type 'struct MallocExtension::FreeListInfo' -->
-            <parameter type-id='type-id-899'/>
+            <parameter type-id='type-id-1299'/>
             <!-- void -->
             <return type-id='type-id-56'/>
           </function-decl>
@@ -34640,7 +34631,7 @@
           <!-- void std::vector<MallocExtension::FreeListInfo, std::allocator<MallocExtension::FreeListInfo> >::reserve(unsigned long int) -->
           <function-decl name='reserve' mangled-name='_ZNSt6vectorIN15MallocExtension12FreeListInfoESaIS1_EE7reserveEm' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/vector.tcc' line='64' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::vector<MallocExtension::FreeListInfo, std::allocator<MallocExtension::FreeListInfo> >*' -->
-            <parameter type-id='type-id-903' is-artificial='yes'/>
+            <parameter type-id='type-id-1302' is-artificial='yes'/>
             <!-- parameter of type 'unsigned long int' -->
             <parameter type-id='type-id-5'/>
             <!-- void -->
@@ -34651,11 +34642,11 @@
           <!-- MallocExtension::FreeListInfo& std::vector<MallocExtension::FreeListInfo, std::allocator<MallocExtension::FreeListInfo> >::operator[](unsigned long int) -->
           <function-decl name='operator[]' mangled-name='_ZNSt6vectorIN15MallocExtension12FreeListInfoESaIS1_EEixEm' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='610' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::vector<MallocExtension::FreeListInfo, std::allocator<MallocExtension::FreeListInfo> >*' -->
-            <parameter type-id='type-id-903' is-artificial='yes'/>
+            <parameter type-id='type-id-1302' is-artificial='yes'/>
             <!-- parameter of type 'unsigned long int' -->
             <parameter type-id='type-id-5'/>
             <!-- MallocExtension::FreeListInfo& -->
-            <return type-id='type-id-1339'/>
+            <return type-id='type-id-1338'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
@@ -34666,7 +34657,7 @@
             <!-- parameter of type 'unsigned long int' -->
             <parameter type-id='type-id-5'/>
             <!-- const MallocExtension::FreeListInfo& -->
-            <return type-id='type-id-1356'/>
+            <return type-id='type-id-1355'/>
           </function-decl>
         </member-function>
         <member-function access='protected'>
@@ -34684,11 +34675,11 @@
           <!-- MallocExtension::FreeListInfo& std::vector<MallocExtension::FreeListInfo, std::allocator<MallocExtension::FreeListInfo> >::at(unsigned long int) -->
           <function-decl name='at' mangled-name='_ZNSt6vectorIN15MallocExtension12FreeListInfoESaIS1_EE2atEm' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='650' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::vector<MallocExtension::FreeListInfo, std::allocator<MallocExtension::FreeListInfo> >*' -->
-            <parameter type-id='type-id-903' is-artificial='yes'/>
+            <parameter type-id='type-id-1302' is-artificial='yes'/>
             <!-- parameter of type 'unsigned long int' -->
             <parameter type-id='type-id-5'/>
             <!-- MallocExtension::FreeListInfo& -->
-            <return type-id='type-id-1339'/>
+            <return type-id='type-id-1338'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
@@ -34699,16 +34690,16 @@
             <!-- parameter of type 'unsigned long int' -->
             <parameter type-id='type-id-5'/>
             <!-- const MallocExtension::FreeListInfo& -->
-            <return type-id='type-id-1356'/>
+            <return type-id='type-id-1355'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <!-- MallocExtension::FreeListInfo& std::vector<MallocExtension::FreeListInfo, std::allocator<MallocExtension::FreeListInfo> >::front() -->
           <function-decl name='front' mangled-name='_ZNSt6vectorIN15MallocExtension12FreeListInfoESaIS1_EE5frontEv' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='679' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::vector<MallocExtension::FreeListInfo, std::allocator<MallocExtension::FreeListInfo> >*' -->
-            <parameter type-id='type-id-903' is-artificial='yes'/>
+            <parameter type-id='type-id-1302' is-artificial='yes'/>
             <!-- MallocExtension::FreeListInfo& -->
-            <return type-id='type-id-1339'/>
+            <return type-id='type-id-1338'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
@@ -34717,16 +34708,16 @@
             <!-- implicit parameter of type 'const std::vector<MallocExtension::FreeListInfo, std::allocator<MallocExtension::FreeListInfo> >*' -->
             <parameter type-id='type-id-1402' is-artificial='yes'/>
             <!-- const MallocExtension::FreeListInfo& -->
-            <return type-id='type-id-1356'/>
+            <return type-id='type-id-1355'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <!-- MallocExtension::FreeListInfo& std::vector<MallocExtension::FreeListInfo, std::allocator<MallocExtension::FreeListInfo> >::back() -->
           <function-decl name='back' mangled-name='_ZNSt6vectorIN15MallocExtension12FreeListInfoESaIS1_EE4backEv' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='695' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::vector<MallocExtension::FreeListInfo, std::allocator<MallocExtension::FreeListInfo> >*' -->
-            <parameter type-id='type-id-903' is-artificial='yes'/>
+            <parameter type-id='type-id-1302' is-artificial='yes'/>
             <!-- MallocExtension::FreeListInfo& -->
-            <return type-id='type-id-1339'/>
+            <return type-id='type-id-1338'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
@@ -34735,16 +34726,16 @@
             <!-- implicit parameter of type 'const std::vector<MallocExtension::FreeListInfo, std::allocator<MallocExtension::FreeListInfo> >*' -->
             <parameter type-id='type-id-1402' is-artificial='yes'/>
             <!-- const MallocExtension::FreeListInfo& -->
-            <return type-id='type-id-1356'/>
+            <return type-id='type-id-1355'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <!-- MallocExtension::FreeListInfo* std::vector<MallocExtension::FreeListInfo, std::allocator<MallocExtension::FreeListInfo> >::data() -->
           <function-decl name='data' mangled-name='_ZNSt6vectorIN15MallocExtension12FreeListInfoESaIS1_EE4dataEv' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='714' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::vector<MallocExtension::FreeListInfo, std::allocator<MallocExtension::FreeListInfo> >*' -->
-            <parameter type-id='type-id-903' is-artificial='yes'/>
+            <parameter type-id='type-id-1302' is-artificial='yes'/>
             <!-- MallocExtension::FreeListInfo* -->
-            <return type-id='type-id-1340'/>
+            <return type-id='type-id-1339'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
@@ -34753,16 +34744,16 @@
             <!-- implicit parameter of type 'const std::vector<MallocExtension::FreeListInfo, std::allocator<MallocExtension::FreeListInfo> >*' -->
             <parameter type-id='type-id-1402' is-artificial='yes'/>
             <!-- const MallocExtension::FreeListInfo* -->
-            <return type-id='type-id-1357'/>
+            <return type-id='type-id-1356'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <!-- void std::vector<MallocExtension::FreeListInfo, std::allocator<MallocExtension::FreeListInfo> >::push_back(const MallocExtension::FreeListInfo&) -->
           <function-decl name='push_back' mangled-name='_ZNSt6vectorIN15MallocExtension12FreeListInfoESaIS1_EE9push_backERKS1_' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='733' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::vector<MallocExtension::FreeListInfo, std::allocator<MallocExtension::FreeListInfo> >*' -->
-            <parameter type-id='type-id-903' is-artificial='yes'/>
+            <parameter type-id='type-id-1302' is-artificial='yes'/>
             <!-- parameter of type 'const MallocExtension::FreeListInfo&' -->
-            <parameter type-id='type-id-1356'/>
+            <parameter type-id='type-id-1355'/>
             <!-- void -->
             <return type-id='type-id-56'/>
           </function-decl>
@@ -34771,7 +34762,7 @@
           <!-- void std::vector<MallocExtension::FreeListInfo, std::allocator<MallocExtension::FreeListInfo> >::pop_back() -->
           <function-decl name='pop_back' mangled-name='_ZNSt6vectorIN15MallocExtension12FreeListInfoESaIS1_EE8pop_backEv' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='764' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::vector<MallocExtension::FreeListInfo, std::allocator<MallocExtension::FreeListInfo> >*' -->
-            <parameter type-id='type-id-903' is-artificial='yes'/>
+            <parameter type-id='type-id-1302' is-artificial='yes'/>
             <!-- void -->
             <return type-id='type-id-56'/>
           </function-decl>
@@ -34780,26 +34771,26 @@
           <!-- __gnu_cxx::__normal_iterator<MallocExtension::FreeListInfo*, std::vector<MallocExtension::FreeListInfo, std::allocator<MallocExtension::FreeListInfo> > > std::vector<MallocExtension::FreeListInfo, std::allocator<MallocExtension::FreeListInfo> >::insert(__gnu_cxx::__normal_iterator<MallocExtension::FreeListInfo*, std::vector<MallocExtension::FreeListInfo, std::allocator<MallocExtension::FreeListInfo> > >, const MallocExtension::FreeListInfo&) -->
           <function-decl name='insert' mangled-name='_ZNSt6vectorIN15MallocExtension12FreeListInfoESaIS1_EE6insertEN9__gnu_cxx17__normal_iteratorIPS1_S3_EERKS1_' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/vector.tcc' line='106' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::vector<MallocExtension::FreeListInfo, std::allocator<MallocExtension::FreeListInfo> >*' -->
-            <parameter type-id='type-id-903' is-artificial='yes'/>
+            <parameter type-id='type-id-1302' is-artificial='yes'/>
             <!-- parameter of type 'class __gnu_cxx::__normal_iterator<MallocExtension::FreeListInfo*, std::vector<MallocExtension::FreeListInfo, std::allocator<MallocExtension::FreeListInfo> > >' -->
-            <parameter type-id='type-id-1344'/>
+            <parameter type-id='type-id-1343'/>
             <!-- parameter of type 'const MallocExtension::FreeListInfo&' -->
-            <parameter type-id='type-id-1356'/>
+            <parameter type-id='type-id-1355'/>
             <!-- class __gnu_cxx::__normal_iterator<MallocExtension::FreeListInfo*, std::vector<MallocExtension::FreeListInfo, std::allocator<MallocExtension::FreeListInfo> > > -->
-            <return type-id='type-id-1344'/>
+            <return type-id='type-id-1343'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <!-- void std::vector<MallocExtension::FreeListInfo, std::allocator<MallocExtension::FreeListInfo> >::insert(__gnu_cxx::__normal_iterator<MallocExtension::FreeListInfo*, std::vector<MallocExtension::FreeListInfo, std::allocator<MallocExtension::FreeListInfo> > >, unsigned long int, const MallocExtension::FreeListInfo&) -->
           <function-decl name='insert' mangled-name='_ZNSt6vectorIN15MallocExtension12FreeListInfoESaIS1_EE6insertEN9__gnu_cxx17__normal_iteratorIPS1_S3_EEmRKS1_' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='850' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::vector<MallocExtension::FreeListInfo, std::allocator<MallocExtension::FreeListInfo> >*' -->
-            <parameter type-id='type-id-903' is-artificial='yes'/>
+            <parameter type-id='type-id-1302' is-artificial='yes'/>
             <!-- parameter of type 'class __gnu_cxx::__normal_iterator<MallocExtension::FreeListInfo*, std::vector<MallocExtension::FreeListInfo, std::allocator<MallocExtension::FreeListInfo> > >' -->
-            <parameter type-id='type-id-1344'/>
+            <parameter type-id='type-id-1343'/>
             <!-- parameter of type 'unsigned long int' -->
             <parameter type-id='type-id-5'/>
             <!-- parameter of type 'const MallocExtension::FreeListInfo&' -->
-            <parameter type-id='type-id-1356'/>
+            <parameter type-id='type-id-1355'/>
             <!-- void -->
             <return type-id='type-id-56'/>
           </function-decl>
@@ -34808,31 +34799,31 @@
           <!-- __gnu_cxx::__normal_iterator<MallocExtension::FreeListInfo*, std::vector<MallocExtension::FreeListInfo, std::allocator<MallocExtension::FreeListInfo> > > std::vector<MallocExtension::FreeListInfo, std::allocator<MallocExtension::FreeListInfo> >::erase(__gnu_cxx::__normal_iterator<MallocExtension::FreeListInfo*, std::vector<MallocExtension::FreeListInfo, std::allocator<MallocExtension::FreeListInfo> > >) -->
           <function-decl name='erase' mangled-name='_ZNSt6vectorIN15MallocExtension12FreeListInfoESaIS1_EE5eraseEN9__gnu_cxx17__normal_iteratorIPS1_S3_EE' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/vector.tcc' line='133' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::vector<MallocExtension::FreeListInfo, std::allocator<MallocExtension::FreeListInfo> >*' -->
-            <parameter type-id='type-id-903' is-artificial='yes'/>
+            <parameter type-id='type-id-1302' is-artificial='yes'/>
             <!-- parameter of type 'class __gnu_cxx::__normal_iterator<MallocExtension::FreeListInfo*, std::vector<MallocExtension::FreeListInfo, std::allocator<MallocExtension::FreeListInfo> > >' -->
-            <parameter type-id='type-id-1344'/>
+            <parameter type-id='type-id-1343'/>
             <!-- class __gnu_cxx::__normal_iterator<MallocExtension::FreeListInfo*, std::vector<MallocExtension::FreeListInfo, std::allocator<MallocExtension::FreeListInfo> > > -->
-            <return type-id='type-id-1344'/>
+            <return type-id='type-id-1343'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <!-- __gnu_cxx::__normal_iterator<MallocExtension::FreeListInfo*, std::vector<MallocExtension::FreeListInfo, std::allocator<MallocExtension::FreeListInfo> > > std::vector<MallocExtension::FreeListInfo, std::allocator<MallocExtension::FreeListInfo> >::erase(__gnu_cxx::__normal_iterator<MallocExtension::FreeListInfo*, std::vector<MallocExtension::FreeListInfo, std::allocator<MallocExtension::FreeListInfo> > >, __gnu_cxx::__normal_iterator<MallocExtension::FreeListInfo*, std::vector<MallocExtension::FreeListInfo, std::allocator<MallocExtension::FreeListInfo> > >) -->
           <function-decl name='erase' mangled-name='_ZNSt6vectorIN15MallocExtension12FreeListInfoESaIS1_EE5eraseEN9__gnu_cxx17__normal_iteratorIPS1_S3_EES7_' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/vector.tcc' line='145' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::vector<MallocExtension::FreeListInfo, std::allocator<MallocExtension::FreeListInfo> >*' -->
-            <parameter type-id='type-id-903' is-artificial='yes'/>
+            <parameter type-id='type-id-1302' is-artificial='yes'/>
             <!-- parameter of type 'class __gnu_cxx::__normal_iterator<MallocExtension::FreeListInfo*, std::vector<MallocExtension::FreeListInfo, std::allocator<MallocExtension::FreeListInfo> > >' -->
-            <parameter type-id='type-id-1344'/>
+            <parameter type-id='type-id-1343'/>
             <!-- parameter of type 'class __gnu_cxx::__normal_iterator<MallocExtension::FreeListInfo*, std::vector<MallocExtension::FreeListInfo, std::allocator<MallocExtension::FreeListInfo> > >' -->
-            <parameter type-id='type-id-1344'/>
+            <parameter type-id='type-id-1343'/>
             <!-- class __gnu_cxx::__normal_iterator<MallocExtension::FreeListInfo*, std::vector<MallocExtension::FreeListInfo, std::allocator<MallocExtension::FreeListInfo> > > -->
-            <return type-id='type-id-1344'/>
+            <return type-id='type-id-1343'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <!-- void std::vector<MallocExtension::FreeListInfo, std::allocator<MallocExtension::FreeListInfo> >::swap(std::vector<MallocExtension::FreeListInfo, std::allocator<MallocExtension::FreeListInfo> >&) -->
           <function-decl name='swap' mangled-name='_ZNSt6vectorIN15MallocExtension12FreeListInfoESaIS1_EE4swapERS3_' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='929' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::vector<MallocExtension::FreeListInfo, std::allocator<MallocExtension::FreeListInfo> >*' -->
-            <parameter type-id='type-id-903' is-artificial='yes'/>
+            <parameter type-id='type-id-1302' is-artificial='yes'/>
             <!-- parameter of type 'std::vector<MallocExtension::FreeListInfo, std::allocator<MallocExtension::FreeListInfo> >&' -->
             <parameter type-id='type-id-1445'/>
             <!-- void -->
@@ -34843,7 +34834,7 @@
           <!-- void std::vector<MallocExtension::FreeListInfo, std::allocator<MallocExtension::FreeListInfo> >::clear() -->
           <function-decl name='clear' mangled-name='_ZNSt6vectorIN15MallocExtension12FreeListInfoESaIS1_EE5clearEv' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='950' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::vector<MallocExtension::FreeListInfo, std::allocator<MallocExtension::FreeListInfo> >*' -->
-            <parameter type-id='type-id-903' is-artificial='yes'/>
+            <parameter type-id='type-id-1302' is-artificial='yes'/>
             <!-- void -->
             <return type-id='type-id-56'/>
           </function-decl>
@@ -34852,11 +34843,11 @@
           <!-- void std::vector<MallocExtension::FreeListInfo, std::allocator<MallocExtension::FreeListInfo> >::_M_fill_initialize(unsigned long int, const MallocExtension::FreeListInfo&) -->
           <function-decl name='_M_fill_initialize' mangled-name='_ZNSt6vectorIN15MallocExtension12FreeListInfoESaIS1_EE18_M_fill_initializeEmRKS1_' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='1033' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::vector<MallocExtension::FreeListInfo, std::allocator<MallocExtension::FreeListInfo> >*' -->
-            <parameter type-id='type-id-903' is-artificial='yes'/>
+            <parameter type-id='type-id-1302' is-artificial='yes'/>
             <!-- parameter of type 'unsigned long int' -->
             <parameter type-id='type-id-5'/>
             <!-- parameter of type 'const MallocExtension::FreeListInfo&' -->
-            <parameter type-id='type-id-1356'/>
+            <parameter type-id='type-id-1355'/>
             <!-- void -->
             <return type-id='type-id-56'/>
           </function-decl>
@@ -34865,11 +34856,11 @@
           <!-- void std::vector<MallocExtension::FreeListInfo, std::allocator<MallocExtension::FreeListInfo> >::_M_fill_assign(unsigned long int, const MallocExtension::FreeListInfo&) -->
           <function-decl name='_M_fill_assign' mangled-name='_ZNSt6vectorIN15MallocExtension12FreeListInfoESaIS1_EE14_M_fill_assignEmRKS1_' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/vector.tcc' line='195' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::vector<MallocExtension::FreeListInfo, std::allocator<MallocExtension::FreeListInfo> >*' -->
-            <parameter type-id='type-id-903' is-artificial='yes'/>
+            <parameter type-id='type-id-1302' is-artificial='yes'/>
             <!-- parameter of type 'unsigned long int' -->
             <parameter type-id='type-id-5'/>
             <!-- parameter of type 'const MallocExtension::FreeListInfo&' -->
-            <parameter type-id='type-id-1356'/>
+            <parameter type-id='type-id-1355'/>
             <!-- void -->
             <return type-id='type-id-56'/>
           </function-decl>
@@ -34878,13 +34869,13 @@
           <!-- void std::vector<MallocExtension::FreeListInfo, std::allocator<MallocExtension::FreeListInfo> >::_M_fill_insert(__gnu_cxx::__normal_iterator<MallocExtension::FreeListInfo*, std::vector<MallocExtension::FreeListInfo, std::allocator<MallocExtension::FreeListInfo> > >, unsigned long int, const MallocExtension::FreeListInfo&) -->
           <function-decl name='_M_fill_insert' mangled-name='_ZNSt6vectorIN15MallocExtension12FreeListInfoESaIS1_EE14_M_fill_insertEN9__gnu_cxx17__normal_iteratorIPS1_S3_EEmRKS1_' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/vector.tcc' line='372' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::vector<MallocExtension::FreeListInfo, std::allocator<MallocExtension::FreeListInfo> >*' -->
-            <parameter type-id='type-id-903' is-artificial='yes'/>
+            <parameter type-id='type-id-1302' is-artificial='yes'/>
             <!-- parameter of type 'class __gnu_cxx::__normal_iterator<MallocExtension::FreeListInfo*, std::vector<MallocExtension::FreeListInfo, std::allocator<MallocExtension::FreeListInfo> > >' -->
-            <parameter type-id='type-id-1344'/>
+            <parameter type-id='type-id-1343'/>
             <!-- parameter of type 'unsigned long int' -->
             <parameter type-id='type-id-5'/>
             <!-- parameter of type 'const MallocExtension::FreeListInfo&' -->
-            <parameter type-id='type-id-1356'/>
+            <parameter type-id='type-id-1355'/>
             <!-- void -->
             <return type-id='type-id-56'/>
           </function-decl>
@@ -34893,11 +34884,11 @@
           <!-- void std::vector<MallocExtension::FreeListInfo, std::allocator<MallocExtension::FreeListInfo> >::_M_insert_aux(__gnu_cxx::__normal_iterator<MallocExtension::FreeListInfo*, std::vector<MallocExtension::FreeListInfo, std::allocator<MallocExtension::FreeListInfo> > >, const MallocExtension::FreeListInfo&) -->
           <function-decl name='_M_insert_aux' mangled-name='_ZNSt6vectorIN15MallocExtension12FreeListInfoESaIS1_EE13_M_insert_auxEN9__gnu_cxx17__normal_iteratorIPS1_S3_EERKS1_' 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='_ZNSt6vectorIN15MallocExtension12FreeListInfoESaIS1_EE13_M_insert_auxEN9__gnu_cxx17__normal_iteratorIPS1_S3_EERKS1_'>
             <!-- implicit parameter of type 'std::vector<MallocExtension::FreeListInfo, std::allocator<MallocExtension::FreeListInfo> >*' -->
-            <parameter type-id='type-id-903' is-artificial='yes'/>
+            <parameter type-id='type-id-1302' is-artificial='yes'/>
             <!-- parameter of type 'class __gnu_cxx::__normal_iterator<MallocExtension::FreeListInfo*, std::vector<MallocExtension::FreeListInfo, std::allocator<MallocExtension::FreeListInfo> > >' -->
-            <parameter type-id='type-id-1344'/>
+            <parameter type-id='type-id-1343'/>
             <!-- parameter of type 'const MallocExtension::FreeListInfo&' -->
-            <parameter type-id='type-id-1356'/>
+            <parameter type-id='type-id-1355'/>
             <!-- void -->
             <return type-id='type-id-56'/>
           </function-decl>
@@ -34919,9 +34910,9 @@
           <!-- void std::vector<MallocExtension::FreeListInfo, std::allocator<MallocExtension::FreeListInfo> >::_M_erase_at_end(MallocExtension::FreeListInfo*) -->
           <function-decl name='_M_erase_at_end' mangled-name='_ZNSt6vectorIN15MallocExtension12FreeListInfoESaIS1_EE15_M_erase_at_endEPS1_' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='1148' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::vector<MallocExtension::FreeListInfo, std::allocator<MallocExtension::FreeListInfo> >*' -->
-            <parameter type-id='type-id-903' is-artificial='yes'/>
+            <parameter type-id='type-id-1302' is-artificial='yes'/>
             <!-- parameter of type 'MallocExtension::FreeListInfo*' -->
-            <parameter type-id='type-id-1340'/>
+            <parameter type-id='type-id-1339'/>
             <!-- void -->
             <return type-id='type-id-56'/>
           </function-decl>
@@ -34937,13 +34928,13 @@
           <!-- MallocExtension::FreeListInfo* std::__copy_move_backward<false, true, std::random_access_iterator_tag>::__copy_move_b<MallocExtension::FreeListInfo>(const MallocExtension::FreeListInfo*, MallocExtension::FreeListInfo*) -->
           <function-decl name='__copy_move_b&lt;MallocExtension::FreeListInfo&gt;' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_algobase.h' line='572' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- parameter of type 'const MallocExtension::FreeListInfo*' -->
-            <parameter type-id='type-id-1357'/>
+            <parameter type-id='type-id-1356'/>
             <!-- parameter of type 'const MallocExtension::FreeListInfo*' -->
-            <parameter type-id='type-id-1357'/>
+            <parameter type-id='type-id-1356'/>
             <!-- parameter of type 'MallocExtension::FreeListInfo*' -->
-            <parameter type-id='type-id-1340'/>
+            <parameter type-id='type-id-1339'/>
             <!-- MallocExtension::FreeListInfo* -->
-            <return type-id='type-id-1340'/>
+            <return type-id='type-id-1339'/>
           </function-decl>
         </member-function>
         <member-function access='public' static='yes'>
@@ -34992,9 +34983,9 @@
           <!-- MallocExtension::FreeListInfo* std::__niter_base<MallocExtension::FreeListInfo*, false>::__b() -->
           <function-decl name='__b' mangled-name='_ZNSt12__niter_baseIPN15MallocExtension12FreeListInfoELb0EE3__bES2_' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_algobase.h' line='269' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- parameter of type 'MallocExtension::FreeListInfo*' -->
-            <parameter type-id='type-id-1340'/>
+            <parameter type-id='type-id-1339'/>
             <!-- MallocExtension::FreeListInfo* -->
-            <return type-id='type-id-1340'/>
+            <return type-id='type-id-1339'/>
           </function-decl>
         </member-function>
       </class-decl>
@@ -35004,9 +34995,9 @@
           <!-- MallocExtension::FreeListInfo* std::__miter_base<MallocExtension::FreeListInfo*, false>::__b() -->
           <function-decl name='__b' mangled-name='_ZNSt12__miter_baseIPN15MallocExtension12FreeListInfoELb0EE3__bES2_' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_algobase.h' line='287' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- parameter of type 'MallocExtension::FreeListInfo*' -->
-            <parameter type-id='type-id-1340'/>
+            <parameter type-id='type-id-1339'/>
             <!-- MallocExtension::FreeListInfo* -->
-            <return type-id='type-id-1340'/>
+            <return type-id='type-id-1339'/>
           </function-decl>
         </member-function>
       </class-decl>
@@ -35016,13 +35007,13 @@
           <!-- MallocExtension::FreeListInfo* std::__copy_move<false, true, std::random_access_iterator_tag>::__copy_m<MallocExtension::FreeListInfo>(const MallocExtension::FreeListInfo*, MallocExtension::FreeListInfo*) -->
           <function-decl name='__copy_m&lt;MallocExtension::FreeListInfo&gt;' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_algobase.h' line='376' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- parameter of type 'const MallocExtension::FreeListInfo*' -->
-            <parameter type-id='type-id-1357'/>
+            <parameter type-id='type-id-1356'/>
             <!-- parameter of type 'const MallocExtension::FreeListInfo*' -->
-            <parameter type-id='type-id-1357'/>
+            <parameter type-id='type-id-1356'/>
             <!-- parameter of type 'MallocExtension::FreeListInfo*' -->
-            <parameter type-id='type-id-1340'/>
+            <parameter type-id='type-id-1339'/>
             <!-- MallocExtension::FreeListInfo* -->
-            <return type-id='type-id-1340'/>
+            <return type-id='type-id-1339'/>
           </function-decl>
         </member-function>
         <member-function access='public' static='yes'>
@@ -35071,13 +35062,13 @@
           <!-- MallocExtension::FreeListInfo* std::__uninitialized_copy<true>::uninitialized_copy<MallocExtension::FreeListInfo*, MallocExtension::FreeListInfo*>(MallocExtension::FreeListInfo*, MallocExtension::FreeListInfo*) -->
           <function-decl name='uninitialized_copy&lt;MallocExtension::FreeListInfo*, MallocExtension::FreeListInfo*&gt;' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_uninitialized.h' line='90' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- parameter of type 'MallocExtension::FreeListInfo*' -->
-            <parameter type-id='type-id-1340'/>
+            <parameter type-id='type-id-1339'/>
             <!-- parameter of type 'MallocExtension::FreeListInfo*' -->
-            <parameter type-id='type-id-1340'/>
+            <parameter type-id='type-id-1339'/>
             <!-- parameter of type 'MallocExtension::FreeListInfo*' -->
-            <parameter type-id='type-id-1340'/>
+            <parameter type-id='type-id-1339'/>
             <!-- MallocExtension::FreeListInfo* -->
-            <return type-id='type-id-1340'/>
+            <return type-id='type-id-1339'/>
           </function-decl>
         </member-function>
         <member-function access='public' static='yes'>
@@ -37132,7 +37123,7 @@
       <!-- class std::allocator<char> -->
       <class-decl name='allocator&lt;char&gt;' size-in-bits='8' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stringfwd.h' line='45' column='1' id='type-id-1386'>
         <!-- class __gnu_cxx::new_allocator<char> -->
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1349'/>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1348'/>
         <member-function access='private'>
           <!-- void std::allocator<char>::allocator() -->
           <function-decl name='allocator' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/allocator.h' line='101' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -37174,379 +37165,35 @@
       <!-- struct std::nothrow_t -->
       <class-decl name='nothrow_t' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/new' line='67' column='1' id='type-id-1395'/>
     </namespace-decl>
-    <!-- class MallocExtension -->
-    <class-decl name='MallocExtension' size-in-bits='64' visibility='default' filepath='src/gperftools/malloc_extension.h' line='90' column='1' is-declaration-only='yes' id='type-id-894'>
-      <member-type access='private'>
-        <!-- enum MallocExtension::Ownership -->
-        <enum-decl name='Ownership' filepath='./src/gperftools/malloc_extension.h' line='315' column='1' id='type-id-898'>
-          <underlying-type type-id='type-id-133'/>
-          <enumerator name='kUnknownOwnership' value='0'/>
-          <enumerator name='kOwned' value='1'/>
-          <enumerator name='kNotOwned' value='2'/>
-        </enum-decl>
-      </member-type>
-      <member-type access='private'>
-        <!-- struct MallocExtension::FreeListInfo -->
-        <class-decl name='FreeListInfo' size-in-bits='256' is-struct='yes' visibility='default' filepath='./src/gperftools/malloc_extension.h' line='333' column='1' id='type-id-899'>
-          <data-member access='public' layout-offset-in-bits='0'>
-            <!-- size_t MallocExtension::FreeListInfo::min_object_size -->
-            <var-decl name='min_object_size' type-id='type-id-57' visibility='default' filepath='./src/gperftools/malloc_extension.h' line='334' column='1'/>
-          </data-member>
-          <data-member access='public' layout-offset-in-bits='64'>
-            <!-- size_t MallocExtension::FreeListInfo::max_object_size -->
-            <var-decl name='max_object_size' type-id='type-id-57' visibility='default' filepath='./src/gperftools/malloc_extension.h' line='335' column='1'/>
-          </data-member>
-          <data-member access='public' layout-offset-in-bits='128'>
-            <!-- size_t MallocExtension::FreeListInfo::total_bytes_free -->
-            <var-decl name='total_bytes_free' type-id='type-id-57' visibility='default' filepath='./src/gperftools/malloc_extension.h' line='336' column='1'/>
-          </data-member>
-          <data-member access='public' layout-offset-in-bits='192'>
-            <!-- const char* MallocExtension::FreeListInfo::type -->
-            <var-decl name='type' type-id='type-id-52' visibility='default' filepath='./src/gperftools/malloc_extension.h' line='337' column='1'/>
-          </data-member>
-        </class-decl>
-      </member-type>
-      <member-type access='private'>
-        <!-- typedef void (void*, const base::MallocRange*) MallocExtension::RangeFunction -->
-        <typedef-decl name='RangeFunction' type-id='type-id-900' filepath='src/gperftools/malloc_extension.h' line='143' column='1' id='type-id-895'/>
-      </member-type>
-      <member-function access='private' static='yes'>
-        <!-- void MallocExtension::Initialize() -->
-        <function-decl name='Initialize' mangled-name='_ZN15MallocExtension10InitializeEv' filepath='src/malloc_extension.cc' line='79' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN15MallocExtension10InitializeEv'>
-          <!-- void -->
-          <return type-id='type-id-56'/>
-        </function-decl>
-      </member-function>
-      <member-function access='private' static='yes'>
-        <!-- MallocExtension* MallocExtension::instance() -->
-        <function-decl name='instance' mangled-name='_ZN15MallocExtension8instanceEv' filepath='src/malloc_extension.cc' line='212' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN15MallocExtension8instanceEv'>
-          <!-- MallocExtension* -->
-          <return type-id='type-id-259'/>
-        </function-decl>
-      </member-function>
-      <member-function access='private'>
-        <!-- void MallocExtension::Register() -->
-        <function-decl name='Register' mangled-name='_ZN15MallocExtension8RegisterEPS_' filepath='src/malloc_extension.cc' line='217' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN15MallocExtension8RegisterEPS_'>
-          <!-- implicit parameter of type 'MallocExtension*' -->
-          <parameter type-id='type-id-259' is-artificial='yes'/>
-          <!-- void -->
-          <return type-id='type-id-56'/>
-        </function-decl>
-      </member-function>
-      <member-function access='private' destructor='yes' vtable-offset='-1'>
-        <!-- MallocExtension::~MallocExtension(int) -->
-        <function-decl name='~MallocExtension' mangled-name='_ZN15MallocExtensionD1Ev' filepath='src/malloc_extension.cc' line='111' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN15MallocExtensionD1Ev'>
-          <!-- implicit parameter of type 'MallocExtension*' -->
-          <parameter type-id='type-id-259' is-artificial='yes'/>
-          <!-- artificial parameter of type 'int' -->
-          <parameter type-id='type-id-1' is-artificial='yes'/>
-          <!-- void -->
-          <return type-id='type-id-56'/>
-        </function-decl>
-      </member-function>
-      <member-function access='private' vtable-offset='2'>
-        <!-- bool MallocExtension::VerifyAllMemory() -->
-        <function-decl name='VerifyAllMemory' mangled-name='_ZN15MallocExtension15VerifyAllMemoryEv' filepath='src/malloc_extension.cc' line='112' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN15MallocExtension15VerifyAllMemoryEv'>
-          <!-- implicit parameter of type 'MallocExtension*' -->
-          <parameter type-id='type-id-259' is-artificial='yes'/>
-          <!-- bool -->
-          <return type-id='type-id-55'/>
-        </function-decl>
-      </member-function>
-      <member-function access='private' vtable-offset='3'>
-        <!-- bool MallocExtension::VerifyNewMemory(void*) -->
-        <function-decl name='VerifyNewMemory' mangled-name='_ZN15MallocExtension15VerifyNewMemoryEPKv' filepath='src/malloc_extension.cc' line='113' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN15MallocExtension15VerifyNewMemoryEPKv'>
-          <!-- implicit parameter of type 'MallocExtension*' -->
-          <parameter type-id='type-id-259' is-artificial='yes'/>
-          <!-- parameter of type 'void*' -->
-          <parameter type-id='type-id-53'/>
-          <!-- bool -->
-          <return type-id='type-id-55'/>
-        </function-decl>
-      </member-function>
-      <member-function access='private' vtable-offset='4'>
-        <!-- bool MallocExtension::VerifyArrayNewMemory(void*) -->
-        <function-decl name='VerifyArrayNewMemory' mangled-name='_ZN15MallocExtension20VerifyArrayNewMemoryEPKv' filepath='src/malloc_extension.cc' line='114' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN15MallocExtension20VerifyArrayNewMemoryEPKv'>
-          <!-- implicit parameter of type 'MallocExtension*' -->
-          <parameter type-id='type-id-259' is-artificial='yes'/>
-          <!-- parameter of type 'void*' -->
-          <parameter type-id='type-id-53'/>
-          <!-- bool -->
-          <return type-id='type-id-55'/>
-        </function-decl>
-      </member-function>
-      <member-function access='private' vtable-offset='5'>
-        <!-- bool MallocExtension::VerifyMallocMemory(void*) -->
-        <function-decl name='VerifyMallocMemory' mangled-name='_ZN15MallocExtension18VerifyMallocMemoryEPKv' filepath='src/malloc_extension.cc' line='115' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN15MallocExtension18VerifyMallocMemoryEPKv'>
-          <!-- implicit parameter of type 'MallocExtension*' -->
-          <parameter type-id='type-id-259' is-artificial='yes'/>
-          <!-- parameter of type 'void*' -->
-          <parameter type-id='type-id-53'/>
-          <!-- bool -->
-          <return type-id='type-id-55'/>
-        </function-decl>
-      </member-function>
-      <member-function access='private' vtable-offset='6'>
-        <!-- bool MallocExtension::MallocMemoryStats(int*, size_t*, int*) -->
-        <function-decl name='MallocMemoryStats' mangled-name='_ZN15MallocExtension17MallocMemoryStatsEPiPmS0_' filepath='src/malloc_extension.cc' line='130' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN15MallocExtension17MallocMemoryStatsEPiPmS0_'>
-          <!-- implicit parameter of type 'MallocExtension*' -->
-          <parameter type-id='type-id-259' is-artificial='yes'/>
-          <!-- parameter of type 'int*' -->
-          <parameter type-id='type-id-897'/>
-          <!-- parameter of type 'size_t*' -->
-          <parameter type-id='type-id-230'/>
-          <!-- parameter of type 'int*' -->
-          <parameter type-id='type-id-897'/>
-          <!-- bool -->
-          <return type-id='type-id-55'/>
-        </function-decl>
-      </member-function>
-      <member-function access='private' vtable-offset='7'>
-        <!-- void MallocExtension::GetStats(char*, int) -->
-        <function-decl name='GetStats' mangled-name='_ZN15MallocExtension8GetStatsEPci' filepath='src/malloc_extension.cc' line='125' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN15MallocExtension8GetStatsEPci'>
-          <!-- implicit parameter of type 'MallocExtension*' -->
-          <parameter type-id='type-id-259' is-artificial='yes'/>
-          <!-- parameter of type 'char*' -->
-          <parameter type-id='type-id-90'/>
-          <!-- parameter of type 'int' -->
-          <parameter type-id='type-id-1'/>
-          <!-- void -->
-          <return type-id='type-id-56'/>
-        </function-decl>
-      </member-function>
-      <member-function access='private' vtable-offset='8'>
-        <!-- void MallocExtension::GetHeapSample(MallocExtensionWriter*) -->
-        <function-decl name='GetHeapSample' mangled-name='_ZN15MallocExtension13GetHeapSampleEPSs' filepath='src/malloc_extension.cc' line='292' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN15MallocExtension13GetHeapSampleEPSs'>
-          <!-- implicit parameter of type 'MallocExtension*' -->
-          <parameter type-id='type-id-259' is-artificial='yes'/>
-          <!-- parameter of type 'MallocExtensionWriter*' -->
-          <parameter type-id='type-id-901'/>
-          <!-- void -->
-          <return type-id='type-id-56'/>
-        </function-decl>
-      </member-function>
-      <member-function access='private' vtable-offset='9'>
-        <!-- void MallocExtension::GetHeapGrowthStacks(MallocExtensionWriter*) -->
-        <function-decl name='GetHeapGrowthStacks' mangled-name='_ZN15MallocExtension19GetHeapGrowthStacksEPSs' filepath='src/malloc_extension.cc' line='316' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN15MallocExtension19GetHeapGrowthStacksEPSs'>
-          <!-- implicit parameter of type 'MallocExtension*' -->
-          <parameter type-id='type-id-259' is-artificial='yes'/>
-          <!-- parameter of type 'MallocExtensionWriter*' -->
-          <parameter type-id='type-id-901'/>
-          <!-- void -->
-          <return type-id='type-id-56'/>
-        </function-decl>
-      </member-function>
-      <member-function access='private' vtable-offset='10'>
-        <!-- void MallocExtension::Ranges(void*, MallocExtension::RangeFunction*) -->
-        <function-decl name='Ranges' mangled-name='_ZN15MallocExtension6RangesEPvPFvS0_PKN4base11MallocRangeEE' filepath='src/malloc_extension.cc' line='340' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN15MallocExtension6RangesEPvPFvS0_PKN4base11MallocRangeEE'>
-          <!-- implicit parameter of type 'MallocExtension*' -->
-          <parameter type-id='type-id-259' is-artificial='yes'/>
-          <!-- parameter of type 'void*' -->
-          <parameter type-id='type-id-53'/>
-          <!-- parameter of type 'MallocExtension::RangeFunction*' -->
-          <parameter type-id='type-id-896'/>
-          <!-- void -->
-          <return type-id='type-id-56'/>
-        </function-decl>
-      </member-function>
-      <member-function access='private' vtable-offset='11'>
-        <!-- bool MallocExtension::GetNumericProperty(const char*, size_t*) -->
-        <function-decl name='GetNumericProperty' mangled-name='_ZN15MallocExtension18GetNumericPropertyEPKcPm' filepath='src/malloc_extension.cc' line='117' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN15MallocExtension18GetNumericPropertyEPKcPm'>
-          <!-- implicit parameter of type 'MallocExtension*' -->
-          <parameter type-id='type-id-259' is-artificial='yes'/>
-          <!-- parameter of type 'const char*' -->
-          <parameter type-id='type-id-52'/>
-          <!-- parameter of type 'size_t*' -->
-          <parameter type-id='type-id-230'/>
-          <!-- bool -->
-          <return type-id='type-id-55'/>
-        </function-decl>
-      </member-function>
-      <member-function access='private' vtable-offset='12'>
-        <!-- bool MallocExtension::SetNumericProperty(const char*, size_t) -->
-        <function-decl name='SetNumericProperty' mangled-name='_ZN15MallocExtension18SetNumericPropertyEPKcm' filepath='src/malloc_extension.cc' line='121' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN15MallocExtension18SetNumericPropertyEPKcm'>
-          <!-- implicit parameter of type 'MallocExtension*' -->
-          <parameter type-id='type-id-259' is-artificial='yes'/>
-          <!-- parameter of type 'const char*' -->
-          <parameter type-id='type-id-52'/>
-          <!-- parameter of type 'typedef size_t' -->
-          <parameter type-id='type-id-57'/>
-          <!-- bool -->
-          <return type-id='type-id-55'/>
-        </function-decl>
-      </member-function>
-      <member-function access='private' vtable-offset='13'>
-        <!-- void MallocExtension::MarkThreadIdle() -->
-        <function-decl name='MarkThreadIdle' mangled-name='_ZN15MallocExtension14MarkThreadIdleEv' filepath='src/malloc_extension.cc' line='146' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN15MallocExtension14MarkThreadIdleEv'>
-          <!-- implicit parameter of type 'MallocExtension*' -->
-          <parameter type-id='type-id-259' is-artificial='yes'/>
-          <!-- void -->
-          <return type-id='type-id-56'/>
-        </function-decl>
-      </member-function>
-      <member-function access='private' vtable-offset='14'>
-        <!-- void MallocExtension::MarkThreadBusy() -->
-        <function-decl name='MarkThreadBusy' mangled-name='_ZN15MallocExtension14MarkThreadBusyEv' filepath='src/malloc_extension.cc' line='150' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN15MallocExtension14MarkThreadBusyEv'>
-          <!-- implicit parameter of type 'MallocExtension*' -->
-          <parameter type-id='type-id-259' is-artificial='yes'/>
-          <!-- void -->
-          <return type-id='type-id-56'/>
-        </function-decl>
-      </member-function>
-      <member-function access='private' vtable-offset='15'>
-        <!-- SysAllocator* MallocExtension::GetSystemAllocator() -->
-        <function-decl name='GetSystemAllocator' mangled-name='_ZN15MallocExtension18GetSystemAllocatorEv' filepath='src/malloc_extension.cc' line='154' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN15MallocExtension18GetSystemAllocatorEv'>
-          <!-- implicit parameter of type 'MallocExtension*' -->
-          <parameter type-id='type-id-259' is-artificial='yes'/>
-          <!-- SysAllocator* -->
-          <return type-id='type-id-902'/>
-        </function-decl>
-      </member-function>
-      <member-function access='private' vtable-offset='16'>
-        <!-- void MallocExtension::SetSystemAllocator(SysAllocator*) -->
-        <function-decl name='SetSystemAllocator' mangled-name='_ZN15MallocExtension18SetSystemAllocatorEP12SysAllocator' filepath='src/malloc_extension.cc' line='158' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN15MallocExtension18SetSystemAllocatorEP12SysAllocator'>
-          <!-- implicit parameter of type 'MallocExtension*' -->
-          <parameter type-id='type-id-259' is-artificial='yes'/>
-          <!-- parameter of type 'SysAllocator*' -->
-          <parameter type-id='type-id-902'/>
-          <!-- void -->
-          <return type-id='type-id-56'/>
-        </function-decl>
-      </member-function>
-      <member-function access='private' vtable-offset='17'>
-        <!-- void MallocExtension::ReleaseToSystem(size_t) -->
-        <function-decl name='ReleaseToSystem' mangled-name='_ZN15MallocExtension15ReleaseToSystemEm' filepath='src/malloc_extension.cc' line='162' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN15MallocExtension15ReleaseToSystemEm'>
-          <!-- implicit parameter of type 'MallocExtension*' -->
-          <parameter type-id='type-id-259' is-artificial='yes'/>
-          <!-- parameter of type 'typedef size_t' -->
-          <parameter type-id='type-id-57'/>
-          <!-- void -->
-          <return type-id='type-id-56'/>
-        </function-decl>
-      </member-function>
-      <member-function access='private' vtable-offset='18'>
-        <!-- void MallocExtension::ReleaseFreeMemory() -->
-        <function-decl name='ReleaseFreeMemory' mangled-name='_ZN15MallocExtension17ReleaseFreeMemoryEv' filepath='src/malloc_extension.cc' line='166' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN15MallocExtension17ReleaseFreeMemoryEv'>
-          <!-- implicit parameter of type 'MallocExtension*' -->
-          <parameter type-id='type-id-259' is-artificial='yes'/>
-          <!-- void -->
-          <return type-id='type-id-56'/>
-        </function-decl>
-      </member-function>
-      <member-function access='private' vtable-offset='19'>
-        <!-- void MallocExtension::SetMemoryReleaseRate(double) -->
-        <function-decl name='SetMemoryReleaseRate' mangled-name='_ZN15MallocExtension20SetMemoryReleaseRateEd' filepath='src/malloc_extension.cc' line='170' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN15MallocExtension20SetMemoryReleaseRateEd'>
-          <!-- implicit parameter of type 'MallocExtension*' -->
-          <parameter type-id='type-id-259' is-artificial='yes'/>
-          <!-- parameter of type 'double' -->
-          <parameter type-id='type-id-2'/>
-          <!-- void -->
-          <return type-id='type-id-56'/>
-        </function-decl>
-      </member-function>
-      <member-function access='private' vtable-offset='20'>
-        <!-- double MallocExtension::GetMemoryReleaseRate() -->
-        <function-decl name='GetMemoryReleaseRate' mangled-name='_ZN15MallocExtension20GetMemoryReleaseRateEv' filepath='src/malloc_extension.cc' line='174' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN15MallocExtension20GetMemoryReleaseRateEv'>
-          <!-- implicit parameter of type 'MallocExtension*' -->
-          <parameter type-id='type-id-259' is-artificial='yes'/>
-          <!-- double -->
-          <return type-id='type-id-2'/>
-        </function-decl>
-      </member-function>
-      <member-function access='private' vtable-offset='21'>
-        <!-- size_t MallocExtension::GetEstimatedAllocatedSize(size_t) -->
-        <function-decl name='GetEstimatedAllocatedSize' mangled-name='_ZN15MallocExtension25GetEstimatedAllocatedSizeEm' filepath='src/malloc_extension.cc' line='178' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN15MallocExtension25GetEstimatedAllocatedSizeEm'>
-          <!-- implicit parameter of type 'MallocExtension*' -->
-          <parameter type-id='type-id-259' is-artificial='yes'/>
-          <!-- parameter of type 'typedef size_t' -->
-          <parameter type-id='type-id-57'/>
-          <!-- typedef size_t -->
-          <return type-id='type-id-57'/>
-        </function-decl>
-      </member-function>
-      <member-function access='private' vtable-offset='22'>
-        <!-- size_t MallocExtension::GetAllocatedSize(void*) -->
-        <function-decl name='GetAllocatedSize' mangled-name='_ZN15MallocExtension16GetAllocatedSizeEPKv' filepath='src/malloc_extension.cc' line='182' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN15MallocExtension16GetAllocatedSizeEPKv'>
-          <!-- implicit parameter of type 'MallocExtension*' -->
-          <parameter type-id='type-id-259' is-artificial='yes'/>
-          <!-- parameter of type 'void*' -->
-          <parameter type-id='type-id-53'/>
-          <!-- typedef size_t -->
-          <return type-id='type-id-57'/>
-        </function-decl>
-      </member-function>
-      <member-function access='private' vtable-offset='23'>
-        <!-- MallocExtension::Ownership MallocExtension::GetOwnership(void*) -->
-        <function-decl name='GetOwnership' mangled-name='_ZN15MallocExtension12GetOwnershipEPKv' filepath='src/malloc_extension.cc' line='187' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN15MallocExtension12GetOwnershipEPKv'>
-          <!-- implicit parameter of type 'MallocExtension*' -->
-          <parameter type-id='type-id-259' is-artificial='yes'/>
-          <!-- parameter of type 'void*' -->
-          <parameter type-id='type-id-53'/>
-          <!-- enum MallocExtension::Ownership -->
-          <return type-id='type-id-898'/>
-        </function-decl>
-      </member-function>
-      <member-function access='private' vtable-offset='24'>
-        <!-- void MallocExtension::GetFreeListSizes(std::vector<MallocExtension::FreeListInfo, std::allocator<MallocExtension::FreeListInfo> >*) -->
-        <function-decl name='GetFreeListSizes' mangled-name='_ZN15MallocExtension16GetFreeListSizesEPSt6vectorINS_12FreeListInfoESaIS1_EE' filepath='src/malloc_extension.cc' line='191' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN15MallocExtension16GetFreeListSizesEPSt6vectorINS_12FreeListInfoESaIS1_EE'>
-          <!-- implicit parameter of type 'MallocExtension*' -->
-          <parameter type-id='type-id-259' is-artificial='yes'/>
-          <!-- parameter of type 'std::vector<MallocExtension::FreeListInfo, std::allocator<MallocExtension::FreeListInfo> >*' -->
-          <parameter type-id='type-id-903'/>
-          <!-- void -->
-          <return type-id='type-id-56'/>
-        </function-decl>
-      </member-function>
-      <member-function access='private' vtable-offset='25'>
-        <!-- void** MallocExtension::ReadStackTraces(int*) -->
-        <function-decl name='ReadStackTraces' mangled-name='_ZN15MallocExtension15ReadStackTracesEPi' filepath='src/malloc_extension.cc' line='138' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN15MallocExtension15ReadStackTracesEPi'>
-          <!-- implicit parameter of type 'MallocExtension*' -->
-          <parameter type-id='type-id-259' is-artificial='yes'/>
-          <!-- parameter of type 'int*' -->
-          <parameter type-id='type-id-897'/>
-          <!-- void** -->
-          <return type-id='type-id-120'/>
-        </function-decl>
-      </member-function>
-      <member-function access='private' vtable-offset='26'>
-        <!-- void** MallocExtension::ReadHeapGrowthStackTraces() -->
-        <function-decl name='ReadHeapGrowthStackTraces' mangled-name='_ZN15MallocExtension25ReadHeapGrowthStackTracesEv' filepath='src/malloc_extension.cc' line='142' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN15MallocExtension25ReadHeapGrowthStackTracesEv'>
-          <!-- implicit parameter of type 'MallocExtension*' -->
-          <parameter type-id='type-id-259' is-artificial='yes'/>
-          <!-- void** -->
-          <return type-id='type-id-120'/>
-        </function-decl>
-      </member-function>
-    </class-decl>
     <!-- namespace __gnu_cxx -->
     <namespace-decl name='__gnu_cxx'>
       <!-- long long int __gnu_cxx::abs(long long int) -->
       <function-decl name='abs' mangled-name='_ZN9__gnu_cxx3absEx' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/cstdlib' line='170' column='1' visibility='default' binding='global' size-in-bits='64'>
         <!-- parameter of type 'long long int' -->
-        <parameter type-id='type-id-1257'/>
+        <parameter type-id='type-id-1251'/>
         <!-- long long int -->
-        <return type-id='type-id-1257'/>
+        <return type-id='type-id-1251'/>
       </function-decl>
       <!-- lldiv_t __gnu_cxx::div(long long int, long long int) -->
       <function-decl name='div' mangled-name='_ZN9__gnu_cxx3divExx' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/cstdlib' line='176' column='1' visibility='default' binding='global' size-in-bits='64'>
         <!-- parameter of type 'long long int' -->
-        <parameter type-id='type-id-1257'/>
+        <parameter type-id='type-id-1251'/>
         <!-- parameter of type 'long long int' -->
-        <parameter type-id='type-id-1257'/>
+        <parameter type-id='type-id-1251'/>
         <!-- struct lldiv_t -->
-        <return type-id='type-id-1277'/>
+        <return type-id='type-id-1271'/>
       </function-decl>
       <!-- class __gnu_cxx::__normal_iterator<MallocExtension::FreeListInfo*, std::vector<MallocExtension::FreeListInfo, std::allocator<MallocExtension::FreeListInfo> > > -->
-      <class-decl name='__normal_iterator&lt;MallocExtension::FreeListInfo*, std::vector&lt;MallocExtension::FreeListInfo, std::allocator&lt;MallocExtension::FreeListInfo&gt; &gt; &gt;' size-in-bits='64' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_iterator.h' line='669' column='1' id='type-id-1344'>
+      <class-decl name='__normal_iterator&lt;MallocExtension::FreeListInfo*, std::vector&lt;MallocExtension::FreeListInfo, std::allocator&lt;MallocExtension::FreeListInfo&gt; &gt; &gt;' size-in-bits='64' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_iterator.h' line='669' column='1' id='type-id-1343'>
         <data-member access='protected' layout-offset-in-bits='0'>
           <!-- MallocExtension::FreeListInfo* __gnu_cxx::__normal_iterator<MallocExtension::FreeListInfo*, std::vector<MallocExtension::FreeListInfo, std::allocator<MallocExtension::FreeListInfo> > >::_M_current -->
-          <var-decl name='_M_current' type-id='type-id-1340' 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'/>
+          <var-decl name='_M_current' type-id='type-id-1339' 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>
         <member-function access='private'>
           <!-- void __gnu_cxx::__normal_iterator<MallocExtension::FreeListInfo*, std::vector<MallocExtension::FreeListInfo, std::allocator<MallocExtension::FreeListInfo> > >::__normal_iterator() -->
           <function-decl name='__normal_iterator' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_iterator.h' line='683' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type '__gnu_cxx::__normal_iterator<MallocExtension::FreeListInfo*, std::vector<MallocExtension::FreeListInfo, std::allocator<MallocExtension::FreeListInfo> > >*' -->
-            <parameter type-id='type-id-1346' is-artificial='yes'/>
+            <parameter type-id='type-id-1345' is-artificial='yes'/>
             <!-- void -->
             <return type-id='type-id-56'/>
           </function-decl>
@@ -37555,9 +37202,9 @@
           <!-- void __gnu_cxx::__normal_iterator<MallocExtension::FreeListInfo*, std::vector<MallocExtension::FreeListInfo, std::allocator<MallocExtension::FreeListInfo> > >::__normal_iterator(MallocExtension::FreeListInfo* const&) -->
           <function-decl name='__normal_iterator' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_iterator.h' line='686' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type '__gnu_cxx::__normal_iterator<MallocExtension::FreeListInfo*, std::vector<MallocExtension::FreeListInfo, std::allocator<MallocExtension::FreeListInfo> > >*' -->
-            <parameter type-id='type-id-1346' is-artificial='yes'/>
+            <parameter type-id='type-id-1345' is-artificial='yes'/>
             <!-- parameter of type 'MallocExtension::FreeListInfo* const&' -->
-            <parameter type-id='type-id-1342'/>
+            <parameter type-id='type-id-1341'/>
             <!-- void -->
             <return type-id='type-id-56'/>
           </function-decl>
@@ -37566,141 +37213,141 @@
           <!-- MallocExtension::FreeListInfo& __gnu_cxx::__normal_iterator<MallocExtension::FreeListInfo*, std::vector<MallocExtension::FreeListInfo, std::allocator<MallocExtension::FreeListInfo> > >::operator*() -->
           <function-decl name='operator*' mangled-name='_ZNK9__gnu_cxx17__normal_iteratorIPN15MallocExtension12FreeListInfoESt6vectorIS2_SaIS2_EEEdeEv' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_iterator.h' line='698' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const __gnu_cxx::__normal_iterator<MallocExtension::FreeListInfo*, std::vector<MallocExtension::FreeListInfo, std::allocator<MallocExtension::FreeListInfo> > >*' -->
-            <parameter type-id='type-id-1363' is-artificial='yes'/>
+            <parameter type-id='type-id-1362' is-artificial='yes'/>
             <!-- MallocExtension::FreeListInfo& -->
-            <return type-id='type-id-1339'/>
+            <return type-id='type-id-1338'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <!-- MallocExtension::FreeListInfo* __gnu_cxx::__normal_iterator<MallocExtension::FreeListInfo*, std::vector<MallocExtension::FreeListInfo, std::allocator<MallocExtension::FreeListInfo> > >::operator&#45;>() -->
           <function-decl name='operator-&gt;' mangled-name='_ZNK9__gnu_cxx17__normal_iteratorIPN15MallocExtension12FreeListInfoESt6vectorIS2_SaIS2_EEEptEv' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_iterator.h' line='702' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const __gnu_cxx::__normal_iterator<MallocExtension::FreeListInfo*, std::vector<MallocExtension::FreeListInfo, std::allocator<MallocExtension::FreeListInfo> > >*' -->
-            <parameter type-id='type-id-1363' is-artificial='yes'/>
+            <parameter type-id='type-id-1362' is-artificial='yes'/>
             <!-- MallocExtension::FreeListInfo* -->
-            <return type-id='type-id-1340'/>
+            <return type-id='type-id-1339'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <!-- __gnu_cxx::__normal_iterator<MallocExtension::FreeListInfo*, std::vector<MallocExtension::FreeListInfo, std::allocator<MallocExtension::FreeListInfo> > >& __gnu_cxx::__normal_iterator<MallocExtension::FreeListInfo*, std::vector<MallocExtension::FreeListInfo, std::allocator<MallocExtension::FreeListInfo> > >::operator++() -->
           <function-decl name='operator++' mangled-name='_ZN9__gnu_cxx17__normal_iteratorIPN15MallocExtension12FreeListInfoESt6vectorIS2_SaIS2_EEEppEv' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_iterator.h' line='706' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type '__gnu_cxx::__normal_iterator<MallocExtension::FreeListInfo*, std::vector<MallocExtension::FreeListInfo, std::allocator<MallocExtension::FreeListInfo> > >*' -->
-            <parameter type-id='type-id-1346' is-artificial='yes'/>
+            <parameter type-id='type-id-1345' is-artificial='yes'/>
             <!-- __gnu_cxx::__normal_iterator<MallocExtension::FreeListInfo*, std::vector<MallocExtension::FreeListInfo, std::allocator<MallocExtension::FreeListInfo> > >& -->
-            <return type-id='type-id-1345'/>
+            <return type-id='type-id-1344'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <!-- __gnu_cxx::__normal_iterator<MallocExtension::FreeListInfo*, std::vector<MallocExtension::FreeListInfo, std::allocator<MallocExtension::FreeListInfo> > > __gnu_cxx::__normal_iterator<MallocExtension::FreeListInfo*, std::vector<MallocExtension::FreeListInfo, std::allocator<MallocExtension::FreeListInfo> > >::operator++(int) -->
           <function-decl name='operator++' mangled-name='_ZN9__gnu_cxx17__normal_iteratorIPN15MallocExtension12FreeListInfoESt6vectorIS2_SaIS2_EEEppEi' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_iterator.h' line='713' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type '__gnu_cxx::__normal_iterator<MallocExtension::FreeListInfo*, std::vector<MallocExtension::FreeListInfo, std::allocator<MallocExtension::FreeListInfo> > >*' -->
-            <parameter type-id='type-id-1346' is-artificial='yes'/>
+            <parameter type-id='type-id-1345' is-artificial='yes'/>
             <!-- parameter of type 'int' -->
             <parameter type-id='type-id-1'/>
             <!-- class __gnu_cxx::__normal_iterator<MallocExtension::FreeListInfo*, std::vector<MallocExtension::FreeListInfo, std::allocator<MallocExtension::FreeListInfo> > > -->
-            <return type-id='type-id-1344'/>
+            <return type-id='type-id-1343'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <!-- __gnu_cxx::__normal_iterator<MallocExtension::FreeListInfo*, std::vector<MallocExtension::FreeListInfo, std::allocator<MallocExtension::FreeListInfo> > >& __gnu_cxx::__normal_iterator<MallocExtension::FreeListInfo*, std::vector<MallocExtension::FreeListInfo, std::allocator<MallocExtension::FreeListInfo> > >::operator&#45;&#45;() -->
           <function-decl name='operator--' mangled-name='_ZN9__gnu_cxx17__normal_iteratorIPN15MallocExtension12FreeListInfoESt6vectorIS2_SaIS2_EEEmmEv' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_iterator.h' line='718' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type '__gnu_cxx::__normal_iterator<MallocExtension::FreeListInfo*, std::vector<MallocExtension::FreeListInfo, std::allocator<MallocExtension::FreeListInfo> > >*' -->
-            <parameter type-id='type-id-1346' is-artificial='yes'/>
+            <parameter type-id='type-id-1345' is-artificial='yes'/>
             <!-- __gnu_cxx::__normal_iterator<MallocExtension::FreeListInfo*, std::vector<MallocExtension::FreeListInfo, std::allocator<MallocExtension::FreeListInfo> > >& -->
-            <return type-id='type-id-1345'/>
+            <return type-id='type-id-1344'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <!-- __gnu_cxx::__normal_iterator<MallocExtension::FreeListInfo*, std::vector<MallocExtension::FreeListInfo, std::allocator<MallocExtension::FreeListInfo> > > __gnu_cxx::__normal_iterator<MallocExtension::FreeListInfo*, std::vector<MallocExtension::FreeListInfo, std::allocator<MallocExtension::FreeListInfo> > >::operator&#45;&#45;(int) -->
           <function-decl name='operator--' mangled-name='_ZN9__gnu_cxx17__normal_iteratorIPN15MallocExtension12FreeListInfoESt6vectorIS2_SaIS2_EEEmmEi' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_iterator.h' line='725' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type '__gnu_cxx::__normal_iterator<MallocExtension::FreeListInfo*, std::vector<MallocExtension::FreeListInfo, std::allocator<MallocExtension::FreeListInfo> > >*' -->
-            <parameter type-id='type-id-1346' is-artificial='yes'/>
+            <parameter type-id='type-id-1345' is-artificial='yes'/>
             <!-- parameter of type 'int' -->
             <parameter type-id='type-id-1'/>
             <!-- class __gnu_cxx::__normal_iterator<MallocExtension::FreeListInfo*, std::vector<MallocExtension::FreeListInfo, std::allocator<MallocExtension::FreeListInfo> > > -->
-            <return type-id='type-id-1344'/>
+            <return type-id='type-id-1343'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <!-- MallocExtension::FreeListInfo& __gnu_cxx::__normal_iterator<MallocExtension::FreeListInfo*, std::vector<MallocExtension::FreeListInfo, std::allocator<MallocExtension::FreeListInfo> > >::operator[](const ptrdiff_t&) -->
           <function-decl name='operator[]' mangled-name='_ZNK9__gnu_cxx17__normal_iteratorIPN15MallocExtension12FreeListInfoESt6vectorIS2_SaIS2_EEEixERKl' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_iterator.h' line='730' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const __gnu_cxx::__normal_iterator<MallocExtension::FreeListInfo*, std::vector<MallocExtension::FreeListInfo, std::allocator<MallocExtension::FreeListInfo> > >*' -->
-            <parameter type-id='type-id-1363' is-artificial='yes'/>
+            <parameter type-id='type-id-1362' is-artificial='yes'/>
             <!-- parameter of type 'const ptrdiff_t&' -->
             <parameter type-id='type-id-780'/>
             <!-- MallocExtension::FreeListInfo& -->
-            <return type-id='type-id-1339'/>
+            <return type-id='type-id-1338'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <!-- __gnu_cxx::__normal_iterator<MallocExtension::FreeListInfo*, std::vector<MallocExtension::FreeListInfo, std::allocator<MallocExtension::FreeListInfo> > >& __gnu_cxx::__normal_iterator<MallocExtension::FreeListInfo*, std::vector<MallocExtension::FreeListInfo, std::allocator<MallocExtension::FreeListInfo> > >::operator+=(const ptrdiff_t&) -->
           <function-decl name='operator+=' mangled-name='_ZN9__gnu_cxx17__normal_iteratorIPN15MallocExtension12FreeListInfoESt6vectorIS2_SaIS2_EEEpLERKl' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_iterator.h' line='734' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type '__gnu_cxx::__normal_iterator<MallocExtension::FreeListInfo*, std::vector<MallocExtension::FreeListInfo, std::allocator<MallocExtension::FreeListInfo> > >*' -->
-            <parameter type-id='type-id-1346' is-artificial='yes'/>
+            <parameter type-id='type-id-1345' is-artificial='yes'/>
             <!-- parameter of type 'const ptrdiff_t&' -->
             <parameter type-id='type-id-780'/>
             <!-- __gnu_cxx::__normal_iterator<MallocExtension::FreeListInfo*, std::vector<MallocExtension::FreeListInfo, std::allocator<MallocExtension::FreeListInfo> > >& -->
-            <return type-id='type-id-1345'/>
+            <return type-id='type-id-1344'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <!-- __gnu_cxx::__normal_iterator<MallocExtension::FreeListInfo*, std::vector<MallocExtension::FreeListInfo, std::allocator<MallocExtension::FreeListInfo> > > __gnu_cxx::__normal_iterator<MallocExtension::FreeListInfo*, std::vector<MallocExtension::FreeListInfo, std::allocator<MallocExtension::FreeListInfo> > >::operator+(const ptrdiff_t&) -->
           <function-decl name='operator+' mangled-name='_ZNK9__gnu_cxx17__normal_iteratorIPN15MallocExtension12FreeListInfoESt6vectorIS2_SaIS2_EEEplERKl' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_iterator.h' line='738' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const __gnu_cxx::__normal_iterator<MallocExtension::FreeListInfo*, std::vector<MallocExtension::FreeListInfo, std::allocator<MallocExtension::FreeListInfo> > >*' -->
-            <parameter type-id='type-id-1363' is-artificial='yes'/>
+            <parameter type-id='type-id-1362' is-artificial='yes'/>
             <!-- parameter of type 'const ptrdiff_t&' -->
             <parameter type-id='type-id-780'/>
             <!-- class __gnu_cxx::__normal_iterator<MallocExtension::FreeListInfo*, std::vector<MallocExtension::FreeListInfo, std::allocator<MallocExtension::FreeListInfo> > > -->
-            <return type-id='type-id-1344'/>
+            <return type-id='type-id-1343'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <!-- __gnu_cxx::__normal_iterator<MallocExtension::FreeListInfo*, std::vector<MallocExtension::FreeListInfo, std::allocator<MallocExtension::FreeListInfo> > >& __gnu_cxx::__normal_iterator<MallocExtension::FreeListInfo*, std::vector<MallocExtension::FreeListInfo, std::allocator<MallocExtension::FreeListInfo> > >::operator&#45;=(const ptrdiff_t&) -->
           <function-decl name='operator-=' mangled-name='_ZN9__gnu_cxx17__normal_iteratorIPN15MallocExtension12FreeListInfoESt6vectorIS2_SaIS2_EEEmIERKl' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_iterator.h' line='742' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type '__gnu_cxx::__normal_iterator<MallocExtension::FreeListInfo*, std::vector<MallocExtension::FreeListInfo, std::allocator<MallocExtension::FreeListInfo> > >*' -->
-            <parameter type-id='type-id-1346' is-artificial='yes'/>
+            <parameter type-id='type-id-1345' is-artificial='yes'/>
             <!-- parameter of type 'const ptrdiff_t&' -->
             <parameter type-id='type-id-780'/>
             <!-- __gnu_cxx::__normal_iterator<MallocExtension::FreeListInfo*, std::vector<MallocExtension::FreeListInfo, std::allocator<MallocExtension::FreeListInfo> > >& -->
-            <return type-id='type-id-1345'/>
+            <return type-id='type-id-1344'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <!-- __gnu_cxx::__normal_iterator<MallocExtension::FreeListInfo*, std::vector<MallocExtension::FreeListInfo, std::allocator<MallocExtension::FreeListInfo> > > __gnu_cxx::__normal_iterator<MallocExtension::FreeListInfo*, std::vector<MallocExtension::FreeListInfo, std::allocator<MallocExtension::FreeListInfo> > >::operator&#45;(const ptrdiff_t&) -->
           <function-decl name='operator-' mangled-name='_ZNK9__gnu_cxx17__normal_iteratorIPN15MallocExtension12FreeListInfoESt6vectorIS2_SaIS2_EEEmiERKl' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_iterator.h' line='746' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const __gnu_cxx::__normal_iterator<MallocExtension::FreeListInfo*, std::vector<MallocExtension::FreeListInfo, std::allocator<MallocExtension::FreeListInfo> > >*' -->
-            <parameter type-id='type-id-1363' is-artificial='yes'/>
+            <parameter type-id='type-id-1362' is-artificial='yes'/>
             <!-- parameter of type 'const ptrdiff_t&' -->
             <parameter type-id='type-id-780'/>
             <!-- class __gnu_cxx::__normal_iterator<MallocExtension::FreeListInfo*, std::vector<MallocExtension::FreeListInfo, std::allocator<MallocExtension::FreeListInfo> > > -->
-            <return type-id='type-id-1344'/>
+            <return type-id='type-id-1343'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <!-- MallocExtension::FreeListInfo* const& __gnu_cxx::__normal_iterator<MallocExtension::FreeListInfo*, std::vector<MallocExtension::FreeListInfo, std::allocator<MallocExtension::FreeListInfo> > >::base() -->
           <function-decl name='base' mangled-name='_ZNK9__gnu_cxx17__normal_iteratorIPN15MallocExtension12FreeListInfoESt6vectorIS2_SaIS2_EEE4baseEv' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_iterator.h' line='750' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const __gnu_cxx::__normal_iterator<MallocExtension::FreeListInfo*, std::vector<MallocExtension::FreeListInfo, std::allocator<MallocExtension::FreeListInfo> > >*' -->
-            <parameter type-id='type-id-1363' is-artificial='yes'/>
+            <parameter type-id='type-id-1362' is-artificial='yes'/>
             <!-- MallocExtension::FreeListInfo* const& -->
-            <return type-id='type-id-1342'/>
+            <return type-id='type-id-1341'/>
           </function-decl>
         </member-function>
       </class-decl>
       <!-- ptrdiff_t __gnu_cxx::operator&#45;<MallocExtension::FreeListInfo*, std::vector<MallocExtension::FreeListInfo, std::allocator<MallocExtension::FreeListInfo> > >(const __gnu_cxx::__normal_iterator<MallocExtension::FreeListInfo*, std::vector<MallocExtension::FreeListInfo, std::allocator<MallocExtension::FreeListInfo> > >&, const __gnu_cxx::__normal_iterator<MallocExtension::FreeListInfo*, std::vector<MallocExtension::FreeListInfo, std::allocator<MallocExtension::FreeListInfo> > >&) -->
       <function-decl name='operator-&lt;MallocExtension::FreeListInfo*, std::vector&lt;MallocExtension::FreeListInfo, std::allocator&lt;MallocExtension::FreeListInfo&gt; &gt; &gt;' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_iterator.h' line='856' column='1' visibility='default' binding='global' size-in-bits='64'>
         <!-- parameter of type 'const __gnu_cxx::__normal_iterator<MallocExtension::FreeListInfo*, std::vector<MallocExtension::FreeListInfo, std::allocator<MallocExtension::FreeListInfo> > >&' -->
-        <parameter type-id='type-id-1362'/>
+        <parameter type-id='type-id-1361'/>
         <!-- parameter of type 'const __gnu_cxx::__normal_iterator<MallocExtension::FreeListInfo*, std::vector<MallocExtension::FreeListInfo, std::allocator<MallocExtension::FreeListInfo> > >&' -->
-        <parameter type-id='type-id-1362'/>
+        <parameter type-id='type-id-1361'/>
         <!-- typedef ptrdiff_t -->
         <return type-id='type-id-186'/>
       </function-decl>
       <!-- class __gnu_cxx::new_allocator<MallocExtension::FreeListInfo> -->
-      <class-decl name='new_allocator&lt;MallocExtension::FreeListInfo&gt;' size-in-bits='8' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/ext/new_allocator.h' line='52' column='1' id='type-id-1347'>
+      <class-decl name='new_allocator&lt;MallocExtension::FreeListInfo&gt;' size-in-bits='8' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/ext/new_allocator.h' line='52' column='1' id='type-id-1346'>
         <member-function access='private'>
           <!-- void __gnu_cxx::new_allocator<MallocExtension::FreeListInfo>::new_allocator() -->
           <function-decl name='new_allocator' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/ext/new_allocator.h' line='66' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type '__gnu_cxx::new_allocator<MallocExtension::FreeListInfo>*' -->
-            <parameter type-id='type-id-1348' is-artificial='yes'/>
+            <parameter type-id='type-id-1347' is-artificial='yes'/>
             <!-- void -->
             <return type-id='type-id-56'/>
           </function-decl>
@@ -37709,9 +37356,9 @@
           <!-- void __gnu_cxx::new_allocator<MallocExtension::FreeListInfo>::new_allocator(const __gnu_cxx::new_allocator<MallocExtension::FreeListInfo>&) -->
           <function-decl name='new_allocator' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/ext/new_allocator.h' line='68' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type '__gnu_cxx::new_allocator<MallocExtension::FreeListInfo>*' -->
-            <parameter type-id='type-id-1348' is-artificial='yes'/>
+            <parameter type-id='type-id-1347' is-artificial='yes'/>
             <!-- parameter of type 'const __gnu_cxx::new_allocator<MallocExtension::FreeListInfo>&' -->
-            <parameter type-id='type-id-1365'/>
+            <parameter type-id='type-id-1364'/>
             <!-- void -->
             <return type-id='type-id-56'/>
           </function-decl>
@@ -37720,7 +37367,7 @@
           <!-- __gnu_cxx::new_allocator<MallocExtension::FreeListInfo>::~new_allocator(int) -->
           <function-decl name='~new_allocator' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/ext/new_allocator.h' line='73' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type '__gnu_cxx::new_allocator<MallocExtension::FreeListInfo>*' -->
-            <parameter type-id='type-id-1348' is-artificial='yes'/>
+            <parameter type-id='type-id-1347' is-artificial='yes'/>
             <!-- artificial parameter of type 'int' -->
             <parameter type-id='type-id-1' is-artificial='yes'/>
             <!-- void -->
@@ -37731,44 +37378,44 @@
           <!-- MallocExtension::FreeListInfo* __gnu_cxx::new_allocator<MallocExtension::FreeListInfo>::address(MallocExtension::FreeListInfo&) -->
           <function-decl name='address' mangled-name='_ZNK9__gnu_cxx13new_allocatorIN15MallocExtension12FreeListInfoEE7addressERS2_' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/ext/new_allocator.h' line='76' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const __gnu_cxx::new_allocator<MallocExtension::FreeListInfo>*' -->
-            <parameter type-id='type-id-1366' is-artificial='yes'/>
+            <parameter type-id='type-id-1365' is-artificial='yes'/>
             <!-- parameter of type 'MallocExtension::FreeListInfo&' -->
-            <parameter type-id='type-id-1339'/>
+            <parameter type-id='type-id-1338'/>
             <!-- MallocExtension::FreeListInfo* -->
-            <return type-id='type-id-1340'/>
+            <return type-id='type-id-1339'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <!-- const MallocExtension::FreeListInfo* __gnu_cxx::new_allocator<MallocExtension::FreeListInfo>::address(const MallocExtension::FreeListInfo&) -->
           <function-decl name='address' mangled-name='_ZNK9__gnu_cxx13new_allocatorIN15MallocExtension12FreeListInfoEE7addressERKS2_' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/ext/new_allocator.h' line='79' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const __gnu_cxx::new_allocator<MallocExtension::FreeListInfo>*' -->
-            <parameter type-id='type-id-1366' is-artificial='yes'/>
+            <parameter type-id='type-id-1365' is-artificial='yes'/>
             <!-- parameter of type 'const MallocExtension::FreeListInfo&' -->
-            <parameter type-id='type-id-1356'/>
+            <parameter type-id='type-id-1355'/>
             <!-- const MallocExtension::FreeListInfo* -->
-            <return type-id='type-id-1357'/>
+            <return type-id='type-id-1356'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <!-- MallocExtension::FreeListInfo* __gnu_cxx::new_allocator<MallocExtension::FreeListInfo>::allocate(unsigned long int, void*) -->
           <function-decl name='allocate' mangled-name='_ZN9__gnu_cxx13new_allocatorIN15MallocExtension12FreeListInfoEE8allocateEmPKv' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/ext/new_allocator.h' line='84' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type '__gnu_cxx::new_allocator<MallocExtension::FreeListInfo>*' -->
-            <parameter type-id='type-id-1348' is-artificial='yes'/>
+            <parameter type-id='type-id-1347' is-artificial='yes'/>
             <!-- parameter of type 'unsigned long int' -->
             <parameter type-id='type-id-5'/>
             <!-- parameter of type 'void*' -->
             <parameter type-id='type-id-53'/>
             <!-- MallocExtension::FreeListInfo* -->
-            <return type-id='type-id-1340'/>
+            <return type-id='type-id-1339'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <!-- void __gnu_cxx::new_allocator<MallocExtension::FreeListInfo>::deallocate(MallocExtension::FreeListInfo*, unsigned long int) -->
           <function-decl name='deallocate' mangled-name='_ZN9__gnu_cxx13new_allocatorIN15MallocExtension12FreeListInfoEE10deallocateEPS2_m' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/ext/new_allocator.h' line='94' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type '__gnu_cxx::new_allocator<MallocExtension::FreeListInfo>*' -->
-            <parameter type-id='type-id-1348' is-artificial='yes'/>
+            <parameter type-id='type-id-1347' is-artificial='yes'/>
             <!-- parameter of type 'MallocExtension::FreeListInfo*' -->
-            <parameter type-id='type-id-1340'/>
+            <parameter type-id='type-id-1339'/>
             <!-- parameter of type 'unsigned long int' -->
             <parameter type-id='type-id-5'/>
             <!-- void -->
@@ -37779,7 +37426,7 @@
           <!-- size_t __gnu_cxx::new_allocator<MallocExtension::FreeListInfo>::max_size() -->
           <function-decl name='max_size' mangled-name='_ZNK9__gnu_cxx13new_allocatorIN15MallocExtension12FreeListInfoEE8max_sizeEv' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/ext/new_allocator.h' line='98' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const __gnu_cxx::new_allocator<MallocExtension::FreeListInfo>*' -->
-            <parameter type-id='type-id-1366' is-artificial='yes'/>
+            <parameter type-id='type-id-1365' is-artificial='yes'/>
             <!-- typedef size_t -->
             <return type-id='type-id-57'/>
           </function-decl>
@@ -37788,11 +37435,11 @@
           <!-- void __gnu_cxx::new_allocator<MallocExtension::FreeListInfo>::construct(MallocExtension::FreeListInfo*, const MallocExtension::FreeListInfo&) -->
           <function-decl name='construct' mangled-name='_ZN9__gnu_cxx13new_allocatorIN15MallocExtension12FreeListInfoEE9constructEPS2_RKS2_' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/ext/new_allocator.h' line='104' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type '__gnu_cxx::new_allocator<MallocExtension::FreeListInfo>*' -->
-            <parameter type-id='type-id-1348' is-artificial='yes'/>
+            <parameter type-id='type-id-1347' is-artificial='yes'/>
             <!-- parameter of type 'MallocExtension::FreeListInfo*' -->
-            <parameter type-id='type-id-1340'/>
+            <parameter type-id='type-id-1339'/>
             <!-- parameter of type 'const MallocExtension::FreeListInfo&' -->
-            <parameter type-id='type-id-1356'/>
+            <parameter type-id='type-id-1355'/>
             <!-- void -->
             <return type-id='type-id-56'/>
           </function-decl>
@@ -37801,9 +37448,9 @@
           <!-- void __gnu_cxx::new_allocator<MallocExtension::FreeListInfo>::destroy(MallocExtension::FreeListInfo*) -->
           <function-decl name='destroy' mangled-name='_ZN9__gnu_cxx13new_allocatorIN15MallocExtension12FreeListInfoEE7destroyEPS2_' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/ext/new_allocator.h' line='115' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type '__gnu_cxx::new_allocator<MallocExtension::FreeListInfo>*' -->
-            <parameter type-id='type-id-1348' is-artificial='yes'/>
+            <parameter type-id='type-id-1347' is-artificial='yes'/>
             <!-- parameter of type 'MallocExtension::FreeListInfo*' -->
-            <parameter type-id='type-id-1340'/>
+            <parameter type-id='type-id-1339'/>
             <!-- void -->
             <return type-id='type-id-56'/>
           </function-decl>
@@ -37812,12 +37459,12 @@
       <!-- class __gnu_cxx::__normal_iterator<const MallocExtension::FreeListInfo*, std::vector<MallocExtension::FreeListInfo, std::allocator<MallocExtension::FreeListInfo> > > -->
       <class-decl name='__normal_iterator&lt;const MallocExtension::FreeListInfo*, std::vector&lt;MallocExtension::FreeListInfo, std::allocator&lt;MallocExtension::FreeListInfo&gt; &gt; &gt;' visibility='default' is-declaration-only='yes' id='type-id-1487'/>
       <!-- class __gnu_cxx::new_allocator<char> -->
-      <class-decl name='new_allocator&lt;char&gt;' size-in-bits='8' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/ext/new_allocator.h' line='52' column='1' id='type-id-1349'>
+      <class-decl name='new_allocator&lt;char&gt;' size-in-bits='8' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/ext/new_allocator.h' line='52' column='1' id='type-id-1348'>
         <member-function access='private'>
           <!-- void __gnu_cxx::new_allocator<char>::new_allocator() -->
           <function-decl name='new_allocator' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/ext/new_allocator.h' line='66' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type '__gnu_cxx::new_allocator<char>*' -->
-            <parameter type-id='type-id-1350' is-artificial='yes'/>
+            <parameter type-id='type-id-1349' is-artificial='yes'/>
             <!-- void -->
             <return type-id='type-id-56'/>
           </function-decl>
@@ -37826,9 +37473,9 @@
           <!-- void __gnu_cxx::new_allocator<char>::new_allocator(const __gnu_cxx::new_allocator<char>&) -->
           <function-decl name='new_allocator' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/ext/new_allocator.h' line='68' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type '__gnu_cxx::new_allocator<char>*' -->
-            <parameter type-id='type-id-1350' is-artificial='yes'/>
+            <parameter type-id='type-id-1349' is-artificial='yes'/>
             <!-- parameter of type 'const __gnu_cxx::new_allocator<char>&' -->
-            <parameter type-id='type-id-1368'/>
+            <parameter type-id='type-id-1367'/>
             <!-- void -->
             <return type-id='type-id-56'/>
           </function-decl>
@@ -37837,7 +37484,7 @@
           <!-- __gnu_cxx::new_allocator<char>::~new_allocator(int) -->
           <function-decl name='~new_allocator' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/ext/new_allocator.h' line='73' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type '__gnu_cxx::new_allocator<char>*' -->
-            <parameter type-id='type-id-1350' is-artificial='yes'/>
+            <parameter type-id='type-id-1349' is-artificial='yes'/>
             <!-- artificial parameter of type 'int' -->
             <parameter type-id='type-id-1' is-artificial='yes'/>
             <!-- void -->
@@ -37848,7 +37495,7 @@
           <!-- char* __gnu_cxx::new_allocator<char>::address(char&) -->
           <function-decl name='address' mangled-name='_ZNK9__gnu_cxx13new_allocatorIcE7addressERc' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/ext/new_allocator.h' line='76' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const __gnu_cxx::new_allocator<char>*' -->
-            <parameter type-id='type-id-1369' is-artificial='yes'/>
+            <parameter type-id='type-id-1368' is-artificial='yes'/>
             <!-- parameter of type 'char&' -->
             <parameter type-id='type-id-283'/>
             <!-- char* -->
@@ -37859,7 +37506,7 @@
           <!-- const char* __gnu_cxx::new_allocator<char>::address(const char&) -->
           <function-decl name='address' mangled-name='_ZNK9__gnu_cxx13new_allocatorIcE7addressERKc' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/ext/new_allocator.h' line='79' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const __gnu_cxx::new_allocator<char>*' -->
-            <parameter type-id='type-id-1369' is-artificial='yes'/>
+            <parameter type-id='type-id-1368' is-artificial='yes'/>
             <!-- parameter of type 'const char&' -->
             <parameter type-id='type-id-284'/>
             <!-- const char* -->
@@ -37870,7 +37517,7 @@
           <!-- char* __gnu_cxx::new_allocator<char>::allocate(unsigned long int, void*) -->
           <function-decl name='allocate' mangled-name='_ZN9__gnu_cxx13new_allocatorIcE8allocateEmPKv' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/ext/new_allocator.h' line='84' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type '__gnu_cxx::new_allocator<char>*' -->
-            <parameter type-id='type-id-1350' is-artificial='yes'/>
+            <parameter type-id='type-id-1349' is-artificial='yes'/>
             <!-- parameter of type 'unsigned long int' -->
             <parameter type-id='type-id-5'/>
             <!-- parameter of type 'void*' -->
@@ -37883,7 +37530,7 @@
           <!-- void __gnu_cxx::new_allocator<char>::deallocate(char*, unsigned long int) -->
           <function-decl name='deallocate' mangled-name='_ZN9__gnu_cxx13new_allocatorIcE10deallocateEPcm' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/ext/new_allocator.h' line='94' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type '__gnu_cxx::new_allocator<char>*' -->
-            <parameter type-id='type-id-1350' is-artificial='yes'/>
+            <parameter type-id='type-id-1349' is-artificial='yes'/>
             <!-- parameter of type 'char*' -->
             <parameter type-id='type-id-90'/>
             <!-- parameter of type 'unsigned long int' -->
@@ -37896,7 +37543,7 @@
           <!-- size_t __gnu_cxx::new_allocator<char>::max_size() -->
           <function-decl name='max_size' mangled-name='_ZNK9__gnu_cxx13new_allocatorIcE8max_sizeEv' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/ext/new_allocator.h' line='98' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const __gnu_cxx::new_allocator<char>*' -->
-            <parameter type-id='type-id-1369' is-artificial='yes'/>
+            <parameter type-id='type-id-1368' is-artificial='yes'/>
             <!-- typedef size_t -->
             <return type-id='type-id-57'/>
           </function-decl>
@@ -37905,7 +37552,7 @@
           <!-- void __gnu_cxx::new_allocator<char>::construct(char*, const char&) -->
           <function-decl name='construct' mangled-name='_ZN9__gnu_cxx13new_allocatorIcE9constructEPcRKc' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/ext/new_allocator.h' line='104' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type '__gnu_cxx::new_allocator<char>*' -->
-            <parameter type-id='type-id-1350' is-artificial='yes'/>
+            <parameter type-id='type-id-1349' is-artificial='yes'/>
             <!-- parameter of type 'char*' -->
             <parameter type-id='type-id-90'/>
             <!-- parameter of type 'const char&' -->
@@ -37918,7 +37565,7 @@
           <!-- void __gnu_cxx::new_allocator<char>::destroy(char*) -->
           <function-decl name='destroy' mangled-name='_ZN9__gnu_cxx13new_allocatorIcE7destroyEPc' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/ext/new_allocator.h' line='115' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type '__gnu_cxx::new_allocator<char>*' -->
-            <parameter type-id='type-id-1350' is-artificial='yes'/>
+            <parameter type-id='type-id-1349' is-artificial='yes'/>
             <!-- parameter of type 'char*' -->
             <parameter type-id='type-id-90'/>
             <!-- void -->
@@ -37970,7 +37617,7 @@
       <!-- parameter of type 'typedef size_t' -->
       <parameter type-id='type-id-57'/>
       <!-- parameter of type 'typedef __compar_fn_t' -->
-      <parameter type-id='type-id-1285'/>
+      <parameter type-id='type-id-1279'/>
       <!-- void* -->
       <return type-id='type-id-53'/>
     </function-decl>
@@ -37990,7 +37637,7 @@
       <!-- parameter of type 'int' -->
       <parameter type-id='type-id-1'/>
       <!-- struct div_t -->
-      <return type-id='type-id-1286'/>
+      <return type-id='type-id-1280'/>
     </function-decl>
     <!-- void free(void*) -->
     <function-decl name='free' filepath='/usr/include/stdlib.h' line='488' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -38013,7 +37660,7 @@
       <!-- parameter of type 'long int' -->
       <parameter type-id='type-id-285'/>
       <!-- struct ldiv_t -->
-      <return type-id='type-id-1295'/>
+      <return type-id='type-id-1289'/>
     </function-decl>
     <!-- void* malloc(size_t) -->
     <function-decl name='malloc' filepath='/usr/include/stdlib.h' line='471' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -38062,7 +37709,7 @@
       <!-- parameter of type 'typedef size_t' -->
       <parameter type-id='type-id-57'/>
       <!-- parameter of type 'typedef __compar_fn_t' -->
-      <parameter type-id='type-id-1285'/>
+      <parameter type-id='type-id-1279'/>
       <!-- void -->
       <return type-id='type-id-56'/>
     </function-decl>
@@ -38083,7 +37730,7 @@
     <!-- void srand(unsigned int) -->
     <function-decl name='srand' filepath='/usr/include/stdlib.h' line='382' column='1' visibility='default' binding='global' size-in-bits='64'>
       <!-- parameter of type 'unsigned int' -->
-      <parameter type-id='type-id-1123'/>
+      <parameter type-id='type-id-1117'/>
       <!-- void -->
       <return type-id='type-id-56'/>
     </function-decl>
@@ -38141,25 +37788,25 @@
       <!-- parameter of type 'char*' -->
       <parameter type-id='type-id-90'/>
       <!-- parameter of type 'wchar_t' -->
-      <parameter type-id='type-id-1276'/>
+      <parameter type-id='type-id-1270'/>
       <!-- int -->
       <return type-id='type-id-1'/>
     </function-decl>
     <!-- lldiv_t lldiv(long long int, long long int) -->
     <function-decl name='lldiv' filepath='/usr/include/stdlib.h' line='793' column='1' visibility='default' binding='global' size-in-bits='64'>
       <!-- parameter of type 'long long int' -->
-      <parameter type-id='type-id-1257'/>
+      <parameter type-id='type-id-1251'/>
       <!-- parameter of type 'long long int' -->
-      <parameter type-id='type-id-1257'/>
+      <parameter type-id='type-id-1251'/>
       <!-- struct lldiv_t -->
-      <return type-id='type-id-1277'/>
+      <return type-id='type-id-1271'/>
     </function-decl>
     <!-- long long int atoll(const char*) -->
     <function-decl name='atoll' filepath='/usr/include/stdlib.h' line='158' column='1' visibility='default' binding='global' size-in-bits='64'>
       <!-- parameter of type 'const char*' -->
       <parameter type-id='type-id-52'/>
       <!-- long long int -->
-      <return type-id='type-id-1257'/>
+      <return type-id='type-id-1251'/>
     </function-decl>
     <!-- long long int strtoll(const char*, char**, int) -->
     <function-decl name='strtoll' filepath='/usr/include/stdlib.h' line='210' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -38170,7 +37817,7 @@
       <!-- parameter of type 'int' -->
       <parameter type-id='type-id-1'/>
       <!-- long long int -->
-      <return type-id='type-id-1257'/>
+      <return type-id='type-id-1251'/>
     </function-decl>
     <!-- long long unsigned int strtoull(const char*, char**, int) -->
     <function-decl name='strtoull' filepath='/usr/include/stdlib.h' line='215' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -38181,7 +37828,7 @@
       <!-- parameter of type 'int' -->
       <parameter type-id='type-id-1'/>
       <!-- long long unsigned int -->
-      <return type-id='type-id-1258'/>
+      <return type-id='type-id-1252'/>
     </function-decl>
     <!-- float strtof(const char*, char**) -->
     <function-decl name='strtof' filepath='/usr/include/stdlib.h' line='173' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -38190,7 +37837,7 @@
       <!-- parameter of type 'char**' -->
       <parameter type-id='type-id-97'/>
       <!-- float -->
-      <return type-id='type-id-1251'/>
+      <return type-id='type-id-1245'/>
     </function-decl>
     <!-- long double strtold(const char*, char**) -->
     <function-decl name='strtold' filepath='/usr/include/stdlib.h' line='176' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -38199,21 +37846,21 @@
       <!-- parameter of type 'char**' -->
       <parameter type-id='type-id-97'/>
       <!-- long double -->
-      <return type-id='type-id-1256'/>
+      <return type-id='type-id-1250'/>
     </function-decl>
     <!-- wint_t btowc(int) -->
     <function-decl name='btowc' filepath='/usr/include/wchar.h' line='351' column='1' visibility='default' binding='global' size-in-bits='64'>
       <!-- parameter of type 'int' -->
       <parameter type-id='type-id-1'/>
       <!-- typedef wint_t -->
-      <return type-id='type-id-1298'/>
+      <return type-id='type-id-1292'/>
     </function-decl>
     <!-- wint_t fgetwc(__FILE*) -->
     <function-decl name='fgetwc' filepath='/usr/include/wchar.h' line='743' column='1' visibility='default' binding='global' size-in-bits='64'>
       <!-- parameter of type '__FILE*' -->
-      <parameter type-id='type-id-1343'/>
+      <parameter type-id='type-id-1342'/>
       <!-- typedef wint_t -->
-      <return type-id='type-id-1298'/>
+      <return type-id='type-id-1292'/>
     </function-decl>
     <!-- wchar_t* fgetws(wchar_t*, int, __FILE*) -->
     <function-decl name='fgetws' filepath='/usr/include/wchar.h' line='772' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -38222,32 +37869,32 @@
       <!-- parameter of type 'int' -->
       <parameter type-id='type-id-1'/>
       <!-- parameter of type '__FILE*' -->
-      <parameter type-id='type-id-1343'/>
+      <parameter type-id='type-id-1342'/>
       <!-- wchar_t* -->
       <return type-id='type-id-1484'/>
     </function-decl>
     <!-- wint_t fputwc(wchar_t, __FILE*) -->
     <function-decl name='fputwc' filepath='/usr/include/wchar.h' line='757' column='1' visibility='default' binding='global' size-in-bits='64'>
       <!-- parameter of type 'wchar_t' -->
-      <parameter type-id='type-id-1276'/>
+      <parameter type-id='type-id-1270'/>
       <!-- parameter of type '__FILE*' -->
-      <parameter type-id='type-id-1343'/>
+      <parameter type-id='type-id-1342'/>
       <!-- typedef wint_t -->
-      <return type-id='type-id-1298'/>
+      <return type-id='type-id-1292'/>
     </function-decl>
     <!-- int fputws(const wchar_t*, __FILE*) -->
     <function-decl name='fputws' filepath='/usr/include/wchar.h' line='779' column='1' visibility='default' binding='global' size-in-bits='64'>
       <!-- parameter of type 'const wchar_t*' -->
       <parameter type-id='type-id-1424'/>
       <!-- parameter of type '__FILE*' -->
-      <parameter type-id='type-id-1343'/>
+      <parameter type-id='type-id-1342'/>
       <!-- int -->
       <return type-id='type-id-1'/>
     </function-decl>
     <!-- int fwide(__FILE*, int) -->
     <function-decl name='fwide' filepath='/usr/include/wchar.h' line='585' column='1' visibility='default' binding='global' size-in-bits='64'>
       <!-- parameter of type '__FILE*' -->
-      <parameter type-id='type-id-1343'/>
+      <parameter type-id='type-id-1342'/>
       <!-- parameter of type 'int' -->
       <parameter type-id='type-id-1'/>
       <!-- int -->
@@ -38256,7 +37903,7 @@
     <!-- int fwprintf(__FILE*, const wchar_t*, ...) -->
     <function-decl name='fwprintf' filepath='/usr/include/wchar.h' line='592' column='1' visibility='default' binding='global' size-in-bits='64'>
       <!-- parameter of type '__FILE*' -->
-      <parameter type-id='type-id-1343'/>
+      <parameter type-id='type-id-1342'/>
       <!-- parameter of type 'const wchar_t*' -->
       <parameter type-id='type-id-1424'/>
       <parameter is-variadic='yes'/>
@@ -38266,7 +37913,7 @@
     <!-- int fwscanf(__FILE*, const wchar_t*, ...) -->
     <function-decl name='fwscanf' filepath='/usr/include/wchar.h' line='633' column='1' visibility='default' binding='global' size-in-bits='64'>
       <!-- parameter of type '__FILE*' -->
-      <parameter type-id='type-id-1343'/>
+      <parameter type-id='type-id-1342'/>
       <!-- parameter of type 'const wchar_t*' -->
       <parameter type-id='type-id-1424'/>
       <parameter is-variadic='yes'/>
@@ -38276,14 +37923,14 @@
     <!-- wint_t getwc(__FILE*) -->
     <function-decl name='getwc' filepath='/usr/include/wchar.h' line='744' column='1' visibility='default' binding='global' size-in-bits='64'>
       <!-- parameter of type '__FILE*' -->
-      <parameter type-id='type-id-1343'/>
+      <parameter type-id='type-id-1342'/>
       <!-- typedef wint_t -->
-      <return type-id='type-id-1298'/>
+      <return type-id='type-id-1292'/>
     </function-decl>
     <!-- wint_t getwchar() -->
     <function-decl name='getwchar' filepath='/usr/include/wchar.h' line='750' column='1' visibility='default' binding='global' size-in-bits='64'>
       <!-- typedef wint_t -->
-      <return type-id='type-id-1298'/>
+      <return type-id='type-id-1292'/>
     </function-decl>
     <!-- size_t mbrlen(const char*, size_t, mbstate_t*) -->
     <function-decl name='mbrlen' filepath='/usr/include/wchar.h' line='374' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -38332,18 +37979,18 @@
     <!-- wint_t putwc(wchar_t, __FILE*) -->
     <function-decl name='putwc' filepath='/usr/include/wchar.h' line='758' column='1' visibility='default' binding='global' size-in-bits='64'>
       <!-- parameter of type 'wchar_t' -->
-      <parameter type-id='type-id-1276'/>
+      <parameter type-id='type-id-1270'/>
       <!-- parameter of type '__FILE*' -->
-      <parameter type-id='type-id-1343'/>
+      <parameter type-id='type-id-1342'/>
       <!-- typedef wint_t -->
-      <return type-id='type-id-1298'/>
+      <return type-id='type-id-1292'/>
     </function-decl>
     <!-- wint_t putwchar(wchar_t) -->
     <function-decl name='putwchar' filepath='/usr/include/wchar.h' line='764' column='1' visibility='default' binding='global' size-in-bits='64'>
       <!-- parameter of type 'wchar_t' -->
-      <parameter type-id='type-id-1276'/>
+      <parameter type-id='type-id-1270'/>
       <!-- typedef wint_t -->
-      <return type-id='type-id-1298'/>
+      <return type-id='type-id-1292'/>
     </function-decl>
     <!-- int swprintf(wchar_t*, size_t, const wchar_t*, ...) -->
     <function-decl name='swprintf' filepath='/usr/include/wchar.h' line='602' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -38370,16 +38017,16 @@
     <!-- wint_t ungetwc(wint_t, __FILE*) -->
     <function-decl name='ungetwc' filepath='/usr/include/wchar.h' line='787' column='1' visibility='default' binding='global' size-in-bits='64'>
       <!-- parameter of type 'typedef wint_t' -->
-      <parameter type-id='type-id-1298'/>
+      <parameter type-id='type-id-1292'/>
       <!-- parameter of type '__FILE*' -->
-      <parameter type-id='type-id-1343'/>
+      <parameter type-id='type-id-1342'/>
       <!-- typedef wint_t -->
-      <return type-id='type-id-1298'/>
+      <return type-id='type-id-1292'/>
     </function-decl>
     <!-- int vfwprintf(__FILE*, const wchar_t*, typedef __va_list_tag __va_list_tag*) -->
     <function-decl name='vfwprintf' filepath='/usr/include/wchar.h' line='610' column='1' visibility='default' binding='global' size-in-bits='64'>
       <!-- parameter of type '__FILE*' -->
-      <parameter type-id='type-id-1343'/>
+      <parameter type-id='type-id-1342'/>
       <!-- parameter of type 'const wchar_t*' -->
       <parameter type-id='type-id-1424'/>
       <!-- parameter of type 'typedef __va_list_tag __va_list_tag*' -->
@@ -38390,7 +38037,7 @@
     <!-- int vfwscanf(__FILE*, const wchar_t*, typedef __va_list_tag __va_list_tag*) -->
     <function-decl name='vfwscanf' filepath='/usr/include/wchar.h' line='687' column='1' visibility='default' binding='global' size-in-bits='64'>
       <!-- parameter of type '__FILE*' -->
-      <parameter type-id='type-id-1343'/>
+      <parameter type-id='type-id-1342'/>
       <!-- parameter of type 'const wchar_t*' -->
       <parameter type-id='type-id-1424'/>
       <!-- parameter of type 'typedef __va_list_tag __va_list_tag*' -->
@@ -38445,7 +38092,7 @@
       <!-- parameter of type 'char*' -->
       <parameter type-id='type-id-90'/>
       <!-- parameter of type 'wchar_t' -->
-      <parameter type-id='type-id-1276'/>
+      <parameter type-id='type-id-1270'/>
       <!-- parameter of type 'mbstate_t*' -->
       <parameter type-id='type-id-1428'/>
       <!-- typedef size_t -->
@@ -38587,7 +38234,7 @@
       <!-- parameter of type 'wchar_t**' -->
       <parameter type-id='type-id-1485'/>
       <!-- float -->
-      <return type-id='type-id-1251'/>
+      <return type-id='type-id-1245'/>
     </function-decl>
     <!-- wchar_t* wcstok(wchar_t*, const wchar_t*, wchar_t**) -->
     <function-decl name='wcstok' filepath='/usr/include/wchar.h' line='279' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -38636,7 +38283,7 @@
     <!-- int wctob(wint_t) -->
     <function-decl name='wctob' filepath='/usr/include/wchar.h' line='355' column='1' visibility='default' binding='global' size-in-bits='64'>
       <!-- parameter of type 'typedef wint_t' -->
-      <parameter type-id='type-id-1298'/>
+      <parameter type-id='type-id-1292'/>
       <!-- int -->
       <return type-id='type-id-1'/>
     </function-decl>
@@ -38678,7 +38325,7 @@
       <!-- parameter of type 'wchar_t*' -->
       <parameter type-id='type-id-1484'/>
       <!-- parameter of type 'wchar_t' -->
-      <parameter type-id='type-id-1276'/>
+      <parameter type-id='type-id-1270'/>
       <!-- parameter of type 'typedef size_t' -->
       <parameter type-id='type-id-57'/>
       <!-- wchar_t* -->
@@ -38705,7 +38352,7 @@
       <!-- parameter of type 'const wchar_t*' -->
       <parameter type-id='type-id-1424'/>
       <!-- parameter of type 'wchar_t' -->
-      <parameter type-id='type-id-1276'/>
+      <parameter type-id='type-id-1270'/>
       <!-- const wchar_t* -->
       <return type-id='type-id-1424'/>
     </function-decl>
@@ -38723,7 +38370,7 @@
       <!-- parameter of type 'const wchar_t*' -->
       <parameter type-id='type-id-1424'/>
       <!-- parameter of type 'wchar_t' -->
-      <parameter type-id='type-id-1276'/>
+      <parameter type-id='type-id-1270'/>
       <!-- const wchar_t* -->
       <return type-id='type-id-1424'/>
     </function-decl>
@@ -38741,7 +38388,7 @@
       <!-- parameter of type 'const wchar_t*' -->
       <parameter type-id='type-id-1424'/>
       <!-- parameter of type 'wchar_t' -->
-      <parameter type-id='type-id-1276'/>
+      <parameter type-id='type-id-1270'/>
       <!-- parameter of type 'typedef size_t' -->
       <parameter type-id='type-id-57'/>
       <!-- const wchar_t* -->
@@ -38754,7 +38401,7 @@
       <!-- parameter of type 'wchar_t**' -->
       <parameter type-id='type-id-1485'/>
       <!-- long double -->
-      <return type-id='type-id-1256'/>
+      <return type-id='type-id-1250'/>
     </function-decl>
     <!-- long long int wcstoll(const wchar_t*, wchar_t**, int) -->
     <function-decl name='wcstoll' filepath='/usr/include/wchar.h' line='481' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -38765,7 +38412,7 @@
       <!-- parameter of type 'int' -->
       <parameter type-id='type-id-1'/>
       <!-- long long int -->
-      <return type-id='type-id-1257'/>
+      <return type-id='type-id-1251'/>
     </function-decl>
     <!-- long long unsigned int wcstoull(const wchar_t*, wchar_t**, int) -->
     <function-decl name='wcstoull' filepath='/usr/include/wchar.h' line='488' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -38776,7 +38423,7 @@
       <!-- parameter of type 'int' -->
       <parameter type-id='type-id-1'/>
       <!-- long long unsigned int -->
-      <return type-id='type-id-1258'/>
+      <return type-id='type-id-1252'/>
     </function-decl>
     <!-- char* setlocale(int, const char*) -->
     <function-decl name='setlocale' filepath='/usr/include/locale.h' line='125' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -38797,7 +38444,7 @@
       <!-- namespace base::internal -->
       <namespace-decl name='internal'>
         <!-- struct base::internal::HookList<void (*)(const void*, size_t)> -->
-        <class-decl name='HookList&lt;void (*)(const void*, size_t)&gt;' size-in-bits='576' is-struct='yes' visibility='default' filepath='./src/malloc_hook-inl.h' line='59' column='1' id='type-id-947'>
+        <class-decl name='HookList&lt;void (*)(const void*, size_t)&gt;' size-in-bits='576' is-struct='yes' visibility='default' filepath='./src/malloc_hook-inl.h' line='59' column='1' id='type-id-941'>
           <data-member access='public' layout-offset-in-bits='0'>
             <!-- AtomicWord base::internal::HookList<void (*)(const void*, size_t)>::priv_end -->
             <var-decl name='priv_end' type-id='type-id-781' visibility='default' filepath='src/malloc_hook-inl.h' line='101' column='1'/>
@@ -38810,7 +38457,7 @@
             <!-- bool base::internal::HookList<void (*)(const void*, size_t)>::Add(void (void*, typedef size_t)*) -->
             <function-decl name='Add' mangled-name='_ZN4base8internal8HookListIPFvPKvmEE3AddES5_' filepath='src/malloc_hook-inl.h' line='65' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN4base8internal8HookListIPFvPKvmEE3AddES5_'>
               <!-- implicit parameter of type 'base::internal::HookList<void (*)(const void*, size_t)>*' -->
-              <parameter type-id='type-id-1354' is-artificial='yes'/>
+              <parameter type-id='type-id-1353' is-artificial='yes'/>
               <!-- parameter of type 'void (void*, typedef size_t)*' -->
               <parameter type-id='type-id-363'/>
               <!-- bool -->
@@ -38821,7 +38468,7 @@
             <!-- void base::internal::HookList<void (*)(const void*, size_t)>::FixupPrivEndLocked() -->
             <function-decl name='FixupPrivEndLocked' mangled-name='_ZN4base8internal8HookListIPFvPKvmEE18FixupPrivEndLockedEv' filepath='src/malloc_hook-inl.h' line='67' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN4base8internal8HookListIPFvPKvmEE18FixupPrivEndLockedEv'>
               <!-- implicit parameter of type 'base::internal::HookList<void (*)(const void*, size_t)>*' -->
-              <parameter type-id='type-id-1354' is-artificial='yes'/>
+              <parameter type-id='type-id-1353' is-artificial='yes'/>
               <!-- void -->
               <return type-id='type-id-56'/>
             </function-decl>
@@ -38830,7 +38477,7 @@
             <!-- bool base::internal::HookList<void (*)(const void*, size_t)>::Remove(void (void*, typedef size_t)*) -->
             <function-decl name='Remove' mangled-name='_ZN4base8internal8HookListIPFvPKvmEE6RemoveES5_' filepath='src/malloc_hook-inl.h' line='72' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN4base8internal8HookListIPFvPKvmEE6RemoveES5_'>
               <!-- implicit parameter of type 'base::internal::HookList<void (*)(const void*, size_t)>*' -->
-              <parameter type-id='type-id-1354' is-artificial='yes'/>
+              <parameter type-id='type-id-1353' is-artificial='yes'/>
               <!-- parameter of type 'void (void*, typedef size_t)*' -->
               <parameter type-id='type-id-363'/>
               <!-- bool -->
@@ -38872,7 +38519,7 @@
             <!-- void (void*, typedef size_t)* base::internal::HookList<void (*)(const void*, size_t)>::ExchangeSingular(void (void*, typedef size_t)*) -->
             <function-decl name='ExchangeSingular' mangled-name='_ZN4base8internal8HookListIPFvPKvmEE16ExchangeSingularES5_' filepath='src/malloc_hook-inl.h' line='90' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN4base8internal8HookListIPFvPKvmEE16ExchangeSingularES5_'>
               <!-- implicit parameter of type 'base::internal::HookList<void (*)(const void*, size_t)>*' -->
-              <parameter type-id='type-id-1354' is-artificial='yes'/>
+              <parameter type-id='type-id-1353' is-artificial='yes'/>
               <!-- parameter of type 'void (void*, typedef size_t)*' -->
               <parameter type-id='type-id-363'/>
               <!-- void (void*, typedef size_t)* -->
@@ -38881,7 +38528,7 @@
           </member-function>
         </class-decl>
         <!-- struct base::internal::HookList<void (*)(const void*)> -->
-        <class-decl name='HookList&lt;void (*)(const void*)&gt;' size-in-bits='576' is-struct='yes' visibility='default' filepath='./src/malloc_hook-inl.h' line='59' column='1' id='type-id-948'>
+        <class-decl name='HookList&lt;void (*)(const void*)&gt;' size-in-bits='576' is-struct='yes' visibility='default' filepath='./src/malloc_hook-inl.h' line='59' column='1' id='type-id-942'>
           <data-member access='public' layout-offset-in-bits='0'>
             <!-- AtomicWord base::internal::HookList<void (*)(const void*)>::priv_end -->
             <var-decl name='priv_end' type-id='type-id-781' visibility='default' filepath='src/malloc_hook-inl.h' line='101' column='1'/>
@@ -38894,7 +38541,7 @@
             <!-- bool base::internal::HookList<void (*)(const void*)>::Add(void (void*)*) -->
             <function-decl name='Add' mangled-name='_ZN4base8internal8HookListIPFvPKvEE3AddES5_' filepath='src/malloc_hook-inl.h' line='65' column='1' visibility='default' binding='global' size-in-bits='64'>
               <!-- implicit parameter of type 'base::internal::HookList<void (*)(const void*)>*' -->
-              <parameter type-id='type-id-1353' is-artificial='yes'/>
+              <parameter type-id='type-id-1352' is-artificial='yes'/>
               <!-- parameter of type 'void (void*)*' -->
               <parameter type-id='type-id-218'/>
               <!-- bool -->
@@ -38905,7 +38552,7 @@
             <!-- void base::internal::HookList<void (*)(const void*)>::FixupPrivEndLocked() -->
             <function-decl name='FixupPrivEndLocked' mangled-name='_ZN4base8internal8HookListIPFvPKvEE18FixupPrivEndLockedEv' filepath='src/malloc_hook-inl.h' line='67' column='1' visibility='default' binding='global' size-in-bits='64'>
               <!-- implicit parameter of type 'base::internal::HookList<void (*)(const void*)>*' -->
-              <parameter type-id='type-id-1353' is-artificial='yes'/>
+              <parameter type-id='type-id-1352' is-artificial='yes'/>
               <!-- void -->
               <return type-id='type-id-56'/>
             </function-decl>
@@ -38914,7 +38561,7 @@
             <!-- bool base::internal::HookList<void (*)(const void*)>::Remove(void (void*)*) -->
             <function-decl name='Remove' mangled-name='_ZN4base8internal8HookListIPFvPKvEE6RemoveES5_' filepath='src/malloc_hook-inl.h' line='72' column='1' visibility='default' binding='global' size-in-bits='64'>
               <!-- implicit parameter of type 'base::internal::HookList<void (*)(const void*)>*' -->
-              <parameter type-id='type-id-1353' is-artificial='yes'/>
+              <parameter type-id='type-id-1352' is-artificial='yes'/>
               <!-- parameter of type 'void (void*)*' -->
               <parameter type-id='type-id-218'/>
               <!-- bool -->
@@ -38956,7 +38603,7 @@
             <!-- void (void*)* base::internal::HookList<void (*)(const void*)>::ExchangeSingular(void (void*)*) -->
             <function-decl name='ExchangeSingular' mangled-name='_ZN4base8internal8HookListIPFvPKvEE16ExchangeSingularES5_' filepath='src/malloc_hook-inl.h' line='90' column='1' visibility='default' binding='global' size-in-bits='64'>
               <!-- implicit parameter of type 'base::internal::HookList<void (*)(const void*)>*' -->
-              <parameter type-id='type-id-1353' is-artificial='yes'/>
+              <parameter type-id='type-id-1352' is-artificial='yes'/>
               <!-- parameter of type 'void (void*)*' -->
               <parameter type-id='type-id-218'/>
               <!-- void (void*)* -->
@@ -38988,13 +38635,13 @@
           <return type-id='type-id-82'/>
         </function-decl>
         <!-- typedef int64_t base::subtle::Atomic64 -->
-        <typedef-decl name='Atomic64' type-id='type-id-1314' filepath='./src/base/atomicops-internals-x86.h' line='70' column='1' id='type-id-949'/>
+        <typedef-decl name='Atomic64' type-id='type-id-1313' filepath='./src/base/atomicops-internals-x86.h' line='70' column='1' id='type-id-943'/>
         <!-- base::subtle::Atomic64 base::subtle::NoBarrier_Load(const volatile base::subtle::Atomic64*) -->
         <function-decl name='NoBarrier_Load' filepath='./src/base/atomicops-internals-x86.h' line='245' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- parameter of type 'const volatile base::subtle::Atomic64*' -->
-          <parameter type-id='type-id-950'/>
+          <parameter type-id='type-id-944'/>
           <!-- typedef base::subtle::Atomic64 -->
-          <return type-id='type-id-949'/>
+          <return type-id='type-id-943'/>
         </function-decl>
         <!-- Atomic32 base::subtle::Acquire_CompareAndSwap(volatile Atomic32*, Atomic32, Atomic32) -->
         <function-decl name='Acquire_CompareAndSwap' filepath='./src/base/atomicops-internals-x86.h' line='106' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -39018,12 +38665,12 @@
         </function-decl>
       </namespace-decl>
       <!-- enum base::LinkerInitialized -->
-      <enum-decl name='LinkerInitialized' filepath='src/base/basictypes.h' line='381' column='1' id='type-id-1291'>
+      <enum-decl name='LinkerInitialized' filepath='src/base/basictypes.h' line='381' column='1' id='type-id-1285'>
         <underlying-type type-id='type-id-133'/>
         <enumerator name='LINKER_INITIALIZED' value='0'/>
       </enum-decl>
       <!-- struct base::MallocRange -->
-      <class-decl name='MallocRange' size-in-bits='256' is-struct='yes' visibility='default' filepath='./src/gperftools/malloc_extension.h' line='399' column='1' id='type-id-1351'>
+      <class-decl name='MallocRange' size-in-bits='256' is-struct='yes' visibility='default' filepath='./src/gperftools/malloc_extension.h' line='399' column='1' id='type-id-1350'>
         <member-type access='public'>
           <!-- enum base::MallocRange::Type -->
           <enum-decl name='Type' filepath='./src/gperftools/malloc_extension.h' line='400' column='1' id='type-id-1501'>
@@ -39094,7 +38741,7 @@
             </data-member>
             <data-member access='private'>
               <!-- int64_t snum -->
-              <var-decl name='snum' type-id='type-id-1314' visibility='default' filepath='src/internal_logging.h' line='94' column='1'/>
+              <var-decl name='snum' type-id='type-id-1313' visibility='default' filepath='src/internal_logging.h' line='94' column='1'/>
             </data-member>
             <data-member access='private'>
               <!-- uint64_t unum -->
@@ -39158,7 +38805,7 @@
             <!-- implicit parameter of type 'tcmalloc::LogItem*' -->
             <parameter type-id='type-id-1449' is-artificial='yes'/>
             <!-- parameter of type 'long long int' -->
-            <parameter type-id='type-id-1257'/>
+            <parameter type-id='type-id-1251'/>
             <!-- void -->
             <return type-id='type-id-56'/>
           </function-decl>
@@ -39169,7 +38816,7 @@
             <!-- implicit parameter of type 'tcmalloc::LogItem*' -->
             <parameter type-id='type-id-1449' is-artificial='yes'/>
             <!-- parameter of type 'unsigned int' -->
-            <parameter type-id='type-id-1123'/>
+            <parameter type-id='type-id-1117'/>
             <!-- void -->
             <return type-id='type-id-56'/>
           </function-decl>
@@ -39191,7 +38838,7 @@
             <!-- implicit parameter of type 'tcmalloc::LogItem*' -->
             <parameter type-id='type-id-1449' is-artificial='yes'/>
             <!-- parameter of type 'long long unsigned int' -->
-            <parameter type-id='type-id-1258'/>
+            <parameter type-id='type-id-1252'/>
             <!-- void -->
             <return type-id='type-id-56'/>
           </function-decl>
@@ -39264,7 +38911,7 @@
         <!-- parameter of type 'typedef size_t' -->
         <parameter type-id='type-id-57'/>
         <!-- typedef Length -->
-        <return type-id='type-id-1138'/>
+        <return type-id='type-id-1132'/>
       </function-decl>
       <!-- namespace tcmalloc::commandlineflags -->
       <namespace-decl name='commandlineflags'>
@@ -39273,9 +38920,9 @@
           <!-- parameter of type 'const char*' -->
           <parameter type-id='type-id-52'/>
           <!-- parameter of type 'long long int' -->
-          <parameter type-id='type-id-1257'/>
+          <parameter type-id='type-id-1251'/>
           <!-- long long int -->
-          <return type-id='type-id-1257'/>
+          <return type-id='type-id-1251'/>
         </function-decl>
       </namespace-decl>
       <!-- class tcmalloc::Static -->
@@ -39290,7 +38937,7 @@
         </data-member>
         <data-member access='private' static='yes'>
           <!-- static tcmalloc::CentralFreeListPadded tcmalloc::Static::central_cache_[88] -->
-          <var-decl name='central_cache_' type-id='type-id-1264' mangled-name='_ZN8tcmalloc6Static14central_cache_E' visibility='default' filepath='src/static_vars.h' line='98' column='1' elf-symbol-id='_ZN8tcmalloc6Static14central_cache_E'/>
+          <var-decl name='central_cache_' type-id='type-id-1258' mangled-name='_ZN8tcmalloc6Static14central_cache_E' visibility='default' filepath='src/static_vars.h' line='98' column='1' elf-symbol-id='_ZN8tcmalloc6Static14central_cache_E'/>
         </data-member>
         <data-member access='private' static='yes'>
           <!-- static tcmalloc::PageHeapAllocator<tcmalloc::Span> tcmalloc::Static::span_allocator_ -->
@@ -39306,7 +38953,7 @@
         </data-member>
         <data-member access='private' static='yes'>
           <!-- static tcmalloc::PageHeapAllocator<tcmalloc::StackTraceTable::Bucket> tcmalloc::Static::bucket_allocator_ -->
-          <var-decl name='bucket_allocator_' type-id='type-id-1139' mangled-name='_ZN8tcmalloc6Static17bucket_allocator_E' visibility='default' filepath='src/static_vars.h' line='102' column='1' elf-symbol-id='_ZN8tcmalloc6Static17bucket_allocator_E'/>
+          <var-decl name='bucket_allocator_' type-id='type-id-1133' mangled-name='_ZN8tcmalloc6Static17bucket_allocator_E' visibility='default' filepath='src/static_vars.h' line='102' column='1' elf-symbol-id='_ZN8tcmalloc6Static17bucket_allocator_E'/>
         </data-member>
         <data-member access='private' static='yes'>
           <!-- static tcmalloc::StackTrace* tcmalloc::Static::growth_stacks_ -->
@@ -39385,7 +39032,7 @@
           <!-- tcmalloc::Span* tcmalloc::Static::sampled_objects() -->
           <function-decl name='sampled_objects' mangled-name='_ZN8tcmalloc6Static15sampled_objectsEv' filepath='src/static_vars.h' line='81' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- tcmalloc::Span* -->
-            <return type-id='type-id-1136'/>
+            <return type-id='type-id-1130'/>
           </function-decl>
         </member-function>
         <member-function access='private' static='yes'>
@@ -39407,7 +39054,7 @@
       <class-decl name='SizeMap' size-in-bits='31488' visibility='default' filepath='src/common.h' line='161' column='1' id='type-id-1463'>
         <data-member access='private' layout-offset-in-bits='0'>
           <!-- int tcmalloc::SizeMap::num_objects_to_move_[88] -->
-          <var-decl name='num_objects_to_move_' type-id='type-id-1254' visibility='default' filepath='src/common.h' line='168' column='1'/>
+          <var-decl name='num_objects_to_move_' type-id='type-id-1248' visibility='default' filepath='src/common.h' line='168' column='1'/>
         </data-member>
         <data-member access='private' static='yes'>
           <!-- static const int tcmalloc::SizeMap::kMaxSmallSize -->
@@ -39419,15 +39066,15 @@
         </data-member>
         <data-member access='private' layout-offset-in-bits='2816'>
           <!-- unsigned char tcmalloc::SizeMap::class_array_[2169] -->
-          <var-decl name='class_array_' type-id='type-id-1269' visibility='default' filepath='src/common.h' line='195' column='1'/>
+          <var-decl name='class_array_' type-id='type-id-1263' visibility='default' filepath='src/common.h' line='195' column='1'/>
         </data-member>
         <data-member access='private' layout-offset-in-bits='20224'>
           <!-- size_t tcmalloc::SizeMap::class_to_size_[88] -->
-          <var-decl name='class_to_size_' type-id='type-id-1260' visibility='default' filepath='src/common.h' line='212' column='1'/>
+          <var-decl name='class_to_size_' type-id='type-id-1254' visibility='default' filepath='src/common.h' line='212' column='1'/>
         </data-member>
         <data-member access='private' layout-offset-in-bits='25856'>
           <!-- size_t tcmalloc::SizeMap::class_to_pages_[88] -->
-          <var-decl name='class_to_pages_' type-id='type-id-1260' visibility='default' filepath='src/common.h' line='215' column='1'/>
+          <var-decl name='class_to_pages_' type-id='type-id-1254' visibility='default' filepath='src/common.h' line='215' column='1'/>
         </data-member>
         <member-function access='private' static='yes'>
           <!-- size_t tcmalloc::SizeMap::ClassIndex() -->
@@ -39524,7 +39171,7 @@
         </member-function>
       </class-decl>
       <!-- class tcmalloc::CentralFreeListPadded -->
-      <class-decl name='CentralFreeListPadded' size-in-bits='9728' visibility='default' filepath='src/central_freelist.h' line='206' column='1' id='type-id-1263'>
+      <class-decl name='CentralFreeListPadded' size-in-bits='9728' visibility='default' filepath='src/central_freelist.h' line='206' column='1' id='type-id-1257'>
         <!-- class tcmalloc::CentralFreeListPaddedTo<16> -->
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1506'/>
       </class-decl>
@@ -39541,7 +39188,7 @@
       <class-decl name='CentralFreeList' size-in-bits='9344' visibility='default' filepath='src/central_freelist.h' line='50' column='1' id='type-id-1446'>
         <member-type access='private'>
           <!-- struct tcmalloc::CentralFreeList::TCEntry -->
-          <class-decl name='TCEntry' size-in-bits='128' is-struct='yes' visibility='default' filepath='src/central_freelist.h' line='97' column='1' id='type-id-1261'>
+          <class-decl name='TCEntry' size-in-bits='128' is-struct='yes' visibility='default' filepath='src/central_freelist.h' line='97' column='1' id='type-id-1255'>
             <data-member access='public' layout-offset-in-bits='0'>
               <!-- void* tcmalloc::CentralFreeList::TCEntry::head -->
               <var-decl name='head' type-id='type-id-53' visibility='default' filepath='src/central_freelist.h' line='98' column='1'/>
@@ -39582,7 +39229,7 @@
         </data-member>
         <data-member access='private' layout-offset-in-bits='1024'>
           <!-- tcmalloc::CentralFreeList::TCEntry tcmalloc::CentralFreeList::tc_slots_[64] -->
-          <var-decl name='tc_slots_' type-id='type-id-1262' visibility='default' filepath='src/central_freelist.h' line='178' column='1'/>
+          <var-decl name='tc_slots_' type-id='type-id-1256' visibility='default' filepath='src/central_freelist.h' line='178' column='1'/>
         </data-member>
         <data-member access='private' layout-offset-in-bits='9216'>
           <!-- int32_t tcmalloc::CentralFreeList::used_slots_ -->
@@ -39790,19 +39437,19 @@
       <class-decl name='Span' size-in-bits='384' is-struct='yes' visibility='default' filepath='src/span.h' line='45' column='1' id='type-id-117'>
         <data-member access='public' layout-offset-in-bits='0'>
           <!-- PageID tcmalloc::Span::start -->
-          <var-decl name='start' type-id='type-id-1137' visibility='default' filepath='src/span.h' line='46' column='1'/>
+          <var-decl name='start' type-id='type-id-1131' visibility='default' filepath='src/span.h' line='46' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='64'>
           <!-- Length tcmalloc::Span::length -->
-          <var-decl name='length' type-id='type-id-1138' visibility='default' filepath='src/span.h' line='47' column='1'/>
+          <var-decl name='length' type-id='type-id-1132' visibility='default' filepath='src/span.h' line='47' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='128'>
           <!-- tcmalloc::Span* tcmalloc::Span::next -->
-          <var-decl name='next' type-id='type-id-1136' visibility='default' filepath='src/span.h' line='48' column='1'/>
+          <var-decl name='next' type-id='type-id-1130' visibility='default' filepath='src/span.h' line='48' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='192'>
           <!-- tcmalloc::Span* tcmalloc::Span::prev -->
-          <var-decl name='prev' type-id='type-id-1136' visibility='default' filepath='src/span.h' line='49' column='1'/>
+          <var-decl name='prev' type-id='type-id-1130' visibility='default' filepath='src/span.h' line='49' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='256'>
           <!-- void* tcmalloc::Span::objects -->
@@ -39810,19 +39457,19 @@
         </data-member>
         <data-member access='public' layout-offset-in-bits='16'>
           <!-- unsigned int tcmalloc::Span::refcount -->
-          <var-decl name='refcount' type-id='type-id-1123' visibility='default' filepath='src/span.h' line='51' column='1'/>
+          <var-decl name='refcount' type-id='type-id-1117' visibility='default' filepath='src/span.h' line='51' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='8'>
           <!-- unsigned int tcmalloc::Span::sizeclass -->
-          <var-decl name='sizeclass' type-id='type-id-1123' visibility='default' filepath='src/span.h' line='52' column='1'/>
+          <var-decl name='sizeclass' type-id='type-id-1117' visibility='default' filepath='src/span.h' line='52' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='6'>
           <!-- unsigned int tcmalloc::Span::location -->
-          <var-decl name='location' type-id='type-id-1123' visibility='default' filepath='src/span.h' line='53' column='1'/>
+          <var-decl name='location' type-id='type-id-1117' visibility='default' filepath='src/span.h' line='53' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='5'>
           <!-- unsigned int tcmalloc::Span::sample -->
-          <var-decl name='sample' type-id='type-id-1123' visibility='default' filepath='src/span.h' line='54' column='1'/>
+          <var-decl name='sample' type-id='type-id-1117' visibility='default' filepath='src/span.h' line='54' column='1'/>
         </data-member>
       </class-decl>
       <!-- class tcmalloc::PageHeapAllocator<tcmalloc::Span> -->
@@ -39862,7 +39509,7 @@
             <!-- implicit parameter of type 'tcmalloc::PageHeapAllocator<tcmalloc::Span>*' -->
             <parameter type-id='type-id-1457' is-artificial='yes'/>
             <!-- tcmalloc::Span* -->
-            <return type-id='type-id-1136'/>
+            <return type-id='type-id-1130'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
@@ -39871,7 +39518,7 @@
             <!-- implicit parameter of type 'tcmalloc::PageHeapAllocator<tcmalloc::Span>*' -->
             <parameter type-id='type-id-1457' is-artificial='yes'/>
             <!-- parameter of type 'tcmalloc::Span*' -->
-            <parameter type-id='type-id-1136'/>
+            <parameter type-id='type-id-1130'/>
             <!-- void -->
             <return type-id='type-id-56'/>
           </function-decl>
@@ -39948,7 +39595,7 @@
         </member-function>
       </class-decl>
       <!-- class tcmalloc::PageHeapAllocator<tcmalloc::StackTraceTable::Bucket> -->
-      <class-decl name='PageHeapAllocator&lt;tcmalloc::StackTraceTable::Bucket&gt;' size-in-bits='256' visibility='default' filepath='src/page_heap_allocator.h' line='47' column='1' id='type-id-1139'>
+      <class-decl name='PageHeapAllocator&lt;tcmalloc::StackTraceTable::Bucket&gt;' size-in-bits='256' visibility='default' filepath='src/page_heap_allocator.h' line='47' column='1' id='type-id-1133'>
         <data-member access='private' static='yes'>
           <!-- static const int tcmalloc::PageHeapAllocator<tcmalloc::StackTraceTable::Bucket>::kAllocIncrement -->
           <var-decl name='kAllocIncrement' type-id='type-id-112' visibility='default' filepath='src/page_heap_allocator.h' line='99' column='1'/>
@@ -39984,7 +39631,7 @@
             <!-- implicit parameter of type 'tcmalloc::PageHeapAllocator<tcmalloc::StackTraceTable::Bucket>*' -->
             <parameter type-id='type-id-1459' is-artificial='yes'/>
             <!-- tcmalloc::StackTraceTable::Bucket* -->
-            <return type-id='type-id-1152'/>
+            <return type-id='type-id-1146'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
@@ -39993,7 +39640,7 @@
             <!-- implicit parameter of type 'tcmalloc::PageHeapAllocator<tcmalloc::StackTraceTable::Bucket>*' -->
             <parameter type-id='type-id-1459' is-artificial='yes'/>
             <!-- parameter of type 'tcmalloc::StackTraceTable::Bucket*' -->
-            <parameter type-id='type-id-1152'/>
+            <parameter type-id='type-id-1146'/>
             <!-- void -->
             <return type-id='type-id-56'/>
           </function-decl>
@@ -40002,14 +39649,14 @@
           <!-- int tcmalloc::PageHeapAllocator<tcmalloc::StackTraceTable::Bucket>::inuse() -->
           <function-decl name='inuse' mangled-name='_ZNK8tcmalloc17PageHeapAllocatorINS_15StackTraceTable6BucketEE5inuseEv' filepath='src/page_heap_allocator.h' line='95' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const tcmalloc::PageHeapAllocator<tcmalloc::StackTraceTable::Bucket>*' -->
-            <parameter type-id='type-id-1141' is-artificial='yes'/>
+            <parameter type-id='type-id-1135' is-artificial='yes'/>
             <!-- int -->
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
       </class-decl>
       <!-- struct tcmalloc::StackTrace -->
-      <class-decl name='StackTrace' size-in-bits='2112' is-struct='yes' visibility='default' filepath='src/common.h' line='266' column='1' id='type-id-1142'>
+      <class-decl name='StackTrace' size-in-bits='2112' is-struct='yes' visibility='default' filepath='src/common.h' line='266' column='1' id='type-id-1136'>
         <data-member access='public' layout-offset-in-bits='0'>
           <!-- uintptr_t tcmalloc::StackTrace::size -->
           <var-decl name='size' type-id='type-id-130' visibility='default' filepath='src/common.h' line='267' column='1'/>
@@ -40020,14 +39667,14 @@
         </data-member>
         <data-member access='public' layout-offset-in-bits='128'>
           <!-- void* tcmalloc::StackTrace::stack[31] -->
-          <var-decl name='stack' type-id='type-id-1271' visibility='default' filepath='src/common.h' line='269' column='1'/>
+          <var-decl name='stack' type-id='type-id-1265' visibility='default' filepath='src/common.h' line='269' column='1'/>
         </data-member>
       </class-decl>
       <!-- class tcmalloc::PageHeap -->
       <class-decl name='PageHeap' size-in-bits='4293888' visibility='default' filepath='src/page_heap.h' line='104' column='1' id='type-id-1403'>
         <member-type access='private'>
           <!-- struct tcmalloc::PageHeap::Stats -->
-          <class-decl name='Stats' size-in-bits='256' is-struct='yes' visibility='default' filepath='src/page_heap.h' line='145' column='1' id='type-id-1330'>
+          <class-decl name='Stats' size-in-bits='256' is-struct='yes' visibility='default' filepath='src/page_heap.h' line='145' column='1' id='type-id-1329'>
             <data-member access='public' layout-offset-in-bits='0'>
               <!-- uint64_t tcmalloc::PageHeap::Stats::system_bytes -->
               <var-decl name='system_bytes' type-id='type-id-15' visibility='default' filepath='src/page_heap.h' line='147' column='1'/>
@@ -40060,11 +39707,11 @@
           <class-decl name='SmallSpanStats' size-in-bits='16384' is-struct='yes' visibility='default' filepath='src/page_heap.h' line='155' column='1' id='type-id-1453'>
             <data-member access='public' layout-offset-in-bits='0'>
               <!-- int64 tcmalloc::PageHeap::SmallSpanStats::normal_length[128] -->
-              <var-decl name='normal_length' type-id='type-id-1252' visibility='default' filepath='src/page_heap.h' line='158' column='1'/>
+              <var-decl name='normal_length' type-id='type-id-1246' visibility='default' filepath='src/page_heap.h' line='158' column='1'/>
             </data-member>
             <data-member access='public' layout-offset-in-bits='8192'>
               <!-- int64 tcmalloc::PageHeap::SmallSpanStats::returned_length[128] -->
-              <var-decl name='returned_length' type-id='type-id-1252' visibility='default' filepath='src/page_heap.h' line='159' column='1'/>
+              <var-decl name='returned_length' type-id='type-id-1246' visibility='default' filepath='src/page_heap.h' line='159' column='1'/>
             </data-member>
           </class-decl>
         </member-type>
@@ -40087,7 +39734,7 @@
         </member-type>
         <member-type access='private'>
           <!-- struct tcmalloc::PageHeap::SpanList -->
-          <class-decl name='SpanList' size-in-bits='768' is-struct='yes' visibility='default' filepath='src/page_heap.h' line='232' column='1' id='type-id-1265'>
+          <class-decl name='SpanList' size-in-bits='768' is-struct='yes' visibility='default' filepath='src/page_heap.h' line='232' column='1' id='type-id-1259'>
             <data-member access='public' layout-offset-in-bits='0'>
               <!-- tcmalloc::Span tcmalloc::PageHeap::SpanList::normal -->
               <var-decl name='normal' type-id='type-id-117' visibility='default' filepath='src/page_heap.h' line='233' column='1'/>
@@ -40100,11 +39747,11 @@
         </member-type>
         <member-type access='private'>
           <!-- typedef TCMalloc_PageMap3<35> tcmalloc::PageHeap::PageMap -->
-          <typedef-decl name='PageMap' type-id='type-id-1278' filepath='src/page_heap.h' line='224' column='1' id='type-id-1507'/>
+          <typedef-decl name='PageMap' type-id='type-id-1272' filepath='src/page_heap.h' line='224' column='1' id='type-id-1507'/>
         </member-type>
         <member-type access='private'>
           <!-- typedef PackedCache<35, long unsigned int> tcmalloc::PageHeap::PageMapCache -->
-          <typedef-decl name='PageMapCache' type-id='type-id-1299' filepath='src/page_heap.h' line='225' column='1' id='type-id-1508'/>
+          <typedef-decl name='PageMapCache' type-id='type-id-1293' filepath='src/page_heap.h' line='225' column='1' id='type-id-1508'/>
         </member-type>
         <data-member access='private' static='yes'>
           <!-- static const size_t tcmalloc::PageHeap::kPageMapBigAllocationThreshold -->
@@ -40132,19 +39779,19 @@
         </data-member>
         <data-member access='private' layout-offset-in-bits='4194432'>
           <!-- tcmalloc::PageHeap::SpanList tcmalloc::PageHeap::large_ -->
-          <var-decl name='large_' type-id='type-id-1265' visibility='default' filepath='src/page_heap.h' line='238' column='1'/>
+          <var-decl name='large_' type-id='type-id-1259' visibility='default' filepath='src/page_heap.h' line='238' column='1'/>
         </data-member>
         <data-member access='private' layout-offset-in-bits='4195200'>
           <!-- tcmalloc::PageHeap::SpanList tcmalloc::PageHeap::free_[128] -->
-          <var-decl name='free_' type-id='type-id-1266' visibility='default' filepath='src/page_heap.h' line='241' column='1'/>
+          <var-decl name='free_' type-id='type-id-1260' visibility='default' filepath='src/page_heap.h' line='241' column='1'/>
         </data-member>
         <data-member access='private' layout-offset-in-bits='4293504'>
           <!-- tcmalloc::PageHeap::Stats tcmalloc::PageHeap::stats_ -->
-          <var-decl name='stats_' type-id='type-id-1330' visibility='default' filepath='src/page_heap.h' line='244' column='1'/>
+          <var-decl name='stats_' type-id='type-id-1329' visibility='default' filepath='src/page_heap.h' line='244' column='1'/>
         </data-member>
         <data-member access='private' layout-offset-in-bits='4293760'>
           <!-- int64_t tcmalloc::PageHeap::scavenge_counter_ -->
-          <var-decl name='scavenge_counter_' type-id='type-id-1314' visibility='default' filepath='src/page_heap.h' line='302' column='1'/>
+          <var-decl name='scavenge_counter_' type-id='type-id-1313' visibility='default' filepath='src/page_heap.h' line='302' column='1'/>
         </data-member>
         <data-member access='private' layout-offset-in-bits='4293824'>
           <!-- int tcmalloc::PageHeap::release_index_ -->
@@ -40169,9 +39816,9 @@
             <!-- implicit parameter of type 'tcmalloc::PageHeap*' -->
             <parameter type-id='type-id-1450' is-artificial='yes'/>
             <!-- parameter of type 'typedef Length' -->
-            <parameter type-id='type-id-1138'/>
+            <parameter type-id='type-id-1132'/>
             <!-- tcmalloc::Span* -->
-            <return type-id='type-id-1136'/>
+            <return type-id='type-id-1130'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
@@ -40180,7 +39827,7 @@
             <!-- implicit parameter of type 'tcmalloc::PageHeap*' -->
             <parameter type-id='type-id-1450' is-artificial='yes'/>
             <!-- parameter of type 'tcmalloc::Span*' -->
-            <parameter type-id='type-id-1136'/>
+            <parameter type-id='type-id-1130'/>
             <!-- void -->
             <return type-id='type-id-56'/>
           </function-decl>
@@ -40191,7 +39838,7 @@
             <!-- implicit parameter of type 'tcmalloc::PageHeap*' -->
             <parameter type-id='type-id-1450' is-artificial='yes'/>
             <!-- parameter of type 'tcmalloc::Span*' -->
-            <parameter type-id='type-id-1136'/>
+            <parameter type-id='type-id-1130'/>
             <!-- parameter of type 'typedef size_t' -->
             <parameter type-id='type-id-57'/>
             <!-- void -->
@@ -40204,11 +39851,11 @@
             <!-- implicit parameter of type 'tcmalloc::PageHeap*' -->
             <parameter type-id='type-id-1450' is-artificial='yes'/>
             <!-- parameter of type 'tcmalloc::Span*' -->
-            <parameter type-id='type-id-1136'/>
+            <parameter type-id='type-id-1130'/>
             <!-- parameter of type 'typedef Length' -->
-            <parameter type-id='type-id-1138'/>
+            <parameter type-id='type-id-1132'/>
             <!-- tcmalloc::Span* -->
-            <return type-id='type-id-1136'/>
+            <return type-id='type-id-1130'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
@@ -40217,9 +39864,9 @@
             <!-- implicit parameter of type 'const tcmalloc::PageHeap*' -->
             <parameter type-id='type-id-1405' is-artificial='yes'/>
             <!-- parameter of type 'typedef PageID' -->
-            <parameter type-id='type-id-1137'/>
+            <parameter type-id='type-id-1131'/>
             <!-- tcmalloc::Span* -->
-            <return type-id='type-id-1136'/>
+            <return type-id='type-id-1130'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
@@ -40228,9 +39875,9 @@
             <!-- implicit parameter of type 'tcmalloc::PageHeap*' -->
             <parameter type-id='type-id-1450' is-artificial='yes'/>
             <!-- parameter of type 'typedef PageID' -->
-            <parameter type-id='type-id-1137'/>
+            <parameter type-id='type-id-1131'/>
             <!-- parameter of type 'base::MallocRange*' -->
-            <parameter type-id='type-id-1352'/>
+            <parameter type-id='type-id-1351'/>
             <!-- bool -->
             <return type-id='type-id-55'/>
           </function-decl>
@@ -40241,7 +39888,7 @@
             <!-- implicit parameter of type 'const tcmalloc::PageHeap*' -->
             <parameter type-id='type-id-1405' is-artificial='yes'/>
             <!-- struct tcmalloc::PageHeap::Stats -->
-            <return type-id='type-id-1330'/>
+            <return type-id='type-id-1329'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
@@ -40290,11 +39937,11 @@
             <!-- implicit parameter of type 'tcmalloc::PageHeap*' -->
             <parameter type-id='type-id-1450' is-artificial='yes'/>
             <!-- parameter of type 'tcmalloc::Span*' -->
-            <parameter type-id='type-id-1136'/>
+            <parameter type-id='type-id-1130'/>
             <!-- parameter of type 'typedef Length' -->
-            <parameter type-id='type-id-1138'/>
+            <parameter type-id='type-id-1132'/>
             <!-- parameter of type 'typedef Length' -->
-            <parameter type-id='type-id-1138'/>
+            <parameter type-id='type-id-1132'/>
             <!-- parameter of type 'int' -->
             <parameter type-id='type-id-1'/>
             <!-- bool -->
@@ -40307,9 +39954,9 @@
             <!-- implicit parameter of type 'tcmalloc::PageHeap*' -->
             <parameter type-id='type-id-1450' is-artificial='yes'/>
             <!-- parameter of type 'typedef Length' -->
-            <parameter type-id='type-id-1138'/>
+            <parameter type-id='type-id-1132'/>
             <!-- typedef Length -->
-            <return type-id='type-id-1138'/>
+            <return type-id='type-id-1132'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
@@ -40318,7 +39965,7 @@
             <!-- implicit parameter of type 'const tcmalloc::PageHeap*' -->
             <parameter type-id='type-id-1405' is-artificial='yes'/>
             <!-- parameter of type 'typedef PageID' -->
-            <parameter type-id='type-id-1137'/>
+            <parameter type-id='type-id-1131'/>
             <!-- typedef size_t -->
             <return type-id='type-id-57'/>
           </function-decl>
@@ -40329,7 +39976,7 @@
             <!-- implicit parameter of type 'const tcmalloc::PageHeap*' -->
             <parameter type-id='type-id-1405' is-artificial='yes'/>
             <!-- parameter of type 'typedef PageID' -->
-            <parameter type-id='type-id-1137'/>
+            <parameter type-id='type-id-1131'/>
             <!-- parameter of type 'typedef size_t' -->
             <parameter type-id='type-id-57'/>
             <!-- void -->
@@ -40362,9 +40009,9 @@
             <!-- implicit parameter of type 'tcmalloc::PageHeap*' -->
             <parameter type-id='type-id-1450' is-artificial='yes'/>
             <!-- parameter of type 'typedef Length' -->
-            <parameter type-id='type-id-1138'/>
+            <parameter type-id='type-id-1132'/>
             <!-- tcmalloc::Span* -->
-            <return type-id='type-id-1136'/>
+            <return type-id='type-id-1130'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
@@ -40373,7 +40020,7 @@
             <!-- implicit parameter of type 'tcmalloc::PageHeap*' -->
             <parameter type-id='type-id-1450' is-artificial='yes'/>
             <!-- parameter of type 'typedef Length' -->
-            <parameter type-id='type-id-1138'/>
+            <parameter type-id='type-id-1132'/>
             <!-- bool -->
             <return type-id='type-id-55'/>
           </function-decl>
@@ -40384,11 +40031,11 @@
             <!-- implicit parameter of type 'tcmalloc::PageHeap*' -->
             <parameter type-id='type-id-1450' is-artificial='yes'/>
             <!-- parameter of type 'tcmalloc::Span*' -->
-            <parameter type-id='type-id-1136'/>
+            <parameter type-id='type-id-1130'/>
             <!-- parameter of type 'typedef Length' -->
-            <parameter type-id='type-id-1138'/>
+            <parameter type-id='type-id-1132'/>
             <!-- tcmalloc::Span* -->
-            <return type-id='type-id-1136'/>
+            <return type-id='type-id-1130'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
@@ -40397,7 +40044,7 @@
             <!-- implicit parameter of type 'tcmalloc::PageHeap*' -->
             <parameter type-id='type-id-1450' is-artificial='yes'/>
             <!-- parameter of type 'tcmalloc::Span*' -->
-            <parameter type-id='type-id-1136'/>
+            <parameter type-id='type-id-1130'/>
             <!-- void -->
             <return type-id='type-id-56'/>
           </function-decl>
@@ -40408,9 +40055,9 @@
             <!-- implicit parameter of type 'tcmalloc::PageHeap*' -->
             <parameter type-id='type-id-1450' is-artificial='yes'/>
             <!-- parameter of type 'typedef Length' -->
-            <parameter type-id='type-id-1138'/>
+            <parameter type-id='type-id-1132'/>
             <!-- tcmalloc::Span* -->
-            <return type-id='type-id-1136'/>
+            <return type-id='type-id-1130'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
@@ -40419,7 +40066,7 @@
             <!-- implicit parameter of type 'tcmalloc::PageHeap*' -->
             <parameter type-id='type-id-1450' is-artificial='yes'/>
             <!-- parameter of type 'tcmalloc::Span*' -->
-            <parameter type-id='type-id-1136'/>
+            <parameter type-id='type-id-1130'/>
             <!-- void -->
             <return type-id='type-id-56'/>
           </function-decl>
@@ -40430,7 +40077,7 @@
             <!-- implicit parameter of type 'tcmalloc::PageHeap*' -->
             <parameter type-id='type-id-1450' is-artificial='yes'/>
             <!-- parameter of type 'tcmalloc::Span*' -->
-            <parameter type-id='type-id-1136'/>
+            <parameter type-id='type-id-1130'/>
             <!-- void -->
             <return type-id='type-id-56'/>
           </function-decl>
@@ -40441,7 +40088,7 @@
             <!-- implicit parameter of type 'tcmalloc::PageHeap*' -->
             <parameter type-id='type-id-1450' is-artificial='yes'/>
             <!-- parameter of type 'tcmalloc::Span*' -->
-            <parameter type-id='type-id-1136'/>
+            <parameter type-id='type-id-1130'/>
             <!-- bool -->
             <return type-id='type-id-55'/>
           </function-decl>
@@ -40452,7 +40099,7 @@
             <!-- implicit parameter of type 'tcmalloc::PageHeap*' -->
             <parameter type-id='type-id-1450' is-artificial='yes'/>
             <!-- parameter of type 'tcmalloc::Span*' -->
-            <parameter type-id='type-id-1136'/>
+            <parameter type-id='type-id-1130'/>
             <!-- void -->
             <return type-id='type-id-56'/>
           </function-decl>
@@ -40463,7 +40110,7 @@
             <!-- implicit parameter of type 'tcmalloc::PageHeap*' -->
             <parameter type-id='type-id-1450' is-artificial='yes'/>
             <!-- parameter of type 'tcmalloc::Span*' -->
-            <parameter type-id='type-id-1136'/>
+            <parameter type-id='type-id-1130'/>
             <!-- void -->
             <return type-id='type-id-56'/>
           </function-decl>
@@ -40474,7 +40121,7 @@
             <!-- implicit parameter of type 'tcmalloc::PageHeap*' -->
             <parameter type-id='type-id-1450' is-artificial='yes'/>
             <!-- parameter of type 'typedef Length' -->
-            <parameter type-id='type-id-1138'/>
+            <parameter type-id='type-id-1132'/>
             <!-- void -->
             <return type-id='type-id-56'/>
           </function-decl>
@@ -40487,7 +40134,7 @@
             <!-- parameter of type 'tcmalloc::PageHeap::SpanList*' -->
             <parameter type-id='type-id-1455'/>
             <!-- typedef Length -->
-            <return type-id='type-id-1138'/>
+            <return type-id='type-id-1132'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
@@ -40496,7 +40143,7 @@
             <!-- implicit parameter of type 'tcmalloc::PageHeap*' -->
             <parameter type-id='type-id-1450' is-artificial='yes'/>
             <!-- parameter of type 'typedef Length' -->
-            <parameter type-id='type-id-1138'/>
+            <parameter type-id='type-id-1132'/>
             <!-- parameter of type 'bool' -->
             <parameter type-id='type-id-55'/>
             <!-- bool -->
@@ -40509,9 +40156,9 @@
             <!-- implicit parameter of type 'tcmalloc::PageHeap*' -->
             <parameter type-id='type-id-1450' is-artificial='yes'/>
             <!-- parameter of type 'tcmalloc::Span*' -->
-            <parameter type-id='type-id-1136'/>
+            <parameter type-id='type-id-1130'/>
             <!-- parameter of type 'tcmalloc::Span*' -->
-            <parameter type-id='type-id-1136'/>
+            <parameter type-id='type-id-1130'/>
             <!-- bool -->
             <return type-id='type-id-55'/>
           </function-decl>
@@ -40521,7 +40168,7 @@
       <class-decl name='ThreadCache' size-in-bits='17408' visibility='default' filepath='src/thread_cache.h' line='66' column='1' id='type-id-1415'>
         <member-type access='private'>
           <!-- class tcmalloc::ThreadCache::FreeList -->
-          <class-decl name='FreeList' size-in-bits='192' visibility='default' filepath='src/thread_cache.h' line='132' column='1' id='type-id-1267'>
+          <class-decl name='FreeList' size-in-bits='192' visibility='default' filepath='src/thread_cache.h' line='132' column='1' id='type-id-1261'>
             <data-member access='private' layout-offset-in-bits='0'>
               <!-- void* tcmalloc::ThreadCache::FreeList::list_ -->
               <var-decl name='list_' type-id='type-id-53' visibility='default' filepath='src/thread_cache.h' line='134' column='1'/>
@@ -40726,7 +40373,7 @@
         </data-member>
         <data-member access='private' static='yes'>
           <!-- static pthread_key_t tcmalloc::ThreadCache::heap_key_ -->
-          <var-decl name='heap_key_' type-id='type-id-953' mangled-name='_ZN8tcmalloc11ThreadCache9heap_key_E' visibility='default' filepath='src/thread_cache.h' line='281' column='1' elf-symbol-id='_ZN8tcmalloc11ThreadCache9heap_key_E'/>
+          <var-decl name='heap_key_' type-id='type-id-946' mangled-name='_ZN8tcmalloc11ThreadCache9heap_key_E' visibility='default' filepath='src/thread_cache.h' line='281' column='1' elf-symbol-id='_ZN8tcmalloc11ThreadCache9heap_key_E'/>
         </data-member>
         <data-member access='private' static='yes'>
           <!-- static tcmalloc::ThreadCache* tcmalloc::ThreadCache::thread_heaps_ -->
@@ -40766,7 +40413,7 @@
         </data-member>
         <data-member access='private' layout-offset-in-bits='384'>
           <!-- tcmalloc::ThreadCache::FreeList tcmalloc::ThreadCache::list_[88] -->
-          <var-decl name='list_' type-id='type-id-1268' visibility='default' filepath='src/thread_cache.h' line='315' column='1'/>
+          <var-decl name='list_' type-id='type-id-1262' visibility='default' filepath='src/thread_cache.h' line='315' column='1'/>
         </data-member>
         <data-member access='private' layout-offset-in-bits='17280'>
           <!-- pthread_t tcmalloc::ThreadCache::tid_ -->
@@ -41098,7 +40745,7 @@
         </data-member>
         <data-member access='private' static='yes'>
           <!-- static double tcmalloc::Sampler::log_table_[1024] -->
-          <var-decl name='log_table_' type-id='type-id-1250' mangled-name='_ZN8tcmalloc7Sampler10log_table_E' visibility='default' filepath='src/sampler.h' line='138' column='1' elf-symbol-id='_ZN8tcmalloc7Sampler10log_table_E'/>
+          <var-decl name='log_table_' type-id='type-id-1244' mangled-name='_ZN8tcmalloc7Sampler10log_table_E' visibility='default' filepath='src/sampler.h' line='138' column='1' elf-symbol-id='_ZN8tcmalloc7Sampler10log_table_E'/>
         </data-member>
         <member-function access='private'>
           <!-- void tcmalloc::Sampler::Init(uint32_t) -->
@@ -41169,7 +40816,7 @@
           <!-- double tcmalloc::Sampler::FastLog2() -->
           <function-decl name='FastLog2' mangled-name='_ZN8tcmalloc7Sampler8FastLog2ERKd' filepath='src/sampler.h' line='126' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- parameter of type 'const double&' -->
-            <parameter type-id='type-id-1135'/>
+            <parameter type-id='type-id-1129'/>
             <!-- double -->
             <return type-id='type-id-2'/>
           </function-decl>
@@ -41251,44 +40898,6 @@
       <!-- char FLAG__namespace_do_not_use_directly_use_DECLARE_int64_instead::FLAGS_notcmalloc_large_alloc_report_threshold -->
       <var-decl name='FLAGS_notcmalloc_large_alloc_report_threshold' type-id='type-id-66' mangled-name='_ZN61FLAG__namespace_do_not_use_directly_use_DECLARE_int64_instead45FLAGS_notcmalloc_large_alloc_report_thresholdE' visibility='default' filepath='src/tcmalloc.cc' line='195' column='1' elf-symbol-id='_ZN61FLAG__namespace_do_not_use_directly_use_DECLARE_int64_instead45FLAGS_notcmalloc_large_alloc_report_thresholdE'/>
     </namespace-decl>
-    <!-- class SysAllocator -->
-    <class-decl name='SysAllocator' size-in-bits='64' visibility='default' filepath='src/gperftools/malloc_extension.h' line='75' column='1' is-declaration-only='yes' id='type-id-958'>
-      <member-function access='private' constructor='yes'>
-        <!-- SysAllocator::SysAllocator() -->
-        <function-decl name='SysAllocator' filepath='./src/gperftools/malloc_extension.h' line='77' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <!-- implicit parameter of type 'SysAllocator*' -->
-          <parameter type-id='type-id-902' is-artificial='yes'/>
-          <!-- void -->
-          <return type-id='type-id-56'/>
-        </function-decl>
-      </member-function>
-      <member-function access='private' destructor='yes' vtable-offset='-1'>
-        <!-- SysAllocator::~SysAllocator(int) -->
-        <function-decl name='~SysAllocator' mangled-name='_ZN12SysAllocatorD1Ev' filepath='src/malloc_extension.cc' line='108' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN12SysAllocatorD1Ev'>
-          <!-- implicit parameter of type 'SysAllocator*' -->
-          <parameter type-id='type-id-902' is-artificial='yes'/>
-          <!-- artificial parameter of type 'int' -->
-          <parameter type-id='type-id-1' is-artificial='yes'/>
-          <!-- void -->
-          <return type-id='type-id-56'/>
-        </function-decl>
-      </member-function>
-      <member-function access='private' vtable-offset='2'>
-        <!-- void* SysAllocator::Alloc(size_t, size_t*, size_t) -->
-        <function-decl name='Alloc' mangled-name='_ZN12SysAllocator5AllocEmPmm' filepath='src/gperftools/malloc_extension.h' line='84' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <!-- implicit parameter of type 'SysAllocator*' -->
-          <parameter type-id='type-id-902' is-artificial='yes'/>
-          <!-- parameter of type 'typedef size_t' -->
-          <parameter type-id='type-id-57'/>
-          <!-- parameter of type 'size_t*' -->
-          <parameter type-id='type-id-230'/>
-          <!-- parameter of type 'typedef size_t' -->
-          <parameter type-id='type-id-57'/>
-          <!-- void* -->
-          <return type-id='type-id-53'/>
-        </function-decl>
-      </member-function>
-    </class-decl>
     <!-- const char* tc_version(int*, int*, const char**) -->
     <function-decl name='tc_version' mangled-name='tc_version' filepath='src/tcmalloc.cc' line='1547' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='tc_version'>
       <!-- parameter of type 'int*' -->
@@ -41331,7 +40940,7 @@
     <!-- mallinfo tc_mallinfo() -->
     <function-decl name='tc_mallinfo' mangled-name='tc_mallinfo' filepath='src/tcmalloc.cc' line='1725' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='tc_mallinfo'>
       <!-- struct mallinfo -->
-      <return type-id='type-id-1338'/>
+      <return type-id='type-id-1337'/>
     </function-decl>
     <!-- int tc_posix_memalign(void**, size_t, size_t) -->
     <function-decl name='tc_posix_memalign' mangled-name='posix_memalign' filepath='src/tcmalloc.cc' line='1676' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='posix_memalign'>
@@ -41506,6 +41115,15 @@
       <!-- void -->
       <return type-id='type-id-56'/>
     </function-type>
+    <!-- void (void*, const base::MallocRange*) -->
+    <function-type size-in-bits='64' id='type-id-1300'>
+      <!-- parameter of type 'void*' -->
+      <parameter type-id='type-id-53'/>
+      <!-- parameter of type 'const base::MallocRange*' -->
+      <parameter type-id='type-id-1370'/>
+      <!-- void -->
+      <return type-id='type-id-56'/>
+    </function-type>
     <!-- void (void*, size_t) -->
     <function-type size-in-bits='64' id='type-id-1472'>
       <!-- parameter of type 'void*' -->
@@ -41587,11 +41205,11 @@
       <!-- const double& std::max<double>(const double&, const double&) -->
       <function-decl name='max&lt;double&gt;' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_algobase.h' line='209' column='1' visibility='default' binding='global' size-in-bits='64'>
         <!-- parameter of type 'const double&' -->
-        <parameter type-id='type-id-1135'/>
+        <parameter type-id='type-id-1129'/>
         <!-- parameter of type 'const double&' -->
-        <parameter type-id='type-id-1135'/>
+        <parameter type-id='type-id-1129'/>
         <!-- const double& -->
-        <return type-id='type-id-1135'/>
+        <return type-id='type-id-1129'/>
       </function-decl>
       <!-- const int& std::min<int>(const int&, const int&) -->
       <function-decl name='min&lt;int&gt;' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_algobase.h' line='186' column='1' visibility='default' binding='global' size-in-bits='64'>
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 82dfd635..231ed37e 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
@@ -2467,30 +2467,14 @@
           <enumerator name='BARRIER_TAG' value='16'/>
         </enum-decl>
       </member-type>
-      <member-type access='private'>
-        <!-- enum vtkCommunicator::StandardOperations -->
-        <enum-decl name='StandardOperations' filepath='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Parallel/Core/vtkCommunicator.h' line='76' column='1' id='type-id-119'>
-          <underlying-type type-id='type-id-25'/>
-          <enumerator name='MAX_OP' value='0'/>
-          <enumerator name='MIN_OP' value='1'/>
-          <enumerator name='SUM_OP' value='2'/>
-          <enumerator name='PRODUCT_OP' value='3'/>
-          <enumerator name='LOGICAL_AND_OP' value='4'/>
-          <enumerator name='BITWISE_AND_OP' value='5'/>
-          <enumerator name='LOGICAL_OR_OP' value='6'/>
-          <enumerator name='BITWISE_OR_OP' value='7'/>
-          <enumerator name='LOGICAL_XOR_OP' value='8'/>
-          <enumerator name='BITWISE_XOR_OP' value='9'/>
-        </enum-decl>
-      </member-type>
       <member-type access='private'>
         <!-- class vtkCommunicator::Operation -->
-        <class-decl name='Operation' size-in-bits='64' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Parallel/Core/vtkCommunicator.h' line='94' column='1' is-declaration-only='yes' id='type-id-120'>
+        <class-decl name='Operation' size-in-bits='64' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Parallel/Core/vtkCommunicator.h' line='94' column='1' id='type-id-119'>
           <member-function access='private' destructor='yes' vtable-offset='-1'>
             <!-- vtkCommunicator::Operation::~Operation(int) -->
             <function-decl name='~Operation' filepath='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Parallel/Core/vtkCommunicator.h' line='113' column='1' visibility='default' binding='global' size-in-bits='64'>
               <!-- implicit parameter of type 'vtkCommunicator::Operation*' -->
-              <parameter type-id='type-id-121' is-artificial='yes'/>
+              <parameter type-id='type-id-120' is-artificial='yes'/>
               <!-- artificial parameter of type 'int' -->
               <parameter type-id='type-id-19' is-artificial='yes'/>
               <!-- void -->
@@ -2501,13 +2485,13 @@
             <!-- void vtkCommunicator::Operation::Function(void*, void*, vtkIdType, int) -->
             <function-decl name='Function' mangled-name='_ZN15vtkCommunicator9Operation8FunctionEPKvPvxi' filepath='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Parallel/Core/vtkCommunicator.h' line='105' column='1' visibility='default' binding='global' size-in-bits='64'>
               <!-- implicit parameter of type 'vtkCommunicator::Operation*' -->
-              <parameter type-id='type-id-121' is-artificial='yes'/>
+              <parameter type-id='type-id-120' is-artificial='yes'/>
               <!-- parameter of type 'void*' -->
               <parameter type-id='type-id-14'/>
               <!-- parameter of type 'void*' -->
               <parameter type-id='type-id-14'/>
               <!-- parameter of type 'typedef vtkIdType' -->
-              <parameter type-id='type-id-122'/>
+              <parameter type-id='type-id-121'/>
               <!-- parameter of type 'int' -->
               <parameter type-id='type-id-19'/>
               <!-- void -->
@@ -2518,13 +2502,29 @@
             <!-- int vtkCommunicator::Operation::Commutative() -->
             <function-decl name='Commutative' mangled-name='_ZN15vtkCommunicator9Operation11CommutativeEv' filepath='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Parallel/Core/vtkCommunicator.h' line='111' column='1' visibility='default' binding='global' size-in-bits='64'>
               <!-- implicit parameter of type 'vtkCommunicator::Operation*' -->
-              <parameter type-id='type-id-121' is-artificial='yes'/>
+              <parameter type-id='type-id-120' is-artificial='yes'/>
               <!-- int -->
               <return type-id='type-id-19'/>
             </function-decl>
           </member-function>
         </class-decl>
       </member-type>
+      <member-type access='private'>
+        <!-- enum vtkCommunicator::StandardOperations -->
+        <enum-decl name='StandardOperations' filepath='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Parallel/Core/vtkCommunicator.h' line='76' column='1' id='type-id-122'>
+          <underlying-type type-id='type-id-25'/>
+          <enumerator name='MAX_OP' value='0'/>
+          <enumerator name='MIN_OP' value='1'/>
+          <enumerator name='SUM_OP' value='2'/>
+          <enumerator name='PRODUCT_OP' value='3'/>
+          <enumerator name='LOGICAL_AND_OP' value='4'/>
+          <enumerator name='BITWISE_AND_OP' value='5'/>
+          <enumerator name='LOGICAL_OR_OP' value='6'/>
+          <enumerator name='BITWISE_OR_OP' value='7'/>
+          <enumerator name='LOGICAL_XOR_OP' value='8'/>
+          <enumerator name='BITWISE_XOR_OP' value='9'/>
+        </enum-decl>
+      </member-type>
       <data-member access='protected' layout-offset-in-bits='384'>
         <!-- int vtkCommunicator::MaximumNumberOfProcesses -->
         <var-decl name='MaximumNumberOfProcesses' type-id='type-id-19' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Parallel/Core/vtkCommunicator.h' line='855' column='1'/>
@@ -2543,7 +2543,7 @@
       </data-member>
       <data-member access='protected' layout-offset-in-bits='512'>
         <!-- vtkIdType vtkCommunicator::Count -->
-        <var-decl name='Count' type-id='type-id-122' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Parallel/Core/vtkCommunicator.h' line='862' column='1'/>
+        <var-decl name='Count' type-id='type-id-121' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Parallel/Core/vtkCommunicator.h' line='862' column='1'/>
       </data-member>
       <member-function access='private' static='yes'>
         <!-- int vtkCommunicator::IsTypeOf() -->
@@ -2610,7 +2610,7 @@
           <!-- parameter of type 'const int*' -->
           <parameter type-id='type-id-128'/>
           <!-- parameter of type 'typedef vtkIdType' -->
-          <parameter type-id='type-id-122'/>
+          <parameter type-id='type-id-121'/>
           <!-- parameter of type 'int' -->
           <parameter type-id='type-id-19'/>
           <!-- parameter of type 'int' -->
@@ -2627,7 +2627,7 @@
           <!-- parameter of type 'const unsigned int*' -->
           <parameter type-id='type-id-129'/>
           <!-- parameter of type 'typedef vtkIdType' -->
-          <parameter type-id='type-id-122'/>
+          <parameter type-id='type-id-121'/>
           <!-- parameter of type 'int' -->
           <parameter type-id='type-id-19'/>
           <!-- parameter of type 'int' -->
@@ -2644,7 +2644,7 @@
           <!-- parameter of type 'const unsigned long int*' -->
           <parameter type-id='type-id-130'/>
           <!-- parameter of type 'typedef vtkIdType' -->
-          <parameter type-id='type-id-122'/>
+          <parameter type-id='type-id-121'/>
           <!-- parameter of type 'int' -->
           <parameter type-id='type-id-19'/>
           <!-- parameter of type 'int' -->
@@ -2661,7 +2661,7 @@
           <!-- parameter of type 'const unsigned char*' -->
           <parameter type-id='type-id-57'/>
           <!-- parameter of type 'typedef vtkIdType' -->
-          <parameter type-id='type-id-122'/>
+          <parameter type-id='type-id-121'/>
           <!-- parameter of type 'int' -->
           <parameter type-id='type-id-19'/>
           <!-- parameter of type 'int' -->
@@ -2678,7 +2678,7 @@
           <!-- parameter of type 'const char*' -->
           <parameter type-id='type-id-98'/>
           <!-- parameter of type 'typedef vtkIdType' -->
-          <parameter type-id='type-id-122'/>
+          <parameter type-id='type-id-121'/>
           <!-- parameter of type 'int' -->
           <parameter type-id='type-id-19'/>
           <!-- parameter of type 'int' -->
@@ -2695,7 +2695,7 @@
           <!-- parameter of type 'const float*' -->
           <parameter type-id='type-id-131'/>
           <!-- parameter of type 'typedef vtkIdType' -->
-          <parameter type-id='type-id-122'/>
+          <parameter type-id='type-id-121'/>
           <!-- parameter of type 'int' -->
           <parameter type-id='type-id-19'/>
           <!-- parameter of type 'int' -->
@@ -2712,7 +2712,7 @@
           <!-- parameter of type 'const double*' -->
           <parameter type-id='type-id-112'/>
           <!-- parameter of type 'typedef vtkIdType' -->
-          <parameter type-id='type-id-122'/>
+          <parameter type-id='type-id-121'/>
           <!-- parameter of type 'int' -->
           <parameter type-id='type-id-19'/>
           <!-- parameter of type 'int' -->
@@ -2729,7 +2729,7 @@
           <!-- parameter of type 'const vtkIdType*' -->
           <parameter type-id='type-id-132'/>
           <!-- parameter of type 'typedef vtkIdType' -->
-          <parameter type-id='type-id-122'/>
+          <parameter type-id='type-id-121'/>
           <!-- parameter of type 'int' -->
           <parameter type-id='type-id-19'/>
           <!-- parameter of type 'int' -->
@@ -2804,7 +2804,7 @@
           <!-- parameter of type 'int*' -->
           <parameter type-id='type-id-76'/>
           <!-- parameter of type 'typedef vtkIdType' -->
-          <parameter type-id='type-id-122'/>
+          <parameter type-id='type-id-121'/>
           <!-- parameter of type 'int' -->
           <parameter type-id='type-id-19'/>
           <!-- parameter of type 'int' -->
@@ -2821,7 +2821,7 @@
           <!-- parameter of type 'unsigned int*' -->
           <parameter type-id='type-id-77'/>
           <!-- parameter of type 'typedef vtkIdType' -->
-          <parameter type-id='type-id-122'/>
+          <parameter type-id='type-id-121'/>
           <!-- parameter of type 'int' -->
           <parameter type-id='type-id-19'/>
           <!-- parameter of type 'int' -->
@@ -2838,7 +2838,7 @@
           <!-- parameter of type 'unsigned long int*' -->
           <parameter type-id='type-id-133'/>
           <!-- parameter of type 'typedef vtkIdType' -->
-          <parameter type-id='type-id-122'/>
+          <parameter type-id='type-id-121'/>
           <!-- parameter of type 'int' -->
           <parameter type-id='type-id-19'/>
           <!-- parameter of type 'int' -->
@@ -2855,7 +2855,7 @@
           <!-- parameter of type 'unsigned char*' -->
           <parameter type-id='type-id-58'/>
           <!-- parameter of type 'typedef vtkIdType' -->
-          <parameter type-id='type-id-122'/>
+          <parameter type-id='type-id-121'/>
           <!-- parameter of type 'int' -->
           <parameter type-id='type-id-19'/>
           <!-- parameter of type 'int' -->
@@ -2872,7 +2872,7 @@
           <!-- parameter of type 'char*' -->
           <parameter type-id='type-id-33'/>
           <!-- parameter of type 'typedef vtkIdType' -->
-          <parameter type-id='type-id-122'/>
+          <parameter type-id='type-id-121'/>
           <!-- parameter of type 'int' -->
           <parameter type-id='type-id-19'/>
           <!-- parameter of type 'int' -->
@@ -2889,7 +2889,7 @@
           <!-- parameter of type 'float*' -->
           <parameter type-id='type-id-75'/>
           <!-- parameter of type 'typedef vtkIdType' -->
-          <parameter type-id='type-id-122'/>
+          <parameter type-id='type-id-121'/>
           <!-- parameter of type 'int' -->
           <parameter type-id='type-id-19'/>
           <!-- parameter of type 'int' -->
@@ -2906,7 +2906,7 @@
           <!-- parameter of type 'double*' -->
           <parameter type-id='type-id-74'/>
           <!-- parameter of type 'typedef vtkIdType' -->
-          <parameter type-id='type-id-122'/>
+          <parameter type-id='type-id-121'/>
           <!-- parameter of type 'int' -->
           <parameter type-id='type-id-19'/>
           <!-- parameter of type 'int' -->
@@ -2923,7 +2923,7 @@
           <!-- parameter of type 'vtkIdType*' -->
           <parameter type-id='type-id-134'/>
           <!-- parameter of type 'typedef vtkIdType' -->
-          <parameter type-id='type-id-122'/>
+          <parameter type-id='type-id-121'/>
           <!-- parameter of type 'int' -->
           <parameter type-id='type-id-19'/>
           <!-- parameter of type 'int' -->
@@ -2955,7 +2955,7 @@
           <!-- parameter of type 'int*' -->
           <parameter type-id='type-id-76'/>
           <!-- parameter of type 'typedef vtkIdType' -->
-          <parameter type-id='type-id-122'/>
+          <parameter type-id='type-id-121'/>
           <!-- parameter of type 'int' -->
           <parameter type-id='type-id-19'/>
           <!-- int -->
@@ -2970,7 +2970,7 @@
           <!-- parameter of type 'unsigned int*' -->
           <parameter type-id='type-id-77'/>
           <!-- parameter of type 'typedef vtkIdType' -->
-          <parameter type-id='type-id-122'/>
+          <parameter type-id='type-id-121'/>
           <!-- parameter of type 'int' -->
           <parameter type-id='type-id-19'/>
           <!-- int -->
@@ -2985,7 +2985,7 @@
           <!-- parameter of type 'unsigned long int*' -->
           <parameter type-id='type-id-133'/>
           <!-- parameter of type 'typedef vtkIdType' -->
-          <parameter type-id='type-id-122'/>
+          <parameter type-id='type-id-121'/>
           <!-- parameter of type 'int' -->
           <parameter type-id='type-id-19'/>
           <!-- int -->
@@ -3000,7 +3000,7 @@
           <!-- parameter of type 'unsigned char*' -->
           <parameter type-id='type-id-58'/>
           <!-- parameter of type 'typedef vtkIdType' -->
-          <parameter type-id='type-id-122'/>
+          <parameter type-id='type-id-121'/>
           <!-- parameter of type 'int' -->
           <parameter type-id='type-id-19'/>
           <!-- int -->
@@ -3015,7 +3015,7 @@
           <!-- parameter of type 'char*' -->
           <parameter type-id='type-id-33'/>
           <!-- parameter of type 'typedef vtkIdType' -->
-          <parameter type-id='type-id-122'/>
+          <parameter type-id='type-id-121'/>
           <!-- parameter of type 'int' -->
           <parameter type-id='type-id-19'/>
           <!-- int -->
@@ -3030,7 +3030,7 @@
           <!-- parameter of type 'float*' -->
           <parameter type-id='type-id-75'/>
           <!-- parameter of type 'typedef vtkIdType' -->
-          <parameter type-id='type-id-122'/>
+          <parameter type-id='type-id-121'/>
           <!-- parameter of type 'int' -->
           <parameter type-id='type-id-19'/>
           <!-- int -->
@@ -3045,7 +3045,7 @@
           <!-- parameter of type 'double*' -->
           <parameter type-id='type-id-74'/>
           <!-- parameter of type 'typedef vtkIdType' -->
-          <parameter type-id='type-id-122'/>
+          <parameter type-id='type-id-121'/>
           <!-- parameter of type 'int' -->
           <parameter type-id='type-id-19'/>
           <!-- int -->
@@ -3060,7 +3060,7 @@
           <!-- parameter of type 'vtkIdType*' -->
           <parameter type-id='type-id-134'/>
           <!-- parameter of type 'typedef vtkIdType' -->
-          <parameter type-id='type-id-122'/>
+          <parameter type-id='type-id-121'/>
           <!-- parameter of type 'int' -->
           <parameter type-id='type-id-19'/>
           <!-- int -->
@@ -3116,7 +3116,7 @@
           <!-- parameter of type 'int*' -->
           <parameter type-id='type-id-76'/>
           <!-- parameter of type 'typedef vtkIdType' -->
-          <parameter type-id='type-id-122'/>
+          <parameter type-id='type-id-121'/>
           <!-- parameter of type 'int' -->
           <parameter type-id='type-id-19'/>
           <!-- int -->
@@ -3133,7 +3133,7 @@
           <!-- parameter of type 'unsigned long int*' -->
           <parameter type-id='type-id-133'/>
           <!-- parameter of type 'typedef vtkIdType' -->
-          <parameter type-id='type-id-122'/>
+          <parameter type-id='type-id-121'/>
           <!-- parameter of type 'int' -->
           <parameter type-id='type-id-19'/>
           <!-- int -->
@@ -3150,7 +3150,7 @@
           <!-- parameter of type 'unsigned char*' -->
           <parameter type-id='type-id-58'/>
           <!-- parameter of type 'typedef vtkIdType' -->
-          <parameter type-id='type-id-122'/>
+          <parameter type-id='type-id-121'/>
           <!-- parameter of type 'int' -->
           <parameter type-id='type-id-19'/>
           <!-- int -->
@@ -3167,7 +3167,7 @@
           <!-- parameter of type 'char*' -->
           <parameter type-id='type-id-33'/>
           <!-- parameter of type 'typedef vtkIdType' -->
-          <parameter type-id='type-id-122'/>
+          <parameter type-id='type-id-121'/>
           <!-- parameter of type 'int' -->
           <parameter type-id='type-id-19'/>
           <!-- int -->
@@ -3184,7 +3184,7 @@
           <!-- parameter of type 'float*' -->
           <parameter type-id='type-id-75'/>
           <!-- parameter of type 'typedef vtkIdType' -->
-          <parameter type-id='type-id-122'/>
+          <parameter type-id='type-id-121'/>
           <!-- parameter of type 'int' -->
           <parameter type-id='type-id-19'/>
           <!-- int -->
@@ -3201,7 +3201,7 @@
           <!-- parameter of type 'double*' -->
           <parameter type-id='type-id-74'/>
           <!-- parameter of type 'typedef vtkIdType' -->
-          <parameter type-id='type-id-122'/>
+          <parameter type-id='type-id-121'/>
           <!-- parameter of type 'int' -->
           <parameter type-id='type-id-19'/>
           <!-- int -->
@@ -3218,7 +3218,7 @@
           <!-- parameter of type 'vtkIdType*' -->
           <parameter type-id='type-id-134'/>
           <!-- parameter of type 'typedef vtkIdType' -->
-          <parameter type-id='type-id-122'/>
+          <parameter type-id='type-id-121'/>
           <!-- parameter of type 'int' -->
           <parameter type-id='type-id-19'/>
           <!-- int -->
@@ -3250,7 +3250,7 @@
           <!-- parameter of type 'int*' -->
           <parameter type-id='type-id-76'/>
           <!-- parameter of type 'typedef vtkIdType' -->
-          <parameter type-id='type-id-122'/>
+          <parameter type-id='type-id-121'/>
           <!-- parameter of type 'vtkIdType*' -->
           <parameter type-id='type-id-134'/>
           <!-- parameter of type 'vtkIdType*' -->
@@ -3271,7 +3271,7 @@
           <!-- parameter of type 'unsigned long int*' -->
           <parameter type-id='type-id-133'/>
           <!-- parameter of type 'typedef vtkIdType' -->
-          <parameter type-id='type-id-122'/>
+          <parameter type-id='type-id-121'/>
           <!-- parameter of type 'vtkIdType*' -->
           <parameter type-id='type-id-134'/>
           <!-- parameter of type 'vtkIdType*' -->
@@ -3292,7 +3292,7 @@
           <!-- parameter of type 'unsigned char*' -->
           <parameter type-id='type-id-58'/>
           <!-- parameter of type 'typedef vtkIdType' -->
-          <parameter type-id='type-id-122'/>
+          <parameter type-id='type-id-121'/>
           <!-- parameter of type 'vtkIdType*' -->
           <parameter type-id='type-id-134'/>
           <!-- parameter of type 'vtkIdType*' -->
@@ -3313,7 +3313,7 @@
           <!-- parameter of type 'char*' -->
           <parameter type-id='type-id-33'/>
           <!-- parameter of type 'typedef vtkIdType' -->
-          <parameter type-id='type-id-122'/>
+          <parameter type-id='type-id-121'/>
           <!-- parameter of type 'vtkIdType*' -->
           <parameter type-id='type-id-134'/>
           <!-- parameter of type 'vtkIdType*' -->
@@ -3334,7 +3334,7 @@
           <!-- parameter of type 'float*' -->
           <parameter type-id='type-id-75'/>
           <!-- parameter of type 'typedef vtkIdType' -->
-          <parameter type-id='type-id-122'/>
+          <parameter type-id='type-id-121'/>
           <!-- parameter of type 'vtkIdType*' -->
           <parameter type-id='type-id-134'/>
           <!-- parameter of type 'vtkIdType*' -->
@@ -3355,7 +3355,7 @@
           <!-- parameter of type 'double*' -->
           <parameter type-id='type-id-74'/>
           <!-- parameter of type 'typedef vtkIdType' -->
-          <parameter type-id='type-id-122'/>
+          <parameter type-id='type-id-121'/>
           <!-- parameter of type 'vtkIdType*' -->
           <parameter type-id='type-id-134'/>
           <!-- parameter of type 'vtkIdType*' -->
@@ -3376,7 +3376,7 @@
           <!-- parameter of type 'vtkIdType*' -->
           <parameter type-id='type-id-134'/>
           <!-- parameter of type 'typedef vtkIdType' -->
-          <parameter type-id='type-id-122'/>
+          <parameter type-id='type-id-121'/>
           <!-- parameter of type 'vtkIdType*' -->
           <parameter type-id='type-id-134'/>
           <!-- parameter of type 'vtkIdType*' -->
@@ -3431,7 +3431,7 @@
           <!-- parameter of type 'int*' -->
           <parameter type-id='type-id-76'/>
           <!-- parameter of type 'typedef vtkIdType' -->
-          <parameter type-id='type-id-122'/>
+          <parameter type-id='type-id-121'/>
           <!-- parameter of type 'int' -->
           <parameter type-id='type-id-19'/>
           <!-- int -->
@@ -3448,7 +3448,7 @@
           <!-- parameter of type 'unsigned long int*' -->
           <parameter type-id='type-id-133'/>
           <!-- parameter of type 'typedef vtkIdType' -->
-          <parameter type-id='type-id-122'/>
+          <parameter type-id='type-id-121'/>
           <!-- parameter of type 'int' -->
           <parameter type-id='type-id-19'/>
           <!-- int -->
@@ -3465,7 +3465,7 @@
           <!-- parameter of type 'unsigned char*' -->
           <parameter type-id='type-id-58'/>
           <!-- parameter of type 'typedef vtkIdType' -->
-          <parameter type-id='type-id-122'/>
+          <parameter type-id='type-id-121'/>
           <!-- parameter of type 'int' -->
           <parameter type-id='type-id-19'/>
           <!-- int -->
@@ -3482,7 +3482,7 @@
           <!-- parameter of type 'char*' -->
           <parameter type-id='type-id-33'/>
           <!-- parameter of type 'typedef vtkIdType' -->
-          <parameter type-id='type-id-122'/>
+          <parameter type-id='type-id-121'/>
           <!-- parameter of type 'int' -->
           <parameter type-id='type-id-19'/>
           <!-- int -->
@@ -3499,7 +3499,7 @@
           <!-- parameter of type 'float*' -->
           <parameter type-id='type-id-75'/>
           <!-- parameter of type 'typedef vtkIdType' -->
-          <parameter type-id='type-id-122'/>
+          <parameter type-id='type-id-121'/>
           <!-- parameter of type 'int' -->
           <parameter type-id='type-id-19'/>
           <!-- int -->
@@ -3516,7 +3516,7 @@
           <!-- parameter of type 'double*' -->
           <parameter type-id='type-id-74'/>
           <!-- parameter of type 'typedef vtkIdType' -->
-          <parameter type-id='type-id-122'/>
+          <parameter type-id='type-id-121'/>
           <!-- parameter of type 'int' -->
           <parameter type-id='type-id-19'/>
           <!-- int -->
@@ -3533,7 +3533,7 @@
           <!-- parameter of type 'vtkIdType*' -->
           <parameter type-id='type-id-134'/>
           <!-- parameter of type 'typedef vtkIdType' -->
-          <parameter type-id='type-id-122'/>
+          <parameter type-id='type-id-121'/>
           <!-- parameter of type 'int' -->
           <parameter type-id='type-id-19'/>
           <!-- int -->
@@ -3569,7 +3569,7 @@
           <!-- parameter of type 'vtkIdType*' -->
           <parameter type-id='type-id-134'/>
           <!-- parameter of type 'typedef vtkIdType' -->
-          <parameter type-id='type-id-122'/>
+          <parameter type-id='type-id-121'/>
           <!-- parameter of type 'int' -->
           <parameter type-id='type-id-19'/>
           <!-- int -->
@@ -3590,7 +3590,7 @@
           <!-- parameter of type 'vtkIdType*' -->
           <parameter type-id='type-id-134'/>
           <!-- parameter of type 'typedef vtkIdType' -->
-          <parameter type-id='type-id-122'/>
+          <parameter type-id='type-id-121'/>
           <!-- parameter of type 'int' -->
           <parameter type-id='type-id-19'/>
           <!-- int -->
@@ -3611,7 +3611,7 @@
           <!-- parameter of type 'vtkIdType*' -->
           <parameter type-id='type-id-134'/>
           <!-- parameter of type 'typedef vtkIdType' -->
-          <parameter type-id='type-id-122'/>
+          <parameter type-id='type-id-121'/>
           <!-- parameter of type 'int' -->
           <parameter type-id='type-id-19'/>
           <!-- int -->
@@ -3632,7 +3632,7 @@
           <!-- parameter of type 'vtkIdType*' -->
           <parameter type-id='type-id-134'/>
           <!-- parameter of type 'typedef vtkIdType' -->
-          <parameter type-id='type-id-122'/>
+          <parameter type-id='type-id-121'/>
           <!-- parameter of type 'int' -->
           <parameter type-id='type-id-19'/>
           <!-- int -->
@@ -3653,7 +3653,7 @@
           <!-- parameter of type 'vtkIdType*' -->
           <parameter type-id='type-id-134'/>
           <!-- parameter of type 'typedef vtkIdType' -->
-          <parameter type-id='type-id-122'/>
+          <parameter type-id='type-id-121'/>
           <!-- parameter of type 'int' -->
           <parameter type-id='type-id-19'/>
           <!-- int -->
@@ -3674,7 +3674,7 @@
           <!-- parameter of type 'vtkIdType*' -->
           <parameter type-id='type-id-134'/>
           <!-- parameter of type 'typedef vtkIdType' -->
-          <parameter type-id='type-id-122'/>
+          <parameter type-id='type-id-121'/>
           <!-- parameter of type 'int' -->
           <parameter type-id='type-id-19'/>
           <!-- int -->
@@ -3695,7 +3695,7 @@
           <!-- parameter of type 'vtkIdType*' -->
           <parameter type-id='type-id-134'/>
           <!-- parameter of type 'typedef vtkIdType' -->
-          <parameter type-id='type-id-122'/>
+          <parameter type-id='type-id-121'/>
           <!-- parameter of type 'int' -->
           <parameter type-id='type-id-19'/>
           <!-- int -->
@@ -3712,7 +3712,7 @@
           <!-- parameter of type 'int*' -->
           <parameter type-id='type-id-76'/>
           <!-- parameter of type 'typedef vtkIdType' -->
-          <parameter type-id='type-id-122'/>
+          <parameter type-id='type-id-121'/>
           <!-- int -->
           <return type-id='type-id-19'/>
         </function-decl>
@@ -3727,7 +3727,7 @@
           <!-- parameter of type 'unsigned long int*' -->
           <parameter type-id='type-id-133'/>
           <!-- parameter of type 'typedef vtkIdType' -->
-          <parameter type-id='type-id-122'/>
+          <parameter type-id='type-id-121'/>
           <!-- int -->
           <return type-id='type-id-19'/>
         </function-decl>
@@ -3742,7 +3742,7 @@
           <!-- parameter of type 'unsigned char*' -->
           <parameter type-id='type-id-58'/>
           <!-- parameter of type 'typedef vtkIdType' -->
-          <parameter type-id='type-id-122'/>
+          <parameter type-id='type-id-121'/>
           <!-- int -->
           <return type-id='type-id-19'/>
         </function-decl>
@@ -3757,7 +3757,7 @@
           <!-- parameter of type 'char*' -->
           <parameter type-id='type-id-33'/>
           <!-- parameter of type 'typedef vtkIdType' -->
-          <parameter type-id='type-id-122'/>
+          <parameter type-id='type-id-121'/>
           <!-- int -->
           <return type-id='type-id-19'/>
         </function-decl>
@@ -3772,7 +3772,7 @@
           <!-- parameter of type 'float*' -->
           <parameter type-id='type-id-75'/>
           <!-- parameter of type 'typedef vtkIdType' -->
-          <parameter type-id='type-id-122'/>
+          <parameter type-id='type-id-121'/>
           <!-- int -->
           <return type-id='type-id-19'/>
         </function-decl>
@@ -3787,7 +3787,7 @@
           <!-- parameter of type 'double*' -->
           <parameter type-id='type-id-74'/>
           <!-- parameter of type 'typedef vtkIdType' -->
-          <parameter type-id='type-id-122'/>
+          <parameter type-id='type-id-121'/>
           <!-- int -->
           <return type-id='type-id-19'/>
         </function-decl>
@@ -3802,7 +3802,7 @@
           <!-- parameter of type 'vtkIdType*' -->
           <parameter type-id='type-id-134'/>
           <!-- parameter of type 'typedef vtkIdType' -->
-          <parameter type-id='type-id-122'/>
+          <parameter type-id='type-id-121'/>
           <!-- int -->
           <return type-id='type-id-19'/>
         </function-decl>
@@ -3830,7 +3830,7 @@
           <!-- parameter of type 'int*' -->
           <parameter type-id='type-id-76'/>
           <!-- parameter of type 'typedef vtkIdType' -->
-          <parameter type-id='type-id-122'/>
+          <parameter type-id='type-id-121'/>
           <!-- parameter of type 'vtkIdType*' -->
           <parameter type-id='type-id-134'/>
           <!-- parameter of type 'vtkIdType*' -->
@@ -3849,7 +3849,7 @@
           <!-- parameter of type 'unsigned long int*' -->
           <parameter type-id='type-id-133'/>
           <!-- parameter of type 'typedef vtkIdType' -->
-          <parameter type-id='type-id-122'/>
+          <parameter type-id='type-id-121'/>
           <!-- parameter of type 'vtkIdType*' -->
           <parameter type-id='type-id-134'/>
           <!-- parameter of type 'vtkIdType*' -->
@@ -3868,7 +3868,7 @@
           <!-- parameter of type 'unsigned char*' -->
           <parameter type-id='type-id-58'/>
           <!-- parameter of type 'typedef vtkIdType' -->
-          <parameter type-id='type-id-122'/>
+          <parameter type-id='type-id-121'/>
           <!-- parameter of type 'vtkIdType*' -->
           <parameter type-id='type-id-134'/>
           <!-- parameter of type 'vtkIdType*' -->
@@ -3887,7 +3887,7 @@
           <!-- parameter of type 'char*' -->
           <parameter type-id='type-id-33'/>
           <!-- parameter of type 'typedef vtkIdType' -->
-          <parameter type-id='type-id-122'/>
+          <parameter type-id='type-id-121'/>
           <!-- parameter of type 'vtkIdType*' -->
           <parameter type-id='type-id-134'/>
           <!-- parameter of type 'vtkIdType*' -->
@@ -3906,7 +3906,7 @@
           <!-- parameter of type 'float*' -->
           <parameter type-id='type-id-75'/>
           <!-- parameter of type 'typedef vtkIdType' -->
-          <parameter type-id='type-id-122'/>
+          <parameter type-id='type-id-121'/>
           <!-- parameter of type 'vtkIdType*' -->
           <parameter type-id='type-id-134'/>
           <!-- parameter of type 'vtkIdType*' -->
@@ -3925,7 +3925,7 @@
           <!-- parameter of type 'double*' -->
           <parameter type-id='type-id-74'/>
           <!-- parameter of type 'typedef vtkIdType' -->
-          <parameter type-id='type-id-122'/>
+          <parameter type-id='type-id-121'/>
           <!-- parameter of type 'vtkIdType*' -->
           <parameter type-id='type-id-134'/>
           <!-- parameter of type 'vtkIdType*' -->
@@ -3944,7 +3944,7 @@
           <!-- parameter of type 'vtkIdType*' -->
           <parameter type-id='type-id-134'/>
           <!-- parameter of type 'typedef vtkIdType' -->
-          <parameter type-id='type-id-122'/>
+          <parameter type-id='type-id-121'/>
           <!-- parameter of type 'vtkIdType*' -->
           <parameter type-id='type-id-134'/>
           <!-- parameter of type 'vtkIdType*' -->
@@ -3993,7 +3993,7 @@
           <!-- parameter of type 'int*' -->
           <parameter type-id='type-id-76'/>
           <!-- parameter of type 'typedef vtkIdType' -->
-          <parameter type-id='type-id-122'/>
+          <parameter type-id='type-id-121'/>
           <!-- parameter of type 'int' -->
           <parameter type-id='type-id-19'/>
           <!-- parameter of type 'int' -->
@@ -4012,7 +4012,7 @@
           <!-- parameter of type 'unsigned int*' -->
           <parameter type-id='type-id-77'/>
           <!-- parameter of type 'typedef vtkIdType' -->
-          <parameter type-id='type-id-122'/>
+          <parameter type-id='type-id-121'/>
           <!-- parameter of type 'int' -->
           <parameter type-id='type-id-19'/>
           <!-- parameter of type 'int' -->
@@ -4031,7 +4031,7 @@
           <!-- parameter of type 'unsigned long int*' -->
           <parameter type-id='type-id-133'/>
           <!-- parameter of type 'typedef vtkIdType' -->
-          <parameter type-id='type-id-122'/>
+          <parameter type-id='type-id-121'/>
           <!-- parameter of type 'int' -->
           <parameter type-id='type-id-19'/>
           <!-- parameter of type 'int' -->
@@ -4050,7 +4050,7 @@
           <!-- parameter of type 'unsigned char*' -->
           <parameter type-id='type-id-58'/>
           <!-- parameter of type 'typedef vtkIdType' -->
-          <parameter type-id='type-id-122'/>
+          <parameter type-id='type-id-121'/>
           <!-- parameter of type 'int' -->
           <parameter type-id='type-id-19'/>
           <!-- parameter of type 'int' -->
@@ -4069,7 +4069,7 @@
           <!-- parameter of type 'char*' -->
           <parameter type-id='type-id-33'/>
           <!-- parameter of type 'typedef vtkIdType' -->
-          <parameter type-id='type-id-122'/>
+          <parameter type-id='type-id-121'/>
           <!-- parameter of type 'int' -->
           <parameter type-id='type-id-19'/>
           <!-- parameter of type 'int' -->
@@ -4088,7 +4088,7 @@
           <!-- parameter of type 'float*' -->
           <parameter type-id='type-id-75'/>
           <!-- parameter of type 'typedef vtkIdType' -->
-          <parameter type-id='type-id-122'/>
+          <parameter type-id='type-id-121'/>
           <!-- parameter of type 'int' -->
           <parameter type-id='type-id-19'/>
           <!-- parameter of type 'int' -->
@@ -4107,7 +4107,7 @@
           <!-- parameter of type 'double*' -->
           <parameter type-id='type-id-74'/>
           <!-- parameter of type 'typedef vtkIdType' -->
-          <parameter type-id='type-id-122'/>
+          <parameter type-id='type-id-121'/>
           <!-- parameter of type 'int' -->
           <parameter type-id='type-id-19'/>
           <!-- parameter of type 'int' -->
@@ -4126,7 +4126,7 @@
           <!-- parameter of type 'vtkIdType*' -->
           <parameter type-id='type-id-134'/>
           <!-- parameter of type 'typedef vtkIdType' -->
-          <parameter type-id='type-id-122'/>
+          <parameter type-id='type-id-121'/>
           <!-- parameter of type 'int' -->
           <parameter type-id='type-id-19'/>
           <!-- parameter of type 'int' -->
@@ -4162,9 +4162,9 @@
           <!-- parameter of type 'int*' -->
           <parameter type-id='type-id-76'/>
           <!-- parameter of type 'typedef vtkIdType' -->
-          <parameter type-id='type-id-122'/>
-          <!-- parameter of type 'vtkCommunicator::Operation*' -->
           <parameter type-id='type-id-121'/>
+          <!-- parameter of type 'vtkCommunicator::Operation*' -->
+          <parameter type-id='type-id-120'/>
           <!-- parameter of type 'int' -->
           <parameter type-id='type-id-19'/>
           <!-- int -->
@@ -4181,9 +4181,9 @@
           <!-- parameter of type 'unsigned long int*' -->
           <parameter type-id='type-id-133'/>
           <!-- parameter of type 'typedef vtkIdType' -->
-          <parameter type-id='type-id-122'/>
-          <!-- parameter of type 'vtkCommunicator::Operation*' -->
           <parameter type-id='type-id-121'/>
+          <!-- parameter of type 'vtkCommunicator::Operation*' -->
+          <parameter type-id='type-id-120'/>
           <!-- parameter of type 'int' -->
           <parameter type-id='type-id-19'/>
           <!-- int -->
@@ -4200,9 +4200,9 @@
           <!-- parameter of type 'unsigned char*' -->
           <parameter type-id='type-id-58'/>
           <!-- parameter of type 'typedef vtkIdType' -->
-          <parameter type-id='type-id-122'/>
-          <!-- parameter of type 'vtkCommunicator::Operation*' -->
           <parameter type-id='type-id-121'/>
+          <!-- parameter of type 'vtkCommunicator::Operation*' -->
+          <parameter type-id='type-id-120'/>
           <!-- parameter of type 'int' -->
           <parameter type-id='type-id-19'/>
           <!-- int -->
@@ -4219,9 +4219,9 @@
           <!-- parameter of type 'char*' -->
           <parameter type-id='type-id-33'/>
           <!-- parameter of type 'typedef vtkIdType' -->
-          <parameter type-id='type-id-122'/>
-          <!-- parameter of type 'vtkCommunicator::Operation*' -->
           <parameter type-id='type-id-121'/>
+          <!-- parameter of type 'vtkCommunicator::Operation*' -->
+          <parameter type-id='type-id-120'/>
           <!-- parameter of type 'int' -->
           <parameter type-id='type-id-19'/>
           <!-- int -->
@@ -4238,9 +4238,9 @@
           <!-- parameter of type 'float*' -->
           <parameter type-id='type-id-75'/>
           <!-- parameter of type 'typedef vtkIdType' -->
-          <parameter type-id='type-id-122'/>
-          <!-- parameter of type 'vtkCommunicator::Operation*' -->
           <parameter type-id='type-id-121'/>
+          <!-- parameter of type 'vtkCommunicator::Operation*' -->
+          <parameter type-id='type-id-120'/>
           <!-- parameter of type 'int' -->
           <parameter type-id='type-id-19'/>
           <!-- int -->
@@ -4257,9 +4257,9 @@
           <!-- parameter of type 'double*' -->
           <parameter type-id='type-id-74'/>
           <!-- parameter of type 'typedef vtkIdType' -->
-          <parameter type-id='type-id-122'/>
-          <!-- parameter of type 'vtkCommunicator::Operation*' -->
           <parameter type-id='type-id-121'/>
+          <!-- parameter of type 'vtkCommunicator::Operation*' -->
+          <parameter type-id='type-id-120'/>
           <!-- parameter of type 'int' -->
           <parameter type-id='type-id-19'/>
           <!-- int -->
@@ -4276,9 +4276,9 @@
           <!-- parameter of type 'vtkIdType*' -->
           <parameter type-id='type-id-134'/>
           <!-- parameter of type 'typedef vtkIdType' -->
-          <parameter type-id='type-id-122'/>
-          <!-- parameter of type 'vtkCommunicator::Operation*' -->
           <parameter type-id='type-id-121'/>
+          <!-- parameter of type 'vtkCommunicator::Operation*' -->
+          <parameter type-id='type-id-120'/>
           <!-- parameter of type 'int' -->
           <parameter type-id='type-id-19'/>
           <!-- int -->
@@ -4295,7 +4295,7 @@
           <!-- parameter of type 'vtkDataArray*' -->
           <parameter type-id='type-id-127'/>
           <!-- parameter of type 'vtkCommunicator::Operation*' -->
-          <parameter type-id='type-id-121'/>
+          <parameter type-id='type-id-120'/>
           <!-- parameter of type 'int' -->
           <parameter type-id='type-id-19'/>
           <!-- int -->
@@ -4312,7 +4312,7 @@
           <!-- parameter of type 'int*' -->
           <parameter type-id='type-id-76'/>
           <!-- parameter of type 'typedef vtkIdType' -->
-          <parameter type-id='type-id-122'/>
+          <parameter type-id='type-id-121'/>
           <!-- parameter of type 'int' -->
           <parameter type-id='type-id-19'/>
           <!-- int -->
@@ -4329,7 +4329,7 @@
           <!-- parameter of type 'unsigned long int*' -->
           <parameter type-id='type-id-133'/>
           <!-- parameter of type 'typedef vtkIdType' -->
-          <parameter type-id='type-id-122'/>
+          <parameter type-id='type-id-121'/>
           <!-- parameter of type 'int' -->
           <parameter type-id='type-id-19'/>
           <!-- int -->
@@ -4346,7 +4346,7 @@
           <!-- parameter of type 'unsigned char*' -->
           <parameter type-id='type-id-58'/>
           <!-- parameter of type 'typedef vtkIdType' -->
-          <parameter type-id='type-id-122'/>
+          <parameter type-id='type-id-121'/>
           <!-- parameter of type 'int' -->
           <parameter type-id='type-id-19'/>
           <!-- int -->
@@ -4363,7 +4363,7 @@
           <!-- parameter of type 'char*' -->
           <parameter type-id='type-id-33'/>
           <!-- parameter of type 'typedef vtkIdType' -->
-          <parameter type-id='type-id-122'/>
+          <parameter type-id='type-id-121'/>
           <!-- parameter of type 'int' -->
           <parameter type-id='type-id-19'/>
           <!-- int -->
@@ -4380,7 +4380,7 @@
           <!-- parameter of type 'float*' -->
           <parameter type-id='type-id-75'/>
           <!-- parameter of type 'typedef vtkIdType' -->
-          <parameter type-id='type-id-122'/>
+          <parameter type-id='type-id-121'/>
           <!-- parameter of type 'int' -->
           <parameter type-id='type-id-19'/>
           <!-- int -->
@@ -4397,7 +4397,7 @@
           <!-- parameter of type 'double*' -->
           <parameter type-id='type-id-74'/>
           <!-- parameter of type 'typedef vtkIdType' -->
-          <parameter type-id='type-id-122'/>
+          <parameter type-id='type-id-121'/>
           <!-- parameter of type 'int' -->
           <parameter type-id='type-id-19'/>
           <!-- int -->
@@ -4414,7 +4414,7 @@
           <!-- parameter of type 'vtkIdType*' -->
           <parameter type-id='type-id-134'/>
           <!-- parameter of type 'typedef vtkIdType' -->
-          <parameter type-id='type-id-122'/>
+          <parameter type-id='type-id-121'/>
           <!-- parameter of type 'int' -->
           <parameter type-id='type-id-19'/>
           <!-- int -->
@@ -4446,9 +4446,9 @@
           <!-- parameter of type 'int*' -->
           <parameter type-id='type-id-76'/>
           <!-- parameter of type 'typedef vtkIdType' -->
-          <parameter type-id='type-id-122'/>
-          <!-- parameter of type 'vtkCommunicator::Operation*' -->
           <parameter type-id='type-id-121'/>
+          <!-- parameter of type 'vtkCommunicator::Operation*' -->
+          <parameter type-id='type-id-120'/>
           <!-- int -->
           <return type-id='type-id-19'/>
         </function-decl>
@@ -4463,9 +4463,9 @@
           <!-- parameter of type 'unsigned long int*' -->
           <parameter type-id='type-id-133'/>
           <!-- parameter of type 'typedef vtkIdType' -->
-          <parameter type-id='type-id-122'/>
-          <!-- parameter of type 'vtkCommunicator::Operation*' -->
           <parameter type-id='type-id-121'/>
+          <!-- parameter of type 'vtkCommunicator::Operation*' -->
+          <parameter type-id='type-id-120'/>
           <!-- int -->
           <return type-id='type-id-19'/>
         </function-decl>
@@ -4480,9 +4480,9 @@
           <!-- parameter of type 'unsigned char*' -->
           <parameter type-id='type-id-58'/>
           <!-- parameter of type 'typedef vtkIdType' -->
-          <parameter type-id='type-id-122'/>
-          <!-- parameter of type 'vtkCommunicator::Operation*' -->
           <parameter type-id='type-id-121'/>
+          <!-- parameter of type 'vtkCommunicator::Operation*' -->
+          <parameter type-id='type-id-120'/>
           <!-- int -->
           <return type-id='type-id-19'/>
         </function-decl>
@@ -4497,9 +4497,9 @@
           <!-- parameter of type 'char*' -->
           <parameter type-id='type-id-33'/>
           <!-- parameter of type 'typedef vtkIdType' -->
-          <parameter type-id='type-id-122'/>
-          <!-- parameter of type 'vtkCommunicator::Operation*' -->
           <parameter type-id='type-id-121'/>
+          <!-- parameter of type 'vtkCommunicator::Operation*' -->
+          <parameter type-id='type-id-120'/>
           <!-- int -->
           <return type-id='type-id-19'/>
         </function-decl>
@@ -4514,9 +4514,9 @@
           <!-- parameter of type 'float*' -->
           <parameter type-id='type-id-75'/>
           <!-- parameter of type 'typedef vtkIdType' -->
-          <parameter type-id='type-id-122'/>
-          <!-- parameter of type 'vtkCommunicator::Operation*' -->
           <parameter type-id='type-id-121'/>
+          <!-- parameter of type 'vtkCommunicator::Operation*' -->
+          <parameter type-id='type-id-120'/>
           <!-- int -->
           <return type-id='type-id-19'/>
         </function-decl>
@@ -4531,9 +4531,9 @@
           <!-- parameter of type 'double*' -->
           <parameter type-id='type-id-74'/>
           <!-- parameter of type 'typedef vtkIdType' -->
-          <parameter type-id='type-id-122'/>
-          <!-- parameter of type 'vtkCommunicator::Operation*' -->
           <parameter type-id='type-id-121'/>
+          <!-- parameter of type 'vtkCommunicator::Operation*' -->
+          <parameter type-id='type-id-120'/>
           <!-- int -->
           <return type-id='type-id-19'/>
         </function-decl>
@@ -4548,9 +4548,9 @@
           <!-- parameter of type 'vtkIdType*' -->
           <parameter type-id='type-id-134'/>
           <!-- parameter of type 'typedef vtkIdType' -->
-          <parameter type-id='type-id-122'/>
-          <!-- parameter of type 'vtkCommunicator::Operation*' -->
           <parameter type-id='type-id-121'/>
+          <!-- parameter of type 'vtkCommunicator::Operation*' -->
+          <parameter type-id='type-id-120'/>
           <!-- int -->
           <return type-id='type-id-19'/>
         </function-decl>
@@ -4565,7 +4565,7 @@
           <!-- parameter of type 'vtkDataArray*' -->
           <parameter type-id='type-id-127'/>
           <!-- parameter of type 'vtkCommunicator::Operation*' -->
-          <parameter type-id='type-id-121'/>
+          <parameter type-id='type-id-120'/>
           <!-- int -->
           <return type-id='type-id-19'/>
         </function-decl>
@@ -4824,7 +4824,7 @@
           <!-- parameter of type 'void*' -->
           <parameter type-id='type-id-14'/>
           <!-- parameter of type 'typedef vtkIdType' -->
-          <parameter type-id='type-id-122'/>
+          <parameter type-id='type-id-121'/>
           <!-- parameter of type 'int' -->
           <parameter type-id='type-id-19'/>
           <!-- parameter of type 'int' -->
@@ -4843,7 +4843,7 @@
           <!-- parameter of type 'void*' -->
           <parameter type-id='type-id-14'/>
           <!-- parameter of type 'typedef vtkIdType' -->
-          <parameter type-id='type-id-122'/>
+          <parameter type-id='type-id-121'/>
           <!-- parameter of type 'int' -->
           <parameter type-id='type-id-19'/>
           <!-- parameter of type 'int' -->
@@ -4860,7 +4860,7 @@
           <!-- implicit parameter of type 'vtkCommunicator*' -->
           <parameter type-id='type-id-124' is-artificial='yes'/>
           <!-- typedef vtkIdType -->
-          <return type-id='type-id-122'/>
+          <return type-id='type-id-121'/>
         </function-decl>
       </member-function>
       <member-function access='private' vtable-offset='26'>
@@ -4880,7 +4880,7 @@
           <!-- parameter of type 'void*' -->
           <parameter type-id='type-id-14'/>
           <!-- parameter of type 'typedef vtkIdType' -->
-          <parameter type-id='type-id-122'/>
+          <parameter type-id='type-id-121'/>
           <!-- parameter of type 'int' -->
           <parameter type-id='type-id-19'/>
           <!-- parameter of type 'int' -->
@@ -4899,7 +4899,7 @@
           <!-- parameter of type 'void*' -->
           <parameter type-id='type-id-14'/>
           <!-- parameter of type 'typedef vtkIdType' -->
-          <parameter type-id='type-id-122'/>
+          <parameter type-id='type-id-121'/>
           <!-- parameter of type 'int' -->
           <parameter type-id='type-id-19'/>
           <!-- parameter of type 'int' -->
@@ -4918,7 +4918,7 @@
           <!-- parameter of type 'void*' -->
           <parameter type-id='type-id-14'/>
           <!-- parameter of type 'typedef vtkIdType' -->
-          <parameter type-id='type-id-122'/>
+          <parameter type-id='type-id-121'/>
           <!-- parameter of type 'vtkIdType*' -->
           <parameter type-id='type-id-134'/>
           <!-- parameter of type 'vtkIdType*' -->
@@ -4941,7 +4941,7 @@
           <!-- parameter of type 'void*' -->
           <parameter type-id='type-id-14'/>
           <!-- parameter of type 'typedef vtkIdType' -->
-          <parameter type-id='type-id-122'/>
+          <parameter type-id='type-id-121'/>
           <!-- parameter of type 'int' -->
           <parameter type-id='type-id-19'/>
           <!-- parameter of type 'int' -->
@@ -4964,7 +4964,7 @@
           <!-- parameter of type 'vtkIdType*' -->
           <parameter type-id='type-id-134'/>
           <!-- parameter of type 'typedef vtkIdType' -->
-          <parameter type-id='type-id-122'/>
+          <parameter type-id='type-id-121'/>
           <!-- parameter of type 'int' -->
           <parameter type-id='type-id-19'/>
           <!-- parameter of type 'int' -->
@@ -4983,7 +4983,7 @@
           <!-- parameter of type 'void*' -->
           <parameter type-id='type-id-14'/>
           <!-- parameter of type 'typedef vtkIdType' -->
-          <parameter type-id='type-id-122'/>
+          <parameter type-id='type-id-121'/>
           <!-- parameter of type 'int' -->
           <parameter type-id='type-id-19'/>
           <!-- int -->
@@ -5000,7 +5000,7 @@
           <!-- parameter of type 'void*' -->
           <parameter type-id='type-id-14'/>
           <!-- parameter of type 'typedef vtkIdType' -->
-          <parameter type-id='type-id-122'/>
+          <parameter type-id='type-id-121'/>
           <!-- parameter of type 'vtkIdType*' -->
           <parameter type-id='type-id-134'/>
           <!-- parameter of type 'vtkIdType*' -->
@@ -5021,7 +5021,7 @@
           <!-- parameter of type 'void*' -->
           <parameter type-id='type-id-14'/>
           <!-- parameter of type 'typedef vtkIdType' -->
-          <parameter type-id='type-id-122'/>
+          <parameter type-id='type-id-121'/>
           <!-- parameter of type 'int' -->
           <parameter type-id='type-id-19'/>
           <!-- parameter of type 'int' -->
@@ -5042,11 +5042,11 @@
           <!-- parameter of type 'void*' -->
           <parameter type-id='type-id-14'/>
           <!-- parameter of type 'typedef vtkIdType' -->
-          <parameter type-id='type-id-122'/>
+          <parameter type-id='type-id-121'/>
           <!-- parameter of type 'int' -->
           <parameter type-id='type-id-19'/>
           <!-- parameter of type 'vtkCommunicator::Operation*' -->
-          <parameter type-id='type-id-121'/>
+          <parameter type-id='type-id-120'/>
           <!-- parameter of type 'int' -->
           <parameter type-id='type-id-19'/>
           <!-- int -->
@@ -5063,7 +5063,7 @@
           <!-- parameter of type 'void*' -->
           <parameter type-id='type-id-14'/>
           <!-- parameter of type 'typedef vtkIdType' -->
-          <parameter type-id='type-id-122'/>
+          <parameter type-id='type-id-121'/>
           <!-- parameter of type 'int' -->
           <parameter type-id='type-id-19'/>
           <!-- parameter of type 'int' -->
@@ -5082,11 +5082,11 @@
           <!-- parameter of type 'void*' -->
           <parameter type-id='type-id-14'/>
           <!-- parameter of type 'typedef vtkIdType' -->
-          <parameter type-id='type-id-122'/>
+          <parameter type-id='type-id-121'/>
           <!-- parameter of type 'int' -->
           <parameter type-id='type-id-19'/>
           <!-- parameter of type 'vtkCommunicator::Operation*' -->
-          <parameter type-id='type-id-121'/>
+          <parameter type-id='type-id-120'/>
           <!-- int -->
           <return type-id='type-id-19'/>
         </function-decl>
@@ -5118,7 +5118,7 @@
       </member-function>
     </class-decl>
     <!-- typedef long long int vtkIdType -->
-    <typedef-decl name='vtkIdType' type-id='type-id-22' filepath='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Common/Core/vtkType.h' line='255' column='1' id='type-id-122'/>
+    <typedef-decl name='vtkIdType' type-id='type-id-22' filepath='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Common/Core/vtkType.h' line='255' column='1' id='type-id-121'/>
     <!-- typedef long long int vtkTypeInt64 -->
     <typedef-decl name='vtkTypeInt64' type-id='type-id-22' filepath='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Common/Core/vtkType.h' line='212' column='1' id='type-id-62'/>
     <!-- typedef long long unsigned int vtkTypeUInt64 -->
@@ -5143,7 +5143,7 @@
     <!-- class vtkCommunicatorMaxClass -->
     <class-decl name='vtkCommunicatorMaxClass' size-in-bits='64' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Parallel/Core/vtkCommunicator.cxx' line='85' column='1' id='type-id-140'>
       <!-- class vtkCommunicator::Operation -->
-      <base-class access='public' layout-offset-in-bits='0' type-id='type-id-120'/>
+      <base-class access='public' layout-offset-in-bits='0' type-id='type-id-119'/>
       <member-function access='private' vtable-offset='0'>
         <!-- void vtkCommunicatorMaxClass::Function(void*, void*, vtkIdType, int) -->
         <function-decl name='Function' mangled-name='_ZN23vtkCommunicatorMaxClass8FunctionEPKvPvxi' filepath='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Parallel/Core/vtkCommunicator.cxx' line='85' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -5154,7 +5154,7 @@
           <!-- parameter of type 'void*' -->
           <parameter type-id='type-id-14'/>
           <!-- parameter of type 'typedef vtkIdType' -->
-          <parameter type-id='type-id-122'/>
+          <parameter type-id='type-id-121'/>
           <!-- parameter of type 'int' -->
           <parameter type-id='type-id-19'/>
           <!-- void -->
@@ -5174,7 +5174,7 @@
     <!-- class vtkCommunicatorMinClass -->
     <class-decl name='vtkCommunicatorMinClass' size-in-bits='64' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Parallel/Core/vtkCommunicator.cxx' line='86' column='1' id='type-id-142'>
       <!-- class vtkCommunicator::Operation -->
-      <base-class access='public' layout-offset-in-bits='0' type-id='type-id-120'/>
+      <base-class access='public' layout-offset-in-bits='0' type-id='type-id-119'/>
       <member-function access='private' vtable-offset='0'>
         <!-- void vtkCommunicatorMinClass::Function(void*, void*, vtkIdType, int) -->
         <function-decl name='Function' mangled-name='_ZN23vtkCommunicatorMinClass8FunctionEPKvPvxi' filepath='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Parallel/Core/vtkCommunicator.cxx' line='86' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -5185,7 +5185,7 @@
           <!-- parameter of type 'void*' -->
           <parameter type-id='type-id-14'/>
           <!-- parameter of type 'typedef vtkIdType' -->
-          <parameter type-id='type-id-122'/>
+          <parameter type-id='type-id-121'/>
           <!-- parameter of type 'int' -->
           <parameter type-id='type-id-19'/>
           <!-- void -->
@@ -5205,7 +5205,7 @@
     <!-- class vtkCommunicatorSumClass -->
     <class-decl name='vtkCommunicatorSumClass' size-in-bits='64' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Parallel/Core/vtkCommunicator.cxx' line='87' column='1' id='type-id-144'>
       <!-- class vtkCommunicator::Operation -->
-      <base-class access='public' layout-offset-in-bits='0' type-id='type-id-120'/>
+      <base-class access='public' layout-offset-in-bits='0' type-id='type-id-119'/>
       <member-function access='private' vtable-offset='0'>
         <!-- void vtkCommunicatorSumClass::Function(void*, void*, vtkIdType, int) -->
         <function-decl name='Function' mangled-name='_ZN23vtkCommunicatorSumClass8FunctionEPKvPvxi' filepath='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Parallel/Core/vtkCommunicator.cxx' line='87' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -5216,7 +5216,7 @@
           <!-- parameter of type 'void*' -->
           <parameter type-id='type-id-14'/>
           <!-- parameter of type 'typedef vtkIdType' -->
-          <parameter type-id='type-id-122'/>
+          <parameter type-id='type-id-121'/>
           <!-- parameter of type 'int' -->
           <parameter type-id='type-id-19'/>
           <!-- void -->
@@ -5236,7 +5236,7 @@
     <!-- class vtkCommunicatorProductClass -->
     <class-decl name='vtkCommunicatorProductClass' size-in-bits='64' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Parallel/Core/vtkCommunicator.cxx' line='88' column='1' id='type-id-146'>
       <!-- class vtkCommunicator::Operation -->
-      <base-class access='public' layout-offset-in-bits='0' type-id='type-id-120'/>
+      <base-class access='public' layout-offset-in-bits='0' type-id='type-id-119'/>
       <member-function access='private' vtable-offset='0'>
         <!-- void vtkCommunicatorProductClass::Function(void*, void*, vtkIdType, int) -->
         <function-decl name='Function' mangled-name='_ZN27vtkCommunicatorProductClass8FunctionEPKvPvxi' filepath='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Parallel/Core/vtkCommunicator.cxx' line='88' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -5247,7 +5247,7 @@
           <!-- parameter of type 'void*' -->
           <parameter type-id='type-id-14'/>
           <!-- parameter of type 'typedef vtkIdType' -->
-          <parameter type-id='type-id-122'/>
+          <parameter type-id='type-id-121'/>
           <!-- parameter of type 'int' -->
           <parameter type-id='type-id-19'/>
           <!-- void -->
@@ -5267,7 +5267,7 @@
     <!-- class vtkCommunicatorLogicalAndClass -->
     <class-decl name='vtkCommunicatorLogicalAndClass' size-in-bits='64' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Parallel/Core/vtkCommunicator.cxx' line='90' column='1' id='type-id-148'>
       <!-- class vtkCommunicator::Operation -->
-      <base-class access='public' layout-offset-in-bits='0' type-id='type-id-120'/>
+      <base-class access='public' layout-offset-in-bits='0' type-id='type-id-119'/>
       <member-function access='private' vtable-offset='0'>
         <!-- void vtkCommunicatorLogicalAndClass::Function(void*, void*, vtkIdType, int) -->
         <function-decl name='Function' mangled-name='_ZN30vtkCommunicatorLogicalAndClass8FunctionEPKvPvxi' filepath='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Parallel/Core/vtkCommunicator.cxx' line='90' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -5278,7 +5278,7 @@
           <!-- parameter of type 'void*' -->
           <parameter type-id='type-id-14'/>
           <!-- parameter of type 'typedef vtkIdType' -->
-          <parameter type-id='type-id-122'/>
+          <parameter type-id='type-id-121'/>
           <!-- parameter of type 'int' -->
           <parameter type-id='type-id-19'/>
           <!-- void -->
@@ -5298,7 +5298,7 @@
     <!-- class vtkCommunicatorBitwiseAndClass -->
     <class-decl name='vtkCommunicatorBitwiseAndClass' size-in-bits='64' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Parallel/Core/vtkCommunicator.cxx' line='92' column='1' id='type-id-150'>
       <!-- class vtkCommunicator::Operation -->
-      <base-class access='public' layout-offset-in-bits='0' type-id='type-id-120'/>
+      <base-class access='public' layout-offset-in-bits='0' type-id='type-id-119'/>
       <member-function access='private' vtable-offset='0'>
         <!-- void vtkCommunicatorBitwiseAndClass::Function(void*, void*, vtkIdType, int) -->
         <function-decl name='Function' mangled-name='_ZN30vtkCommunicatorBitwiseAndClass8FunctionEPKvPvxi' filepath='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Parallel/Core/vtkCommunicator.cxx' line='92' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -5309,7 +5309,7 @@
           <!-- parameter of type 'void*' -->
           <parameter type-id='type-id-14'/>
           <!-- parameter of type 'typedef vtkIdType' -->
-          <parameter type-id='type-id-122'/>
+          <parameter type-id='type-id-121'/>
           <!-- parameter of type 'int' -->
           <parameter type-id='type-id-19'/>
           <!-- void -->
@@ -5329,7 +5329,7 @@
     <!-- class vtkCommunicatorLogicalOrClass -->
     <class-decl name='vtkCommunicatorLogicalOrClass' size-in-bits='64' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Parallel/Core/vtkCommunicator.cxx' line='94' column='1' id='type-id-152'>
       <!-- class vtkCommunicator::Operation -->
-      <base-class access='public' layout-offset-in-bits='0' type-id='type-id-120'/>
+      <base-class access='public' layout-offset-in-bits='0' type-id='type-id-119'/>
       <member-function access='private' vtable-offset='0'>
         <!-- void vtkCommunicatorLogicalOrClass::Function(void*, void*, vtkIdType, int) -->
         <function-decl name='Function' mangled-name='_ZN29vtkCommunicatorLogicalOrClass8FunctionEPKvPvxi' filepath='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Parallel/Core/vtkCommunicator.cxx' line='94' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -5340,7 +5340,7 @@
           <!-- parameter of type 'void*' -->
           <parameter type-id='type-id-14'/>
           <!-- parameter of type 'typedef vtkIdType' -->
-          <parameter type-id='type-id-122'/>
+          <parameter type-id='type-id-121'/>
           <!-- parameter of type 'int' -->
           <parameter type-id='type-id-19'/>
           <!-- void -->
@@ -5360,7 +5360,7 @@
     <!-- class vtkCommunicatorBitwiseOrClass -->
     <class-decl name='vtkCommunicatorBitwiseOrClass' size-in-bits='64' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Parallel/Core/vtkCommunicator.cxx' line='96' column='1' id='type-id-154'>
       <!-- class vtkCommunicator::Operation -->
-      <base-class access='public' layout-offset-in-bits='0' type-id='type-id-120'/>
+      <base-class access='public' layout-offset-in-bits='0' type-id='type-id-119'/>
       <member-function access='private' vtable-offset='0'>
         <!-- void vtkCommunicatorBitwiseOrClass::Function(void*, void*, vtkIdType, int) -->
         <function-decl name='Function' mangled-name='_ZN29vtkCommunicatorBitwiseOrClass8FunctionEPKvPvxi' filepath='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Parallel/Core/vtkCommunicator.cxx' line='96' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -5371,7 +5371,7 @@
           <!-- parameter of type 'void*' -->
           <parameter type-id='type-id-14'/>
           <!-- parameter of type 'typedef vtkIdType' -->
-          <parameter type-id='type-id-122'/>
+          <parameter type-id='type-id-121'/>
           <!-- parameter of type 'int' -->
           <parameter type-id='type-id-19'/>
           <!-- void -->
@@ -5391,7 +5391,7 @@
     <!-- class vtkCommunicatorLogicalXorClass -->
     <class-decl name='vtkCommunicatorLogicalXorClass' size-in-bits='64' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Parallel/Core/vtkCommunicator.cxx' line='98' column='1' id='type-id-156'>
       <!-- class vtkCommunicator::Operation -->
-      <base-class access='public' layout-offset-in-bits='0' type-id='type-id-120'/>
+      <base-class access='public' layout-offset-in-bits='0' type-id='type-id-119'/>
       <member-function access='private' vtable-offset='0'>
         <!-- void vtkCommunicatorLogicalXorClass::Function(void*, void*, vtkIdType, int) -->
         <function-decl name='Function' mangled-name='_ZN30vtkCommunicatorLogicalXorClass8FunctionEPKvPvxi' filepath='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Parallel/Core/vtkCommunicator.cxx' line='98' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -5402,7 +5402,7 @@
           <!-- parameter of type 'void*' -->
           <parameter type-id='type-id-14'/>
           <!-- parameter of type 'typedef vtkIdType' -->
-          <parameter type-id='type-id-122'/>
+          <parameter type-id='type-id-121'/>
           <!-- parameter of type 'int' -->
           <parameter type-id='type-id-19'/>
           <!-- void -->
@@ -5422,7 +5422,7 @@
     <!-- class vtkCommunicatorBitwiseXorClass -->
     <class-decl name='vtkCommunicatorBitwiseXorClass' size-in-bits='64' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Parallel/Core/vtkCommunicator.cxx' line='100' column='1' id='type-id-158'>
       <!-- class vtkCommunicator::Operation -->
-      <base-class access='public' layout-offset-in-bits='0' type-id='type-id-120'/>
+      <base-class access='public' layout-offset-in-bits='0' type-id='type-id-119'/>
       <member-function access='private' vtable-offset='0'>
         <!-- void vtkCommunicatorBitwiseXorClass::Function(void*, void*, vtkIdType, int) -->
         <function-decl name='Function' mangled-name='_ZN30vtkCommunicatorBitwiseXorClass8FunctionEPKvPvxi' filepath='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Parallel/Core/vtkCommunicator.cxx' line='100' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -5433,7 +5433,7 @@
           <!-- parameter of type 'void*' -->
           <parameter type-id='type-id-14'/>
           <!-- parameter of type 'typedef vtkIdType' -->
-          <parameter type-id='type-id-122'/>
+          <parameter type-id='type-id-121'/>
           <!-- parameter of type 'int' -->
           <parameter type-id='type-id-19'/>
           <!-- void -->
@@ -6431,7 +6431,7 @@
     <!-- const vtkDataObject* -->
     <pointer-type-def type-id='type-id-298' size-in-bits='64' id='type-id-299'/>
     <!-- const vtkIdType -->
-    <qualified-type-def type-id='type-id-122' const='yes' id='type-id-300'/>
+    <qualified-type-def type-id='type-id-121' const='yes' id='type-id-300'/>
     <!-- const vtkIdType* -->
     <pointer-type-def type-id='type-id-300' size-in-bits='64' id='type-id-132'/>
     <!-- const vtkMultiProcessStream -->
@@ -6609,7 +6609,7 @@
     <!-- vtkCommunicator* -->
     <pointer-type-def type-id='type-id-116' size-in-bits='64' id='type-id-124'/>
     <!-- vtkCommunicator::Operation* -->
-    <pointer-type-def type-id='type-id-120' size-in-bits='64' id='type-id-121'/>
+    <pointer-type-def type-id='type-id-119' size-in-bits='64' id='type-id-120'/>
     <!-- vtkCommunicatorBitwiseAndClass* -->
     <pointer-type-def type-id='type-id-150' size-in-bits='64' id='type-id-151'/>
     <!-- vtkCommunicatorBitwiseOrClass* -->
@@ -6653,7 +6653,7 @@
     <!-- vtkGenericDataObjectWriter* -->
     <pointer-type-def type-id='type-id-379' size-in-bits='64' id='type-id-175'/>
     <!-- vtkIdType* -->
-    <pointer-type-def type-id='type-id-122' size-in-bits='64' id='type-id-134'/>
+    <pointer-type-def type-id='type-id-121' size-in-bits='64' id='type-id-134'/>
     <!-- vtkImageData* -->
     <pointer-type-def type-id='type-id-380' size-in-bits='64' id='type-id-381'/>
     <!-- vtkIndent* -->
@@ -13604,7 +13604,7 @@
           <!-- implicit parameter of type 'vtkAbstractArray*' -->
           <parameter type-id='type-id-368' is-artificial='yes'/>
           <!-- typedef vtkIdType -->
-          <return type-id='type-id-122'/>
+          <return type-id='type-id-121'/>
         </function-decl>
       </member-function>
     </class-decl>
@@ -13895,7 +13895,7 @@
           <!-- parameter of type 'void*' -->
           <parameter type-id='type-id-14'/>
           <!-- parameter of type 'typedef vtkIdType' -->
-          <parameter type-id='type-id-122'/>
+          <parameter type-id='type-id-121'/>
           <!-- parameter of type 'int' -->
           <parameter type-id='type-id-19'/>
           <!-- parameter of type 'int' -->
@@ -13914,7 +13914,7 @@
           <!-- parameter of type 'void*' -->
           <parameter type-id='type-id-14'/>
           <!-- parameter of type 'typedef vtkIdType' -->
-          <parameter type-id='type-id-122'/>
+          <parameter type-id='type-id-121'/>
           <!-- parameter of type 'int' -->
           <parameter type-id='type-id-19'/>
           <!-- parameter of type 'int' -->
@@ -14305,7 +14305,7 @@
           <!-- parameter of type 'const int*' -->
           <parameter type-id='type-id-128'/>
           <!-- parameter of type 'typedef vtkIdType' -->
-          <parameter type-id='type-id-122'/>
+          <parameter type-id='type-id-121'/>
           <!-- parameter of type 'int' -->
           <parameter type-id='type-id-19'/>
           <!-- parameter of type 'int' -->
@@ -14322,7 +14322,7 @@
           <!-- parameter of type 'const unsigned int*' -->
           <parameter type-id='type-id-129'/>
           <!-- parameter of type 'typedef vtkIdType' -->
-          <parameter type-id='type-id-122'/>
+          <parameter type-id='type-id-121'/>
           <!-- parameter of type 'int' -->
           <parameter type-id='type-id-19'/>
           <!-- parameter of type 'int' -->
@@ -14339,7 +14339,7 @@
           <!-- parameter of type 'const unsigned long int*' -->
           <parameter type-id='type-id-130'/>
           <!-- parameter of type 'typedef vtkIdType' -->
-          <parameter type-id='type-id-122'/>
+          <parameter type-id='type-id-121'/>
           <!-- parameter of type 'int' -->
           <parameter type-id='type-id-19'/>
           <!-- parameter of type 'int' -->
@@ -14356,7 +14356,7 @@
           <!-- parameter of type 'const char*' -->
           <parameter type-id='type-id-98'/>
           <!-- parameter of type 'typedef vtkIdType' -->
-          <parameter type-id='type-id-122'/>
+          <parameter type-id='type-id-121'/>
           <!-- parameter of type 'int' -->
           <parameter type-id='type-id-19'/>
           <!-- parameter of type 'int' -->
@@ -14373,7 +14373,7 @@
           <!-- parameter of type 'const unsigned char*' -->
           <parameter type-id='type-id-57'/>
           <!-- parameter of type 'typedef vtkIdType' -->
-          <parameter type-id='type-id-122'/>
+          <parameter type-id='type-id-121'/>
           <!-- parameter of type 'int' -->
           <parameter type-id='type-id-19'/>
           <!-- parameter of type 'int' -->
@@ -14390,7 +14390,7 @@
           <!-- parameter of type 'const float*' -->
           <parameter type-id='type-id-131'/>
           <!-- parameter of type 'typedef vtkIdType' -->
-          <parameter type-id='type-id-122'/>
+          <parameter type-id='type-id-121'/>
           <!-- parameter of type 'int' -->
           <parameter type-id='type-id-19'/>
           <!-- parameter of type 'int' -->
@@ -14407,7 +14407,7 @@
           <!-- parameter of type 'const double*' -->
           <parameter type-id='type-id-112'/>
           <!-- parameter of type 'typedef vtkIdType' -->
-          <parameter type-id='type-id-122'/>
+          <parameter type-id='type-id-121'/>
           <!-- parameter of type 'int' -->
           <parameter type-id='type-id-19'/>
           <!-- parameter of type 'int' -->
@@ -14424,7 +14424,7 @@
           <!-- parameter of type 'const vtkIdType*' -->
           <parameter type-id='type-id-132'/>
           <!-- parameter of type 'typedef vtkIdType' -->
-          <parameter type-id='type-id-122'/>
+          <parameter type-id='type-id-121'/>
           <!-- parameter of type 'int' -->
           <parameter type-id='type-id-19'/>
           <!-- parameter of type 'int' -->
@@ -14486,7 +14486,7 @@
           <!-- parameter of type 'int*' -->
           <parameter type-id='type-id-76'/>
           <!-- parameter of type 'typedef vtkIdType' -->
-          <parameter type-id='type-id-122'/>
+          <parameter type-id='type-id-121'/>
           <!-- parameter of type 'int' -->
           <parameter type-id='type-id-19'/>
           <!-- parameter of type 'int' -->
@@ -14503,7 +14503,7 @@
           <!-- parameter of type 'unsigned int*' -->
           <parameter type-id='type-id-77'/>
           <!-- parameter of type 'typedef vtkIdType' -->
-          <parameter type-id='type-id-122'/>
+          <parameter type-id='type-id-121'/>
           <!-- parameter of type 'int' -->
           <parameter type-id='type-id-19'/>
           <!-- parameter of type 'int' -->
@@ -14520,7 +14520,7 @@
           <!-- parameter of type 'unsigned long int*' -->
           <parameter type-id='type-id-133'/>
           <!-- parameter of type 'typedef vtkIdType' -->
-          <parameter type-id='type-id-122'/>
+          <parameter type-id='type-id-121'/>
           <!-- parameter of type 'int' -->
           <parameter type-id='type-id-19'/>
           <!-- parameter of type 'int' -->
@@ -14537,7 +14537,7 @@
           <!-- parameter of type 'char*' -->
           <parameter type-id='type-id-33'/>
           <!-- parameter of type 'typedef vtkIdType' -->
-          <parameter type-id='type-id-122'/>
+          <parameter type-id='type-id-121'/>
           <!-- parameter of type 'int' -->
           <parameter type-id='type-id-19'/>
           <!-- parameter of type 'int' -->
@@ -14554,7 +14554,7 @@
           <!-- parameter of type 'unsigned char*' -->
           <parameter type-id='type-id-58'/>
           <!-- parameter of type 'typedef vtkIdType' -->
-          <parameter type-id='type-id-122'/>
+          <parameter type-id='type-id-121'/>
           <!-- parameter of type 'int' -->
           <parameter type-id='type-id-19'/>
           <!-- parameter of type 'int' -->
@@ -14571,7 +14571,7 @@
           <!-- parameter of type 'float*' -->
           <parameter type-id='type-id-75'/>
           <!-- parameter of type 'typedef vtkIdType' -->
-          <parameter type-id='type-id-122'/>
+          <parameter type-id='type-id-121'/>
           <!-- parameter of type 'int' -->
           <parameter type-id='type-id-19'/>
           <!-- parameter of type 'int' -->
@@ -14588,7 +14588,7 @@
           <!-- parameter of type 'double*' -->
           <parameter type-id='type-id-74'/>
           <!-- parameter of type 'typedef vtkIdType' -->
-          <parameter type-id='type-id-122'/>
+          <parameter type-id='type-id-121'/>
           <!-- parameter of type 'int' -->
           <parameter type-id='type-id-19'/>
           <!-- parameter of type 'int' -->
@@ -14605,7 +14605,7 @@
           <!-- parameter of type 'vtkIdType*' -->
           <parameter type-id='type-id-134'/>
           <!-- parameter of type 'typedef vtkIdType' -->
-          <parameter type-id='type-id-122'/>
+          <parameter type-id='type-id-121'/>
           <!-- parameter of type 'int' -->
           <parameter type-id='type-id-19'/>
           <!-- parameter of type 'int' -->
@@ -14678,7 +14678,7 @@
           <!-- implicit parameter of type 'vtkMultiProcessController*' -->
           <parameter type-id='type-id-471' is-artificial='yes'/>
           <!-- typedef vtkIdType -->
-          <return type-id='type-id-122'/>
+          <return type-id='type-id-121'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
@@ -14689,7 +14689,7 @@
           <!-- parameter of type 'int*' -->
           <parameter type-id='type-id-76'/>
           <!-- parameter of type 'typedef vtkIdType' -->
-          <parameter type-id='type-id-122'/>
+          <parameter type-id='type-id-121'/>
           <!-- parameter of type 'int' -->
           <parameter type-id='type-id-19'/>
           <!-- int -->
@@ -14704,7 +14704,7 @@
           <!-- parameter of type 'unsigned int*' -->
           <parameter type-id='type-id-77'/>
           <!-- parameter of type 'typedef vtkIdType' -->
-          <parameter type-id='type-id-122'/>
+          <parameter type-id='type-id-121'/>
           <!-- parameter of type 'int' -->
           <parameter type-id='type-id-19'/>
           <!-- int -->
@@ -14719,7 +14719,7 @@
           <!-- parameter of type 'unsigned long int*' -->
           <parameter type-id='type-id-133'/>
           <!-- parameter of type 'typedef vtkIdType' -->
-          <parameter type-id='type-id-122'/>
+          <parameter type-id='type-id-121'/>
           <!-- parameter of type 'int' -->
           <parameter type-id='type-id-19'/>
           <!-- int -->
@@ -14734,7 +14734,7 @@
           <!-- parameter of type 'unsigned char*' -->
           <parameter type-id='type-id-58'/>
           <!-- parameter of type 'typedef vtkIdType' -->
-          <parameter type-id='type-id-122'/>
+          <parameter type-id='type-id-121'/>
           <!-- parameter of type 'int' -->
           <parameter type-id='type-id-19'/>
           <!-- int -->
@@ -14749,7 +14749,7 @@
           <!-- parameter of type 'char*' -->
           <parameter type-id='type-id-33'/>
           <!-- parameter of type 'typedef vtkIdType' -->
-          <parameter type-id='type-id-122'/>
+          <parameter type-id='type-id-121'/>
           <!-- parameter of type 'int' -->
           <parameter type-id='type-id-19'/>
           <!-- int -->
@@ -14764,7 +14764,7 @@
           <!-- parameter of type 'float*' -->
           <parameter type-id='type-id-75'/>
           <!-- parameter of type 'typedef vtkIdType' -->
-          <parameter type-id='type-id-122'/>
+          <parameter type-id='type-id-121'/>
           <!-- parameter of type 'int' -->
           <parameter type-id='type-id-19'/>
           <!-- int -->
@@ -14779,7 +14779,7 @@
           <!-- parameter of type 'double*' -->
           <parameter type-id='type-id-74'/>
           <!-- parameter of type 'typedef vtkIdType' -->
-          <parameter type-id='type-id-122'/>
+          <parameter type-id='type-id-121'/>
           <!-- parameter of type 'int' -->
           <parameter type-id='type-id-19'/>
           <!-- int -->
@@ -14794,7 +14794,7 @@
           <!-- parameter of type 'vtkIdType*' -->
           <parameter type-id='type-id-134'/>
           <!-- parameter of type 'typedef vtkIdType' -->
-          <parameter type-id='type-id-122'/>
+          <parameter type-id='type-id-121'/>
           <!-- parameter of type 'int' -->
           <parameter type-id='type-id-19'/>
           <!-- int -->
@@ -14850,7 +14850,7 @@
           <!-- parameter of type 'int*' -->
           <parameter type-id='type-id-76'/>
           <!-- parameter of type 'typedef vtkIdType' -->
-          <parameter type-id='type-id-122'/>
+          <parameter type-id='type-id-121'/>
           <!-- parameter of type 'int' -->
           <parameter type-id='type-id-19'/>
           <!-- int -->
@@ -14867,7 +14867,7 @@
           <!-- parameter of type 'unsigned long int*' -->
           <parameter type-id='type-id-133'/>
           <!-- parameter of type 'typedef vtkIdType' -->
-          <parameter type-id='type-id-122'/>
+          <parameter type-id='type-id-121'/>
           <!-- parameter of type 'int' -->
           <parameter type-id='type-id-19'/>
           <!-- int -->
@@ -14884,7 +14884,7 @@
           <!-- parameter of type 'unsigned char*' -->
           <parameter type-id='type-id-58'/>
           <!-- parameter of type 'typedef vtkIdType' -->
-          <parameter type-id='type-id-122'/>
+          <parameter type-id='type-id-121'/>
           <!-- parameter of type 'int' -->
           <parameter type-id='type-id-19'/>
           <!-- int -->
@@ -14901,7 +14901,7 @@
           <!-- parameter of type 'char*' -->
           <parameter type-id='type-id-33'/>
           <!-- parameter of type 'typedef vtkIdType' -->
-          <parameter type-id='type-id-122'/>
+          <parameter type-id='type-id-121'/>
           <!-- parameter of type 'int' -->
           <parameter type-id='type-id-19'/>
           <!-- int -->
@@ -14918,7 +14918,7 @@
           <!-- parameter of type 'float*' -->
           <parameter type-id='type-id-75'/>
           <!-- parameter of type 'typedef vtkIdType' -->
-          <parameter type-id='type-id-122'/>
+          <parameter type-id='type-id-121'/>
           <!-- parameter of type 'int' -->
           <parameter type-id='type-id-19'/>
           <!-- int -->
@@ -14935,7 +14935,7 @@
           <!-- parameter of type 'double*' -->
           <parameter type-id='type-id-74'/>
           <!-- parameter of type 'typedef vtkIdType' -->
-          <parameter type-id='type-id-122'/>
+          <parameter type-id='type-id-121'/>
           <!-- parameter of type 'int' -->
           <parameter type-id='type-id-19'/>
           <!-- int -->
@@ -14952,7 +14952,7 @@
           <!-- parameter of type 'vtkIdType*' -->
           <parameter type-id='type-id-134'/>
           <!-- parameter of type 'typedef vtkIdType' -->
-          <parameter type-id='type-id-122'/>
+          <parameter type-id='type-id-121'/>
           <!-- parameter of type 'int' -->
           <parameter type-id='type-id-19'/>
           <!-- int -->
@@ -14984,7 +14984,7 @@
           <!-- parameter of type 'int*' -->
           <parameter type-id='type-id-76'/>
           <!-- parameter of type 'typedef vtkIdType' -->
-          <parameter type-id='type-id-122'/>
+          <parameter type-id='type-id-121'/>
           <!-- parameter of type 'vtkIdType*' -->
           <parameter type-id='type-id-134'/>
           <!-- parameter of type 'vtkIdType*' -->
@@ -15005,7 +15005,7 @@
           <!-- parameter of type 'unsigned long int*' -->
           <parameter type-id='type-id-133'/>
           <!-- parameter of type 'typedef vtkIdType' -->
-          <parameter type-id='type-id-122'/>
+          <parameter type-id='type-id-121'/>
           <!-- parameter of type 'vtkIdType*' -->
           <parameter type-id='type-id-134'/>
           <!-- parameter of type 'vtkIdType*' -->
@@ -15026,7 +15026,7 @@
           <!-- parameter of type 'unsigned char*' -->
           <parameter type-id='type-id-58'/>
           <!-- parameter of type 'typedef vtkIdType' -->
-          <parameter type-id='type-id-122'/>
+          <parameter type-id='type-id-121'/>
           <!-- parameter of type 'vtkIdType*' -->
           <parameter type-id='type-id-134'/>
           <!-- parameter of type 'vtkIdType*' -->
@@ -15047,7 +15047,7 @@
           <!-- parameter of type 'char*' -->
           <parameter type-id='type-id-33'/>
           <!-- parameter of type 'typedef vtkIdType' -->
-          <parameter type-id='type-id-122'/>
+          <parameter type-id='type-id-121'/>
           <!-- parameter of type 'vtkIdType*' -->
           <parameter type-id='type-id-134'/>
           <!-- parameter of type 'vtkIdType*' -->
@@ -15068,7 +15068,7 @@
           <!-- parameter of type 'float*' -->
           <parameter type-id='type-id-75'/>
           <!-- parameter of type 'typedef vtkIdType' -->
-          <parameter type-id='type-id-122'/>
+          <parameter type-id='type-id-121'/>
           <!-- parameter of type 'vtkIdType*' -->
           <parameter type-id='type-id-134'/>
           <!-- parameter of type 'vtkIdType*' -->
@@ -15089,7 +15089,7 @@
           <!-- parameter of type 'double*' -->
           <parameter type-id='type-id-74'/>
           <!-- parameter of type 'typedef vtkIdType' -->
-          <parameter type-id='type-id-122'/>
+          <parameter type-id='type-id-121'/>
           <!-- parameter of type 'vtkIdType*' -->
           <parameter type-id='type-id-134'/>
           <!-- parameter of type 'vtkIdType*' -->
@@ -15110,7 +15110,7 @@
           <!-- parameter of type 'vtkIdType*' -->
           <parameter type-id='type-id-134'/>
           <!-- parameter of type 'typedef vtkIdType' -->
-          <parameter type-id='type-id-122'/>
+          <parameter type-id='type-id-121'/>
           <!-- parameter of type 'vtkIdType*' -->
           <parameter type-id='type-id-134'/>
           <!-- parameter of type 'vtkIdType*' -->
@@ -15165,7 +15165,7 @@
           <!-- parameter of type 'int*' -->
           <parameter type-id='type-id-76'/>
           <!-- parameter of type 'typedef vtkIdType' -->
-          <parameter type-id='type-id-122'/>
+          <parameter type-id='type-id-121'/>
           <!-- parameter of type 'int' -->
           <parameter type-id='type-id-19'/>
           <!-- int -->
@@ -15182,7 +15182,7 @@
           <!-- parameter of type 'unsigned long int*' -->
           <parameter type-id='type-id-133'/>
           <!-- parameter of type 'typedef vtkIdType' -->
-          <parameter type-id='type-id-122'/>
+          <parameter type-id='type-id-121'/>
           <!-- parameter of type 'int' -->
           <parameter type-id='type-id-19'/>
           <!-- int -->
@@ -15199,7 +15199,7 @@
           <!-- parameter of type 'unsigned char*' -->
           <parameter type-id='type-id-58'/>
           <!-- parameter of type 'typedef vtkIdType' -->
-          <parameter type-id='type-id-122'/>
+          <parameter type-id='type-id-121'/>
           <!-- parameter of type 'int' -->
           <parameter type-id='type-id-19'/>
           <!-- int -->
@@ -15216,7 +15216,7 @@
           <!-- parameter of type 'char*' -->
           <parameter type-id='type-id-33'/>
           <!-- parameter of type 'typedef vtkIdType' -->
-          <parameter type-id='type-id-122'/>
+          <parameter type-id='type-id-121'/>
           <!-- parameter of type 'int' -->
           <parameter type-id='type-id-19'/>
           <!-- int -->
@@ -15233,7 +15233,7 @@
           <!-- parameter of type 'float*' -->
           <parameter type-id='type-id-75'/>
           <!-- parameter of type 'typedef vtkIdType' -->
-          <parameter type-id='type-id-122'/>
+          <parameter type-id='type-id-121'/>
           <!-- parameter of type 'int' -->
           <parameter type-id='type-id-19'/>
           <!-- int -->
@@ -15250,7 +15250,7 @@
           <!-- parameter of type 'double*' -->
           <parameter type-id='type-id-74'/>
           <!-- parameter of type 'typedef vtkIdType' -->
-          <parameter type-id='type-id-122'/>
+          <parameter type-id='type-id-121'/>
           <!-- parameter of type 'int' -->
           <parameter type-id='type-id-19'/>
           <!-- int -->
@@ -15267,7 +15267,7 @@
           <!-- parameter of type 'vtkIdType*' -->
           <parameter type-id='type-id-134'/>
           <!-- parameter of type 'typedef vtkIdType' -->
-          <parameter type-id='type-id-122'/>
+          <parameter type-id='type-id-121'/>
           <!-- parameter of type 'int' -->
           <parameter type-id='type-id-19'/>
           <!-- int -->
@@ -15303,7 +15303,7 @@
           <!-- parameter of type 'vtkIdType*' -->
           <parameter type-id='type-id-134'/>
           <!-- parameter of type 'typedef vtkIdType' -->
-          <parameter type-id='type-id-122'/>
+          <parameter type-id='type-id-121'/>
           <!-- parameter of type 'int' -->
           <parameter type-id='type-id-19'/>
           <!-- int -->
@@ -15324,7 +15324,7 @@
           <!-- parameter of type 'vtkIdType*' -->
           <parameter type-id='type-id-134'/>
           <!-- parameter of type 'typedef vtkIdType' -->
-          <parameter type-id='type-id-122'/>
+          <parameter type-id='type-id-121'/>
           <!-- parameter of type 'int' -->
           <parameter type-id='type-id-19'/>
           <!-- int -->
@@ -15345,7 +15345,7 @@
           <!-- parameter of type 'vtkIdType*' -->
           <parameter type-id='type-id-134'/>
           <!-- parameter of type 'typedef vtkIdType' -->
-          <parameter type-id='type-id-122'/>
+          <parameter type-id='type-id-121'/>
           <!-- parameter of type 'int' -->
           <parameter type-id='type-id-19'/>
           <!-- int -->
@@ -15366,7 +15366,7 @@
           <!-- parameter of type 'vtkIdType*' -->
           <parameter type-id='type-id-134'/>
           <!-- parameter of type 'typedef vtkIdType' -->
-          <parameter type-id='type-id-122'/>
+          <parameter type-id='type-id-121'/>
           <!-- parameter of type 'int' -->
           <parameter type-id='type-id-19'/>
           <!-- int -->
@@ -15387,7 +15387,7 @@
           <!-- parameter of type 'vtkIdType*' -->
           <parameter type-id='type-id-134'/>
           <!-- parameter of type 'typedef vtkIdType' -->
-          <parameter type-id='type-id-122'/>
+          <parameter type-id='type-id-121'/>
           <!-- parameter of type 'int' -->
           <parameter type-id='type-id-19'/>
           <!-- int -->
@@ -15408,7 +15408,7 @@
           <!-- parameter of type 'vtkIdType*' -->
           <parameter type-id='type-id-134'/>
           <!-- parameter of type 'typedef vtkIdType' -->
-          <parameter type-id='type-id-122'/>
+          <parameter type-id='type-id-121'/>
           <!-- parameter of type 'int' -->
           <parameter type-id='type-id-19'/>
           <!-- int -->
@@ -15429,7 +15429,7 @@
           <!-- parameter of type 'vtkIdType*' -->
           <parameter type-id='type-id-134'/>
           <!-- parameter of type 'typedef vtkIdType' -->
-          <parameter type-id='type-id-122'/>
+          <parameter type-id='type-id-121'/>
           <!-- parameter of type 'int' -->
           <parameter type-id='type-id-19'/>
           <!-- int -->
@@ -15446,7 +15446,7 @@
           <!-- parameter of type 'int*' -->
           <parameter type-id='type-id-76'/>
           <!-- parameter of type 'typedef vtkIdType' -->
-          <parameter type-id='type-id-122'/>
+          <parameter type-id='type-id-121'/>
           <!-- int -->
           <return type-id='type-id-19'/>
         </function-decl>
@@ -15461,7 +15461,7 @@
           <!-- parameter of type 'unsigned long int*' -->
           <parameter type-id='type-id-133'/>
           <!-- parameter of type 'typedef vtkIdType' -->
-          <parameter type-id='type-id-122'/>
+          <parameter type-id='type-id-121'/>
           <!-- int -->
           <return type-id='type-id-19'/>
         </function-decl>
@@ -15476,7 +15476,7 @@
           <!-- parameter of type 'unsigned char*' -->
           <parameter type-id='type-id-58'/>
           <!-- parameter of type 'typedef vtkIdType' -->
-          <parameter type-id='type-id-122'/>
+          <parameter type-id='type-id-121'/>
           <!-- int -->
           <return type-id='type-id-19'/>
         </function-decl>
@@ -15491,7 +15491,7 @@
           <!-- parameter of type 'char*' -->
           <parameter type-id='type-id-33'/>
           <!-- parameter of type 'typedef vtkIdType' -->
-          <parameter type-id='type-id-122'/>
+          <parameter type-id='type-id-121'/>
           <!-- int -->
           <return type-id='type-id-19'/>
         </function-decl>
@@ -15506,7 +15506,7 @@
           <!-- parameter of type 'float*' -->
           <parameter type-id='type-id-75'/>
           <!-- parameter of type 'typedef vtkIdType' -->
-          <parameter type-id='type-id-122'/>
+          <parameter type-id='type-id-121'/>
           <!-- int -->
           <return type-id='type-id-19'/>
         </function-decl>
@@ -15521,7 +15521,7 @@
           <!-- parameter of type 'double*' -->
           <parameter type-id='type-id-74'/>
           <!-- parameter of type 'typedef vtkIdType' -->
-          <parameter type-id='type-id-122'/>
+          <parameter type-id='type-id-121'/>
           <!-- int -->
           <return type-id='type-id-19'/>
         </function-decl>
@@ -15536,7 +15536,7 @@
           <!-- parameter of type 'vtkIdType*' -->
           <parameter type-id='type-id-134'/>
           <!-- parameter of type 'typedef vtkIdType' -->
-          <parameter type-id='type-id-122'/>
+          <parameter type-id='type-id-121'/>
           <!-- int -->
           <return type-id='type-id-19'/>
         </function-decl>
@@ -15564,7 +15564,7 @@
           <!-- parameter of type 'int*' -->
           <parameter type-id='type-id-76'/>
           <!-- parameter of type 'typedef vtkIdType' -->
-          <parameter type-id='type-id-122'/>
+          <parameter type-id='type-id-121'/>
           <!-- parameter of type 'vtkIdType*' -->
           <parameter type-id='type-id-134'/>
           <!-- parameter of type 'vtkIdType*' -->
@@ -15583,7 +15583,7 @@
           <!-- parameter of type 'unsigned long int*' -->
           <parameter type-id='type-id-133'/>
           <!-- parameter of type 'typedef vtkIdType' -->
-          <parameter type-id='type-id-122'/>
+          <parameter type-id='type-id-121'/>
           <!-- parameter of type 'vtkIdType*' -->
           <parameter type-id='type-id-134'/>
           <!-- parameter of type 'vtkIdType*' -->
@@ -15602,7 +15602,7 @@
           <!-- parameter of type 'unsigned char*' -->
           <parameter type-id='type-id-58'/>
           <!-- parameter of type 'typedef vtkIdType' -->
-          <parameter type-id='type-id-122'/>
+          <parameter type-id='type-id-121'/>
           <!-- parameter of type 'vtkIdType*' -->
           <parameter type-id='type-id-134'/>
           <!-- parameter of type 'vtkIdType*' -->
@@ -15621,7 +15621,7 @@
           <!-- parameter of type 'char*' -->
           <parameter type-id='type-id-33'/>
           <!-- parameter of type 'typedef vtkIdType' -->
-          <parameter type-id='type-id-122'/>
+          <parameter type-id='type-id-121'/>
           <!-- parameter of type 'vtkIdType*' -->
           <parameter type-id='type-id-134'/>
           <!-- parameter of type 'vtkIdType*' -->
@@ -15640,7 +15640,7 @@
           <!-- parameter of type 'float*' -->
           <parameter type-id='type-id-75'/>
           <!-- parameter of type 'typedef vtkIdType' -->
-          <parameter type-id='type-id-122'/>
+          <parameter type-id='type-id-121'/>
           <!-- parameter of type 'vtkIdType*' -->
           <parameter type-id='type-id-134'/>
           <!-- parameter of type 'vtkIdType*' -->
@@ -15659,7 +15659,7 @@
           <!-- parameter of type 'double*' -->
           <parameter type-id='type-id-74'/>
           <!-- parameter of type 'typedef vtkIdType' -->
-          <parameter type-id='type-id-122'/>
+          <parameter type-id='type-id-121'/>
           <!-- parameter of type 'vtkIdType*' -->
           <parameter type-id='type-id-134'/>
           <!-- parameter of type 'vtkIdType*' -->
@@ -15678,7 +15678,7 @@
           <!-- parameter of type 'vtkIdType*' -->
           <parameter type-id='type-id-134'/>
           <!-- parameter of type 'typedef vtkIdType' -->
-          <parameter type-id='type-id-122'/>
+          <parameter type-id='type-id-121'/>
           <!-- parameter of type 'vtkIdType*' -->
           <parameter type-id='type-id-134'/>
           <!-- parameter of type 'vtkIdType*' -->
@@ -15727,7 +15727,7 @@
           <!-- parameter of type 'int*' -->
           <parameter type-id='type-id-76'/>
           <!-- parameter of type 'typedef vtkIdType' -->
-          <parameter type-id='type-id-122'/>
+          <parameter type-id='type-id-121'/>
           <!-- parameter of type 'int' -->
           <parameter type-id='type-id-19'/>
           <!-- parameter of type 'int' -->
@@ -15746,7 +15746,7 @@
           <!-- parameter of type 'unsigned int*' -->
           <parameter type-id='type-id-77'/>
           <!-- parameter of type 'typedef vtkIdType' -->
-          <parameter type-id='type-id-122'/>
+          <parameter type-id='type-id-121'/>
           <!-- parameter of type 'int' -->
           <parameter type-id='type-id-19'/>
           <!-- parameter of type 'int' -->
@@ -15765,7 +15765,7 @@
           <!-- parameter of type 'unsigned long int*' -->
           <parameter type-id='type-id-133'/>
           <!-- parameter of type 'typedef vtkIdType' -->
-          <parameter type-id='type-id-122'/>
+          <parameter type-id='type-id-121'/>
           <!-- parameter of type 'int' -->
           <parameter type-id='type-id-19'/>
           <!-- parameter of type 'int' -->
@@ -15784,7 +15784,7 @@
           <!-- parameter of type 'unsigned char*' -->
           <parameter type-id='type-id-58'/>
           <!-- parameter of type 'typedef vtkIdType' -->
-          <parameter type-id='type-id-122'/>
+          <parameter type-id='type-id-121'/>
           <!-- parameter of type 'int' -->
           <parameter type-id='type-id-19'/>
           <!-- parameter of type 'int' -->
@@ -15803,7 +15803,7 @@
           <!-- parameter of type 'char*' -->
           <parameter type-id='type-id-33'/>
           <!-- parameter of type 'typedef vtkIdType' -->
-          <parameter type-id='type-id-122'/>
+          <parameter type-id='type-id-121'/>
           <!-- parameter of type 'int' -->
           <parameter type-id='type-id-19'/>
           <!-- parameter of type 'int' -->
@@ -15822,7 +15822,7 @@
           <!-- parameter of type 'float*' -->
           <parameter type-id='type-id-75'/>
           <!-- parameter of type 'typedef vtkIdType' -->
-          <parameter type-id='type-id-122'/>
+          <parameter type-id='type-id-121'/>
           <!-- parameter of type 'int' -->
           <parameter type-id='type-id-19'/>
           <!-- parameter of type 'int' -->
@@ -15841,7 +15841,7 @@
           <!-- parameter of type 'double*' -->
           <parameter type-id='type-id-74'/>
           <!-- parameter of type 'typedef vtkIdType' -->
-          <parameter type-id='type-id-122'/>
+          <parameter type-id='type-id-121'/>
           <!-- parameter of type 'int' -->
           <parameter type-id='type-id-19'/>
           <!-- parameter of type 'int' -->
@@ -15860,7 +15860,7 @@
           <!-- parameter of type 'vtkIdType*' -->
           <parameter type-id='type-id-134'/>
           <!-- parameter of type 'typedef vtkIdType' -->
-          <parameter type-id='type-id-122'/>
+          <parameter type-id='type-id-121'/>
           <!-- parameter of type 'int' -->
           <parameter type-id='type-id-19'/>
           <!-- parameter of type 'int' -->
@@ -15896,9 +15896,9 @@
           <!-- parameter of type 'int*' -->
           <parameter type-id='type-id-76'/>
           <!-- parameter of type 'typedef vtkIdType' -->
-          <parameter type-id='type-id-122'/>
-          <!-- parameter of type 'vtkCommunicator::Operation*' -->
           <parameter type-id='type-id-121'/>
+          <!-- parameter of type 'vtkCommunicator::Operation*' -->
+          <parameter type-id='type-id-120'/>
           <!-- parameter of type 'int' -->
           <parameter type-id='type-id-19'/>
           <!-- int -->
@@ -15915,9 +15915,9 @@
           <!-- parameter of type 'unsigned long int*' -->
           <parameter type-id='type-id-133'/>
           <!-- parameter of type 'typedef vtkIdType' -->
-          <parameter type-id='type-id-122'/>
-          <!-- parameter of type 'vtkCommunicator::Operation*' -->
           <parameter type-id='type-id-121'/>
+          <!-- parameter of type 'vtkCommunicator::Operation*' -->
+          <parameter type-id='type-id-120'/>
           <!-- parameter of type 'int' -->
           <parameter type-id='type-id-19'/>
           <!-- int -->
@@ -15934,9 +15934,9 @@
           <!-- parameter of type 'unsigned char*' -->
           <parameter type-id='type-id-58'/>
           <!-- parameter of type 'typedef vtkIdType' -->
-          <parameter type-id='type-id-122'/>
-          <!-- parameter of type 'vtkCommunicator::Operation*' -->
           <parameter type-id='type-id-121'/>
+          <!-- parameter of type 'vtkCommunicator::Operation*' -->
+          <parameter type-id='type-id-120'/>
           <!-- parameter of type 'int' -->
           <parameter type-id='type-id-19'/>
           <!-- int -->
@@ -15953,9 +15953,9 @@
           <!-- parameter of type 'char*' -->
           <parameter type-id='type-id-33'/>
           <!-- parameter of type 'typedef vtkIdType' -->
-          <parameter type-id='type-id-122'/>
-          <!-- parameter of type 'vtkCommunicator::Operation*' -->
           <parameter type-id='type-id-121'/>
+          <!-- parameter of type 'vtkCommunicator::Operation*' -->
+          <parameter type-id='type-id-120'/>
           <!-- parameter of type 'int' -->
           <parameter type-id='type-id-19'/>
           <!-- int -->
@@ -15972,9 +15972,9 @@
           <!-- parameter of type 'float*' -->
           <parameter type-id='type-id-75'/>
           <!-- parameter of type 'typedef vtkIdType' -->
-          <parameter type-id='type-id-122'/>
-          <!-- parameter of type 'vtkCommunicator::Operation*' -->
           <parameter type-id='type-id-121'/>
+          <!-- parameter of type 'vtkCommunicator::Operation*' -->
+          <parameter type-id='type-id-120'/>
           <!-- parameter of type 'int' -->
           <parameter type-id='type-id-19'/>
           <!-- int -->
@@ -15991,9 +15991,9 @@
           <!-- parameter of type 'double*' -->
           <parameter type-id='type-id-74'/>
           <!-- parameter of type 'typedef vtkIdType' -->
-          <parameter type-id='type-id-122'/>
-          <!-- parameter of type 'vtkCommunicator::Operation*' -->
           <parameter type-id='type-id-121'/>
+          <!-- parameter of type 'vtkCommunicator::Operation*' -->
+          <parameter type-id='type-id-120'/>
           <!-- parameter of type 'int' -->
           <parameter type-id='type-id-19'/>
           <!-- int -->
@@ -16010,9 +16010,9 @@
           <!-- parameter of type 'vtkIdType*' -->
           <parameter type-id='type-id-134'/>
           <!-- parameter of type 'typedef vtkIdType' -->
-          <parameter type-id='type-id-122'/>
-          <!-- parameter of type 'vtkCommunicator::Operation*' -->
           <parameter type-id='type-id-121'/>
+          <!-- parameter of type 'vtkCommunicator::Operation*' -->
+          <parameter type-id='type-id-120'/>
           <!-- parameter of type 'int' -->
           <parameter type-id='type-id-19'/>
           <!-- int -->
@@ -16029,7 +16029,7 @@
           <!-- parameter of type 'vtkDataArray*' -->
           <parameter type-id='type-id-127'/>
           <!-- parameter of type 'vtkCommunicator::Operation*' -->
-          <parameter type-id='type-id-121'/>
+          <parameter type-id='type-id-120'/>
           <!-- parameter of type 'int' -->
           <parameter type-id='type-id-19'/>
           <!-- int -->
@@ -16046,7 +16046,7 @@
           <!-- parameter of type 'int*' -->
           <parameter type-id='type-id-76'/>
           <!-- parameter of type 'typedef vtkIdType' -->
-          <parameter type-id='type-id-122'/>
+          <parameter type-id='type-id-121'/>
           <!-- parameter of type 'int' -->
           <parameter type-id='type-id-19'/>
           <!-- int -->
@@ -16063,7 +16063,7 @@
           <!-- parameter of type 'unsigned long int*' -->
           <parameter type-id='type-id-133'/>
           <!-- parameter of type 'typedef vtkIdType' -->
-          <parameter type-id='type-id-122'/>
+          <parameter type-id='type-id-121'/>
           <!-- parameter of type 'int' -->
           <parameter type-id='type-id-19'/>
           <!-- int -->
@@ -16080,7 +16080,7 @@
           <!-- parameter of type 'unsigned char*' -->
           <parameter type-id='type-id-58'/>
           <!-- parameter of type 'typedef vtkIdType' -->
-          <parameter type-id='type-id-122'/>
+          <parameter type-id='type-id-121'/>
           <!-- parameter of type 'int' -->
           <parameter type-id='type-id-19'/>
           <!-- int -->
@@ -16097,7 +16097,7 @@
           <!-- parameter of type 'char*' -->
           <parameter type-id='type-id-33'/>
           <!-- parameter of type 'typedef vtkIdType' -->
-          <parameter type-id='type-id-122'/>
+          <parameter type-id='type-id-121'/>
           <!-- parameter of type 'int' -->
           <parameter type-id='type-id-19'/>
           <!-- int -->
@@ -16114,7 +16114,7 @@
           <!-- parameter of type 'float*' -->
           <parameter type-id='type-id-75'/>
           <!-- parameter of type 'typedef vtkIdType' -->
-          <parameter type-id='type-id-122'/>
+          <parameter type-id='type-id-121'/>
           <!-- parameter of type 'int' -->
           <parameter type-id='type-id-19'/>
           <!-- int -->
@@ -16131,7 +16131,7 @@
           <!-- parameter of type 'double*' -->
           <parameter type-id='type-id-74'/>
           <!-- parameter of type 'typedef vtkIdType' -->
-          <parameter type-id='type-id-122'/>
+          <parameter type-id='type-id-121'/>
           <!-- parameter of type 'int' -->
           <parameter type-id='type-id-19'/>
           <!-- int -->
@@ -16148,7 +16148,7 @@
           <!-- parameter of type 'vtkIdType*' -->
           <parameter type-id='type-id-134'/>
           <!-- parameter of type 'typedef vtkIdType' -->
-          <parameter type-id='type-id-122'/>
+          <parameter type-id='type-id-121'/>
           <!-- parameter of type 'int' -->
           <parameter type-id='type-id-19'/>
           <!-- int -->
@@ -16180,9 +16180,9 @@
           <!-- parameter of type 'int*' -->
           <parameter type-id='type-id-76'/>
           <!-- parameter of type 'typedef vtkIdType' -->
-          <parameter type-id='type-id-122'/>
-          <!-- parameter of type 'vtkCommunicator::Operation*' -->
           <parameter type-id='type-id-121'/>
+          <!-- parameter of type 'vtkCommunicator::Operation*' -->
+          <parameter type-id='type-id-120'/>
           <!-- int -->
           <return type-id='type-id-19'/>
         </function-decl>
@@ -16197,9 +16197,9 @@
           <!-- parameter of type 'unsigned long int*' -->
           <parameter type-id='type-id-133'/>
           <!-- parameter of type 'typedef vtkIdType' -->
-          <parameter type-id='type-id-122'/>
-          <!-- parameter of type 'vtkCommunicator::Operation*' -->
           <parameter type-id='type-id-121'/>
+          <!-- parameter of type 'vtkCommunicator::Operation*' -->
+          <parameter type-id='type-id-120'/>
           <!-- int -->
           <return type-id='type-id-19'/>
         </function-decl>
@@ -16214,9 +16214,9 @@
           <!-- parameter of type 'unsigned char*' -->
           <parameter type-id='type-id-58'/>
           <!-- parameter of type 'typedef vtkIdType' -->
-          <parameter type-id='type-id-122'/>
-          <!-- parameter of type 'vtkCommunicator::Operation*' -->
           <parameter type-id='type-id-121'/>
+          <!-- parameter of type 'vtkCommunicator::Operation*' -->
+          <parameter type-id='type-id-120'/>
           <!-- int -->
           <return type-id='type-id-19'/>
         </function-decl>
@@ -16231,9 +16231,9 @@
           <!-- parameter of type 'char*' -->
           <parameter type-id='type-id-33'/>
           <!-- parameter of type 'typedef vtkIdType' -->
-          <parameter type-id='type-id-122'/>
-          <!-- parameter of type 'vtkCommunicator::Operation*' -->
           <parameter type-id='type-id-121'/>
+          <!-- parameter of type 'vtkCommunicator::Operation*' -->
+          <parameter type-id='type-id-120'/>
           <!-- int -->
           <return type-id='type-id-19'/>
         </function-decl>
@@ -16248,9 +16248,9 @@
           <!-- parameter of type 'float*' -->
           <parameter type-id='type-id-75'/>
           <!-- parameter of type 'typedef vtkIdType' -->
-          <parameter type-id='type-id-122'/>
-          <!-- parameter of type 'vtkCommunicator::Operation*' -->
           <parameter type-id='type-id-121'/>
+          <!-- parameter of type 'vtkCommunicator::Operation*' -->
+          <parameter type-id='type-id-120'/>
           <!-- int -->
           <return type-id='type-id-19'/>
         </function-decl>
@@ -16265,9 +16265,9 @@
           <!-- parameter of type 'double*' -->
           <parameter type-id='type-id-74'/>
           <!-- parameter of type 'typedef vtkIdType' -->
-          <parameter type-id='type-id-122'/>
-          <!-- parameter of type 'vtkCommunicator::Operation*' -->
           <parameter type-id='type-id-121'/>
+          <!-- parameter of type 'vtkCommunicator::Operation*' -->
+          <parameter type-id='type-id-120'/>
           <!-- int -->
           <return type-id='type-id-19'/>
         </function-decl>
@@ -16282,9 +16282,9 @@
           <!-- parameter of type 'vtkIdType*' -->
           <parameter type-id='type-id-134'/>
           <!-- parameter of type 'typedef vtkIdType' -->
-          <parameter type-id='type-id-122'/>
-          <!-- parameter of type 'vtkCommunicator::Operation*' -->
           <parameter type-id='type-id-121'/>
+          <!-- parameter of type 'vtkCommunicator::Operation*' -->
+          <parameter type-id='type-id-120'/>
           <!-- int -->
           <return type-id='type-id-19'/>
         </function-decl>
@@ -16299,7 +16299,7 @@
           <!-- parameter of type 'vtkDataArray*' -->
           <parameter type-id='type-id-127'/>
           <!-- parameter of type 'vtkCommunicator::Operation*' -->
-          <parameter type-id='type-id-121'/>
+          <parameter type-id='type-id-120'/>
           <!-- int -->
           <return type-id='type-id-19'/>
         </function-decl>
@@ -17310,7 +17310,7 @@
           <!-- implicit parameter of type 'vtkIdList*' -->
           <parameter type-id='type-id-492' is-artificial='yes'/>
           <!-- typedef vtkIdType -->
-          <return type-id='type-id-122'/>
+          <return type-id='type-id-121'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -17319,9 +17319,9 @@
           <!-- implicit parameter of type 'vtkIdList*' -->
           <parameter type-id='type-id-492' is-artificial='yes'/>
           <!-- parameter of type 'typedef vtkIdType' -->
-          <parameter type-id='type-id-122'/>
+          <parameter type-id='type-id-121'/>
           <!-- typedef vtkIdType -->
-          <return type-id='type-id-122'/>
+          <return type-id='type-id-121'/>
         </function-decl>
       </member-function>
     </class-decl>
@@ -35232,7 +35232,7 @@
           <!-- parameter of type 'void*' -->
           <parameter type-id='type-id-14'/>
           <!-- parameter of type 'typedef vtkIdType' -->
-          <parameter type-id='type-id-122'/>
+          <parameter type-id='type-id-121'/>
           <!-- parameter of type 'int' -->
           <parameter type-id='type-id-19'/>
           <!-- parameter of type 'int' -->
@@ -35251,7 +35251,7 @@
           <!-- parameter of type 'void*' -->
           <parameter type-id='type-id-14'/>
           <!-- parameter of type 'typedef vtkIdType' -->
-          <parameter type-id='type-id-122'/>
+          <parameter type-id='type-id-121'/>
           <!-- parameter of type 'int' -->
           <parameter type-id='type-id-19'/>
           <!-- parameter of type 'int' -->
@@ -35279,7 +35279,7 @@
           <!-- parameter of type 'void*' -->
           <parameter type-id='type-id-14'/>
           <!-- parameter of type 'typedef vtkIdType' -->
-          <parameter type-id='type-id-122'/>
+          <parameter type-id='type-id-121'/>
           <!-- parameter of type 'int' -->
           <parameter type-id='type-id-19'/>
           <!-- parameter of type 'int' -->
@@ -35298,7 +35298,7 @@
           <!-- parameter of type 'void*' -->
           <parameter type-id='type-id-14'/>
           <!-- parameter of type 'typedef vtkIdType' -->
-          <parameter type-id='type-id-122'/>
+          <parameter type-id='type-id-121'/>
           <!-- parameter of type 'int' -->
           <parameter type-id='type-id-19'/>
           <!-- parameter of type 'int' -->
@@ -35317,7 +35317,7 @@
           <!-- parameter of type 'void*' -->
           <parameter type-id='type-id-14'/>
           <!-- parameter of type 'typedef vtkIdType' -->
-          <parameter type-id='type-id-122'/>
+          <parameter type-id='type-id-121'/>
           <!-- parameter of type 'vtkIdType*' -->
           <parameter type-id='type-id-134'/>
           <!-- parameter of type 'vtkIdType*' -->
@@ -35340,7 +35340,7 @@
           <!-- parameter of type 'void*' -->
           <parameter type-id='type-id-14'/>
           <!-- parameter of type 'typedef vtkIdType' -->
-          <parameter type-id='type-id-122'/>
+          <parameter type-id='type-id-121'/>
           <!-- parameter of type 'int' -->
           <parameter type-id='type-id-19'/>
           <!-- parameter of type 'int' -->
@@ -35363,7 +35363,7 @@
           <!-- parameter of type 'vtkIdType*' -->
           <parameter type-id='type-id-134'/>
           <!-- parameter of type 'typedef vtkIdType' -->
-          <parameter type-id='type-id-122'/>
+          <parameter type-id='type-id-121'/>
           <!-- parameter of type 'int' -->
           <parameter type-id='type-id-19'/>
           <!-- parameter of type 'int' -->
@@ -35382,7 +35382,7 @@
           <!-- parameter of type 'void*' -->
           <parameter type-id='type-id-14'/>
           <!-- parameter of type 'typedef vtkIdType' -->
-          <parameter type-id='type-id-122'/>
+          <parameter type-id='type-id-121'/>
           <!-- parameter of type 'int' -->
           <parameter type-id='type-id-19'/>
           <!-- int -->
@@ -35399,7 +35399,7 @@
           <!-- parameter of type 'void*' -->
           <parameter type-id='type-id-14'/>
           <!-- parameter of type 'typedef vtkIdType' -->
-          <parameter type-id='type-id-122'/>
+          <parameter type-id='type-id-121'/>
           <!-- parameter of type 'vtkIdType*' -->
           <parameter type-id='type-id-134'/>
           <!-- parameter of type 'vtkIdType*' -->
@@ -35420,7 +35420,7 @@
           <!-- parameter of type 'void*' -->
           <parameter type-id='type-id-14'/>
           <!-- parameter of type 'typedef vtkIdType' -->
-          <parameter type-id='type-id-122'/>
+          <parameter type-id='type-id-121'/>
           <!-- parameter of type 'int' -->
           <parameter type-id='type-id-19'/>
           <!-- parameter of type 'int' -->
@@ -35441,11 +35441,11 @@
           <!-- parameter of type 'void*' -->
           <parameter type-id='type-id-14'/>
           <!-- parameter of type 'typedef vtkIdType' -->
-          <parameter type-id='type-id-122'/>
+          <parameter type-id='type-id-121'/>
           <!-- parameter of type 'int' -->
           <parameter type-id='type-id-19'/>
           <!-- parameter of type 'vtkCommunicator::Operation*' -->
-          <parameter type-id='type-id-121'/>
+          <parameter type-id='type-id-120'/>
           <!-- parameter of type 'int' -->
           <parameter type-id='type-id-19'/>
           <!-- int -->
@@ -35462,7 +35462,7 @@
           <!-- parameter of type 'void*' -->
           <parameter type-id='type-id-14'/>
           <!-- parameter of type 'typedef vtkIdType' -->
-          <parameter type-id='type-id-122'/>
+          <parameter type-id='type-id-121'/>
           <!-- parameter of type 'int' -->
           <parameter type-id='type-id-19'/>
           <!-- parameter of type 'int' -->
@@ -35481,11 +35481,11 @@
           <!-- parameter of type 'void*' -->
           <parameter type-id='type-id-14'/>
           <!-- parameter of type 'typedef vtkIdType' -->
-          <parameter type-id='type-id-122'/>
+          <parameter type-id='type-id-121'/>
           <!-- parameter of type 'int' -->
           <parameter type-id='type-id-19'/>
           <!-- parameter of type 'vtkCommunicator::Operation*' -->
-          <parameter type-id='type-id-121'/>
+          <parameter type-id='type-id-120'/>
           <!-- int -->
           <return type-id='type-id-19'/>
         </function-decl>
@@ -41487,7 +41487,7 @@
           <!-- parameter of type 'void*' -->
           <parameter type-id='type-id-14'/>
           <!-- parameter of type 'typedef vtkIdType' -->
-          <parameter type-id='type-id-122'/>
+          <parameter type-id='type-id-121'/>
           <!-- parameter of type 'int' -->
           <parameter type-id='type-id-19'/>
           <!-- parameter of type 'int' -->
@@ -41506,7 +41506,7 @@
           <!-- parameter of type 'void*' -->
           <parameter type-id='type-id-14'/>
           <!-- parameter of type 'typedef vtkIdType' -->
-          <parameter type-id='type-id-122'/>
+          <parameter type-id='type-id-121'/>
           <!-- parameter of type 'int' -->
           <parameter type-id='type-id-19'/>
           <!-- parameter of type 'int' -->
diff --git a/tests/data/test-read-dwarf/test14-pr18893.so.abi b/tests/data/test-read-dwarf/test14-pr18893.so.abi
index da1dd103..8d6aaa4f 100644
--- a/tests/data/test-read-dwarf/test14-pr18893.so.abi
+++ b/tests/data/test-read-dwarf/test14-pr18893.so.abi
@@ -74,135 +74,199 @@
     <array-type-def dimensions='1' type-id='type-id-1' size-in-bits='1280' id='type-id-5'>
       <subrange length='40' type-id='type-id-3' id='type-id-6'/>
     </array-type-def>
-    <class-decl name='BasicCurveEvaluator' size-in-bits='64' is-struct='yes' visibility='default' filepath='libnurbs/internals/basiccrveval.h' line='43' column='1' id='type-id-7'>
-      <base-class access='public' layout-offset-in-bits='0' type-id='type-id-8'/>
-      <member-function access='public' destructor='yes' vtable-offset='-1'>
-        <function-decl name='~BasicCurveEvaluator' filepath='libnurbs/internals/basiccrveval.h' line='45' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-9' is-artificial='yes'/>
+    <class-decl name='CachingEvaluator' size-in-bits='64' visibility='default' filepath='libnurbs/internals/cachingeval.h' line='39' column='1' id='type-id-7'>
+      <member-type access='private'>
+        <enum-decl name='ServiceMode' filepath='libnurbs/internals/cachingeval.h' line='42' column='1' id='type-id-8'>
+          <underlying-type type-id='type-id-9'/>
+          <enumerator name='play' value='0'/>
+          <enumerator name='record' value='1'/>
+          <enumerator name='playAndRecord' value='2'/>
+        </enum-decl>
+      </member-type>
+      <member-function access='private' destructor='yes' vtable-offset='-1'>
+        <function-decl name='~CachingEvaluator' filepath='libnurbs/internals/cachingeval.h' line='41' column='1' visibility='default' binding='global' size-in-bits='64'>
+          <parameter type-id='type-id-10' is-artificial='yes'/>
+          <parameter type-id='type-id-11' is-artificial='yes'/>
+          <return type-id='type-id-12'/>
+        </function-decl>
+      </member-function>
+      <member-function access='private' vtable-offset='2'>
+        <function-decl name='canRecord' mangled-name='_ZN16CachingEvaluator9canRecordEv' filepath='libnurbs/internals/cachingeval.cc' line='43' column='1' visibility='default' binding='global' size-in-bits='64'>
+          <parameter type-id='type-id-10' is-artificial='yes'/>
+          <return type-id='type-id-11'/>
+        </function-decl>
+      </member-function>
+      <member-function access='private' vtable-offset='3'>
+        <function-decl name='canPlayAndRecord' mangled-name='_ZN16CachingEvaluator16canPlayAndRecordEv' filepath='libnurbs/internals/cachingeval.cc' line='49' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-10' is-artificial='yes'/>
           <return type-id='type-id-11'/>
         </function-decl>
       </member-function>
+      <member-function access='private' vtable-offset='4'>
+        <function-decl name='createHandle' mangled-name='_ZN16CachingEvaluator12createHandleEi' filepath='libnurbs/internals/cachingeval.cc' line='55' column='1' visibility='default' binding='global' size-in-bits='64'>
+          <parameter type-id='type-id-10' is-artificial='yes'/>
+          <parameter type-id='type-id-11'/>
+          <return type-id='type-id-11'/>
+        </function-decl>
+      </member-function>
+      <member-function access='private' vtable-offset='5'>
+        <function-decl name='beginOutput' mangled-name='_ZN16CachingEvaluator11beginOutputENS_11ServiceModeEi' filepath='libnurbs/internals/cachingeval.cc' line='61' column='1' visibility='default' binding='global' size-in-bits='64'>
+          <parameter type-id='type-id-10' is-artificial='yes'/>
+          <parameter type-id='type-id-8'/>
+          <parameter type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
+        </function-decl>
+      </member-function>
+      <member-function access='private' vtable-offset='6'>
+        <function-decl name='endOutput' mangled-name='_ZN16CachingEvaluator9endOutputEv' filepath='libnurbs/internals/cachingeval.cc' line='66' column='1' visibility='default' binding='global' size-in-bits='64'>
+          <parameter type-id='type-id-10' is-artificial='yes'/>
+          <return type-id='type-id-12'/>
+        </function-decl>
+      </member-function>
+      <member-function access='private' vtable-offset='7'>
+        <function-decl name='discardRecording' mangled-name='_ZN16CachingEvaluator16discardRecordingEi' filepath='libnurbs/internals/cachingeval.cc' line='71' column='1' visibility='default' binding='global' size-in-bits='64'>
+          <parameter type-id='type-id-10' is-artificial='yes'/>
+          <parameter type-id='type-id-11' is-artificial='yes'/>
+          <return type-id='type-id-12'/>
+        </function-decl>
+      </member-function>
+      <member-function access='private' vtable-offset='8'>
+        <function-decl name='playRecording' mangled-name='_ZN16CachingEvaluator13playRecordingEi' filepath='libnurbs/internals/cachingeval.cc' line='76' column='1' visibility='default' binding='global' size-in-bits='64'>
+          <parameter type-id='type-id-10' is-artificial='yes'/>
+          <parameter type-id='type-id-11' is-artificial='yes'/>
+          <return type-id='type-id-12'/>
+        </function-decl>
+      </member-function>
+    </class-decl>
+    <class-decl name='BasicCurveEvaluator' size-in-bits='64' is-struct='yes' visibility='default' filepath='libnurbs/internals/basiccrveval.h' line='43' column='1' id='type-id-13'>
+      <base-class access='public' layout-offset-in-bits='0' type-id='type-id-7'/>
+      <member-function access='public' destructor='yes' vtable-offset='-1'>
+        <function-decl name='~BasicCurveEvaluator' filepath='libnurbs/internals/basiccrveval.h' line='45' column='1' visibility='default' binding='global' size-in-bits='64'>
+          <parameter type-id='type-id-14' is-artificial='yes'/>
+          <parameter type-id='type-id-11' is-artificial='yes'/>
+          <return type-id='type-id-12'/>
+        </function-decl>
+      </member-function>
       <member-function access='public' vtable-offset='9'>
         <function-decl name='domain1f' mangled-name='_ZN19BasicCurveEvaluator8domain1fEff' filepath='libnurbs/internals/basiccrveval.cc' line='45' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-9' is-artificial='yes'/>
+          <parameter type-id='type-id-14' is-artificial='yes'/>
           <parameter type-id='type-id-1'/>
           <parameter type-id='type-id-1'/>
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public' vtable-offset='10'>
         <function-decl name='range1f' mangled-name='_ZN19BasicCurveEvaluator7range1fElPfS0_' filepath='libnurbs/internals/basiccrveval.cc' line='53' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-9' is-artificial='yes'/>
-          <parameter type-id='type-id-12'/>
-          <parameter type-id='type-id-13'/>
-          <parameter type-id='type-id-13'/>
-          <return type-id='type-id-11'/>
+          <parameter type-id='type-id-14' is-artificial='yes'/>
+          <parameter type-id='type-id-15'/>
+          <parameter type-id='type-id-16'/>
+          <parameter type-id='type-id-16'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public' vtable-offset='11'>
         <function-decl name='enable' mangled-name='_ZN19BasicCurveEvaluator6enableEl' filepath='libnurbs/internals/basiccrveval.cc' line='61' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-9' is-artificial='yes'/>
-          <parameter type-id='type-id-12'/>
-          <return type-id='type-id-11'/>
+          <parameter type-id='type-id-14' is-artificial='yes'/>
+          <parameter type-id='type-id-15'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public' vtable-offset='12'>
         <function-decl name='disable' mangled-name='_ZN19BasicCurveEvaluator7disableEl' filepath='libnurbs/internals/basiccrveval.cc' line='69' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-9' is-artificial='yes'/>
-          <parameter type-id='type-id-12'/>
-          <return type-id='type-id-11'/>
+          <parameter type-id='type-id-14' is-artificial='yes'/>
+          <parameter type-id='type-id-15'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public' vtable-offset='13'>
         <function-decl name='bgnmap1f' mangled-name='_ZN19BasicCurveEvaluator8bgnmap1fEl' filepath='libnurbs/internals/basiccrveval.cc' line='77' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-9' is-artificial='yes'/>
-          <parameter type-id='type-id-12'/>
-          <return type-id='type-id-11'/>
+          <parameter type-id='type-id-14' is-artificial='yes'/>
+          <parameter type-id='type-id-15'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public' vtable-offset='14'>
         <function-decl name='map1f' mangled-name='_ZN19BasicCurveEvaluator5map1fElffllPf' filepath='libnurbs/internals/basiccrveval.cc' line='85' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-9' is-artificial='yes'/>
-          <parameter type-id='type-id-12'/>
+          <parameter type-id='type-id-14' is-artificial='yes'/>
+          <parameter type-id='type-id-15'/>
           <parameter type-id='type-id-1'/>
           <parameter type-id='type-id-1'/>
-          <parameter type-id='type-id-12'/>
-          <parameter type-id='type-id-12'/>
-          <parameter type-id='type-id-13'/>
-          <return type-id='type-id-11'/>
+          <parameter type-id='type-id-15'/>
+          <parameter type-id='type-id-15'/>
+          <parameter type-id='type-id-16'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public' vtable-offset='15'>
         <function-decl name='mapgrid1f' mangled-name='_ZN19BasicCurveEvaluator9mapgrid1fElff' filepath='libnurbs/internals/basiccrveval.cc' line='93' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-9' is-artificial='yes'/>
-          <parameter type-id='type-id-12'/>
+          <parameter type-id='type-id-14' is-artificial='yes'/>
+          <parameter type-id='type-id-15'/>
           <parameter type-id='type-id-1'/>
           <parameter type-id='type-id-1'/>
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public' vtable-offset='16'>
         <function-decl name='mapmesh1f' mangled-name='_ZN19BasicCurveEvaluator9mapmesh1fElll' filepath='libnurbs/internals/basiccrveval.cc' line='101' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-9' is-artificial='yes'/>
-          <parameter type-id='type-id-12'/>
-          <parameter type-id='type-id-12'/>
-          <parameter type-id='type-id-12'/>
-          <return type-id='type-id-11'/>
+          <parameter type-id='type-id-14' is-artificial='yes'/>
+          <parameter type-id='type-id-15'/>
+          <parameter type-id='type-id-15'/>
+          <parameter type-id='type-id-15'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public' vtable-offset='17'>
         <function-decl name='evalcoord1f' mangled-name='_ZN19BasicCurveEvaluator11evalcoord1fElf' filepath='libnurbs/internals/basiccrveval.cc' line='109' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-9' is-artificial='yes'/>
-          <parameter type-id='type-id-12'/>
+          <parameter type-id='type-id-14' is-artificial='yes'/>
+          <parameter type-id='type-id-15'/>
           <parameter type-id='type-id-1'/>
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public' vtable-offset='18'>
         <function-decl name='endmap1f' mangled-name='_ZN19BasicCurveEvaluator8endmap1fEv' filepath='libnurbs/internals/basiccrveval.cc' line='117' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-9' is-artificial='yes'/>
-          <return type-id='type-id-11'/>
+          <parameter type-id='type-id-14' is-artificial='yes'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public' vtable-offset='19'>
         <function-decl name='bgnline' mangled-name='_ZN19BasicCurveEvaluator7bgnlineEv' filepath='libnurbs/internals/basiccrveval.cc' line='125' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-9' is-artificial='yes'/>
-          <return type-id='type-id-11'/>
+          <parameter type-id='type-id-14' is-artificial='yes'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public' vtable-offset='20'>
         <function-decl name='endline' mangled-name='_ZN19BasicCurveEvaluator7endlineEv' filepath='libnurbs/internals/basiccrveval.cc' line='133' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-9' is-artificial='yes'/>
-          <return type-id='type-id-11'/>
+          <parameter type-id='type-id-14' is-artificial='yes'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
     </class-decl>
-    <class-decl name='OpenGLCurveEvaluator' size-in-bits='27584' visibility='default' filepath='libnurbs/interface/glcurveval.h' line='66' column='1' id='type-id-14'>
-      <base-class access='public' layout-offset-in-bits='0' type-id='type-id-7'/>
+    <class-decl name='OpenGLCurveEvaluator' size-in-bits='27584' visibility='default' filepath='libnurbs/interface/glcurveval.h' line='66' column='1' id='type-id-17'>
+      <base-class access='public' layout-offset-in-bits='0' type-id='type-id-13'/>
       <data-member access='private' layout-offset-in-bits='64'>
-        <var-decl name='em_vertex' type-id='type-id-15' visibility='default' filepath='libnurbs/interface/glcurveval.h' line='102' column='1'/>
+        <var-decl name='em_vertex' type-id='type-id-18' visibility='default' filepath='libnurbs/interface/glcurveval.h' line='102' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='6656'>
-        <var-decl name='em_normal' type-id='type-id-15' visibility='default' filepath='libnurbs/interface/glcurveval.h' line='103' column='1'/>
+        <var-decl name='em_normal' type-id='type-id-18' visibility='default' filepath='libnurbs/interface/glcurveval.h' line='103' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='13248'>
-        <var-decl name='em_color' type-id='type-id-15' visibility='default' filepath='libnurbs/interface/glcurveval.h' line='104' column='1'/>
+        <var-decl name='em_color' type-id='type-id-18' visibility='default' filepath='libnurbs/interface/glcurveval.h' line='104' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='19840'>
-        <var-decl name='em_texcoord' type-id='type-id-15' visibility='default' filepath='libnurbs/interface/glcurveval.h' line='105' column='1'/>
+        <var-decl name='em_texcoord' type-id='type-id-18' visibility='default' filepath='libnurbs/interface/glcurveval.h' line='105' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='26432'>
-        <var-decl name='vertex_flag' type-id='type-id-10' visibility='default' filepath='libnurbs/interface/glcurveval.h' line='106' column='1'/>
+        <var-decl name='vertex_flag' type-id='type-id-11' visibility='default' filepath='libnurbs/interface/glcurveval.h' line='106' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='26464'>
-        <var-decl name='normal_flag' type-id='type-id-10' visibility='default' filepath='libnurbs/interface/glcurveval.h' line='107' column='1'/>
+        <var-decl name='normal_flag' type-id='type-id-11' visibility='default' filepath='libnurbs/interface/glcurveval.h' line='107' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='26496'>
-        <var-decl name='color_flag' type-id='type-id-10' visibility='default' filepath='libnurbs/interface/glcurveval.h' line='108' column='1'/>
+        <var-decl name='color_flag' type-id='type-id-11' visibility='default' filepath='libnurbs/interface/glcurveval.h' line='108' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='26528'>
-        <var-decl name='texcoord_flag' type-id='type-id-10' visibility='default' filepath='libnurbs/interface/glcurveval.h' line='109' column='1'/>
+        <var-decl name='texcoord_flag' type-id='type-id-11' visibility='default' filepath='libnurbs/interface/glcurveval.h' line='109' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='26560'>
         <var-decl name='global_grid_u0' type-id='type-id-1' visibility='default' filepath='libnurbs/interface/glcurveval.h' line='111' column='1'/>
@@ -211,294 +275,294 @@
         <var-decl name='global_grid_u1' type-id='type-id-1' visibility='default' filepath='libnurbs/interface/glcurveval.h' line='112' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='26624'>
-        <var-decl name='global_grid_nu' type-id='type-id-10' visibility='default' filepath='libnurbs/interface/glcurveval.h' line='113' column='1'/>
+        <var-decl name='global_grid_nu' type-id='type-id-11' visibility='default' filepath='libnurbs/interface/glcurveval.h' line='113' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='26688'>
-        <var-decl name='beginCallBackN' type-id='type-id-16' visibility='default' filepath='libnurbs/interface/glcurveval.h' line='128' column='1'/>
+        <var-decl name='beginCallBackN' type-id='type-id-19' visibility='default' filepath='libnurbs/interface/glcurveval.h' line='128' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='26752'>
-        <var-decl name='endCallBackN' type-id='type-id-17' visibility='default' filepath='libnurbs/interface/glcurveval.h' line='129' column='1'/>
+        <var-decl name='endCallBackN' type-id='type-id-20' visibility='default' filepath='libnurbs/interface/glcurveval.h' line='129' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='26816'>
-        <var-decl name='vertexCallBackN' type-id='type-id-18' visibility='default' filepath='libnurbs/interface/glcurveval.h' line='130' column='1'/>
+        <var-decl name='vertexCallBackN' type-id='type-id-21' visibility='default' filepath='libnurbs/interface/glcurveval.h' line='130' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='26880'>
-        <var-decl name='normalCallBackN' type-id='type-id-18' visibility='default' filepath='libnurbs/interface/glcurveval.h' line='131' column='1'/>
+        <var-decl name='normalCallBackN' type-id='type-id-21' visibility='default' filepath='libnurbs/interface/glcurveval.h' line='131' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='26944'>
-        <var-decl name='colorCallBackN' type-id='type-id-18' visibility='default' filepath='libnurbs/interface/glcurveval.h' line='132' column='1'/>
+        <var-decl name='colorCallBackN' type-id='type-id-21' visibility='default' filepath='libnurbs/interface/glcurveval.h' line='132' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='27008'>
-        <var-decl name='texcoordCallBackN' type-id='type-id-18' visibility='default' filepath='libnurbs/interface/glcurveval.h' line='133' column='1'/>
+        <var-decl name='texcoordCallBackN' type-id='type-id-21' visibility='default' filepath='libnurbs/interface/glcurveval.h' line='133' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='27072'>
-        <var-decl name='beginCallBackData' type-id='type-id-19' visibility='default' filepath='libnurbs/interface/glcurveval.h' line='135' column='1'/>
+        <var-decl name='beginCallBackData' type-id='type-id-22' visibility='default' filepath='libnurbs/interface/glcurveval.h' line='135' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='27136'>
-        <var-decl name='endCallBackData' type-id='type-id-20' visibility='default' filepath='libnurbs/interface/glcurveval.h' line='136' column='1'/>
+        <var-decl name='endCallBackData' type-id='type-id-23' visibility='default' filepath='libnurbs/interface/glcurveval.h' line='136' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='27200'>
-        <var-decl name='vertexCallBackData' type-id='type-id-21' visibility='default' filepath='libnurbs/interface/glcurveval.h' line='137' column='1'/>
+        <var-decl name='vertexCallBackData' type-id='type-id-24' visibility='default' filepath='libnurbs/interface/glcurveval.h' line='137' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='27264'>
-        <var-decl name='normalCallBackData' type-id='type-id-21' visibility='default' filepath='libnurbs/interface/glcurveval.h' line='138' column='1'/>
+        <var-decl name='normalCallBackData' type-id='type-id-24' visibility='default' filepath='libnurbs/interface/glcurveval.h' line='138' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='27328'>
-        <var-decl name='colorCallBackData' type-id='type-id-21' visibility='default' filepath='libnurbs/interface/glcurveval.h' line='139' column='1'/>
+        <var-decl name='colorCallBackData' type-id='type-id-24' visibility='default' filepath='libnurbs/interface/glcurveval.h' line='139' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='27392'>
-        <var-decl name='texcoordCallBackData' type-id='type-id-21' visibility='default' filepath='libnurbs/interface/glcurveval.h' line='140' column='1'/>
+        <var-decl name='texcoordCallBackData' type-id='type-id-24' visibility='default' filepath='libnurbs/interface/glcurveval.h' line='140' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='27456'>
-        <var-decl name='userData' type-id='type-id-22' visibility='default' filepath='libnurbs/interface/glcurveval.h' line='142' column='1'/>
+        <var-decl name='userData' type-id='type-id-25' visibility='default' filepath='libnurbs/interface/glcurveval.h' line='142' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='27520'>
-        <var-decl name='output_triangles' type-id='type-id-10' visibility='default' filepath='libnurbs/interface/glcurveval.h' line='154' column='1'/>
+        <var-decl name='output_triangles' type-id='type-id-11' visibility='default' filepath='libnurbs/interface/glcurveval.h' line='154' column='1'/>
       </data-member>
       <member-function access='private' constructor='yes'>
         <function-decl name='OpenGLCurveEvaluator' filepath='libnurbs/interface/glcurveval.cc' line='48' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-23' is-artificial='yes'/>
-          <return type-id='type-id-11'/>
+          <parameter type-id='type-id-26' is-artificial='yes'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
         <function-decl name='addMap' mangled-name='_ZN20OpenGLCurveEvaluator6addMapEP8CurveMap' filepath='libnurbs/interface/glcurveval.cc' line='84' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-23' is-artificial='yes'/>
-          <parameter type-id='type-id-24'/>
-          <return type-id='type-id-11'/>
+          <parameter type-id='type-id-26' is-artificial='yes'/>
+          <parameter type-id='type-id-27'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
         <function-decl name='evalpoint1i' mangled-name='_ZN20OpenGLCurveEvaluator11evalpoint1iEl' filepath='libnurbs/interface/glcurveval.cc' line='287' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-23' is-artificial='yes'/>
-          <parameter type-id='type-id-12'/>
-          <return type-id='type-id-11'/>
+          <parameter type-id='type-id-26' is-artificial='yes'/>
+          <parameter type-id='type-id-15'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
         <function-decl name='put_vertices_call_back' mangled-name='_ZN20OpenGLCurveEvaluator22put_vertices_call_backEi' filepath='libnurbs/interface/glcurveval.h' line='87' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-23' is-artificial='yes'/>
-          <parameter type-id='type-id-10' is-artificial='yes'/>
-          <return type-id='type-id-11'/>
+          <parameter type-id='type-id-26' is-artificial='yes'/>
+          <parameter type-id='type-id-11' is-artificial='yes'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
         <function-decl name='putCallBack' mangled-name='_ZN20OpenGLCurveEvaluator11putCallBackEjPFvvE' filepath='libnurbs/interface/glcurveval.cc' line='305' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-23' is-artificial='yes'/>
-          <parameter type-id='type-id-25'/>
-          <parameter type-id='type-id-26'/>
-          <return type-id='type-id-11'/>
+          <parameter type-id='type-id-26' is-artificial='yes'/>
+          <parameter type-id='type-id-28'/>
+          <parameter type-id='type-id-29'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
         <function-decl name='set_callback_userData' mangled-name='_ZN20OpenGLCurveEvaluator21set_callback_userDataEPv' filepath='libnurbs/interface/glcurveval.h' line='96' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-23' is-artificial='yes'/>
-          <parameter type-id='type-id-22'/>
-          <return type-id='type-id-11'/>
+          <parameter type-id='type-id-26' is-artificial='yes'/>
+          <parameter type-id='type-id-25'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
         <function-decl name='inMap1f' mangled-name='_ZN20OpenGLCurveEvaluator7inMap1fEiiffiiPf' filepath='libnurbs/interface/glcurveval.h' line='115' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-23' is-artificial='yes'/>
-          <parameter type-id='type-id-10'/>
-          <parameter type-id='type-id-10'/>
+          <parameter type-id='type-id-26' is-artificial='yes'/>
+          <parameter type-id='type-id-11'/>
+          <parameter type-id='type-id-11'/>
           <parameter type-id='type-id-1'/>
           <parameter type-id='type-id-1'/>
-          <parameter type-id='type-id-10'/>
-          <parameter type-id='type-id-10'/>
-          <parameter type-id='type-id-13'/>
-          <return type-id='type-id-11'/>
+          <parameter type-id='type-id-11'/>
+          <parameter type-id='type-id-11'/>
+          <parameter type-id='type-id-16'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
         <function-decl name='inPreEvaluate' mangled-name='_ZN20OpenGLCurveEvaluator13inPreEvaluateEifPf' filepath='libnurbs/interface/glcurveval.h' line='123' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-23' is-artificial='yes'/>
-          <parameter type-id='type-id-10'/>
+          <parameter type-id='type-id-26' is-artificial='yes'/>
+          <parameter type-id='type-id-11'/>
           <parameter type-id='type-id-1'/>
-          <parameter type-id='type-id-13'/>
-          <return type-id='type-id-11'/>
+          <parameter type-id='type-id-16'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
         <function-decl name='inDoDomain1' mangled-name='_ZN20OpenGLCurveEvaluator11inDoDomain1EP16curveEvalMachinefPf' filepath='libnurbs/interface/glcurveval.h' line='124' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-23' is-artificial='yes'/>
-          <parameter type-id='type-id-27'/>
+          <parameter type-id='type-id-26' is-artificial='yes'/>
+          <parameter type-id='type-id-30'/>
           <parameter type-id='type-id-1'/>
-          <parameter type-id='type-id-13'/>
-          <return type-id='type-id-11'/>
+          <parameter type-id='type-id-16'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
         <function-decl name='inDoEvalCoord1' mangled-name='_ZN20OpenGLCurveEvaluator14inDoEvalCoord1Ef' filepath='libnurbs/interface/glcurveval.h' line='125' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-23' is-artificial='yes'/>
+          <parameter type-id='type-id-26' is-artificial='yes'/>
           <parameter type-id='type-id-1'/>
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
         <function-decl name='inMapMesh1f' mangled-name='_ZN20OpenGLCurveEvaluator11inMapMesh1fEii' filepath='libnurbs/interface/glcurveval.h' line='126' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-23' is-artificial='yes'/>
-          <parameter type-id='type-id-10'/>
-          <parameter type-id='type-id-10'/>
-          <return type-id='type-id-11'/>
+          <parameter type-id='type-id-26' is-artificial='yes'/>
+          <parameter type-id='type-id-11'/>
+          <parameter type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
         <function-decl name='beginCallBack' mangled-name='_ZN20OpenGLCurveEvaluator13beginCallBackEjPv' filepath='libnurbs/interface/glcurveval.cc' line='350' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-23' is-artificial='yes'/>
+          <parameter type-id='type-id-26' is-artificial='yes'/>
+          <parameter type-id='type-id-28'/>
           <parameter type-id='type-id-25'/>
-          <parameter type-id='type-id-22'/>
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
         <function-decl name='endCallBack' mangled-name='_ZN20OpenGLCurveEvaluator11endCallBackEPv' filepath='libnurbs/interface/glcurveval.cc' line='359' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-23' is-artificial='yes'/>
-          <parameter type-id='type-id-22'/>
-          <return type-id='type-id-11'/>
+          <parameter type-id='type-id-26' is-artificial='yes'/>
+          <parameter type-id='type-id-25'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
         <function-decl name='vertexCallBack' mangled-name='_ZN20OpenGLCurveEvaluator14vertexCallBackEPKfPv' filepath='libnurbs/interface/glcurveval.cc' line='368' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-23' is-artificial='yes'/>
-          <parameter type-id='type-id-28'/>
-          <parameter type-id='type-id-22'/>
-          <return type-id='type-id-11'/>
+          <parameter type-id='type-id-26' is-artificial='yes'/>
+          <parameter type-id='type-id-31'/>
+          <parameter type-id='type-id-25'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
         <function-decl name='normalCallBack' mangled-name='_ZN20OpenGLCurveEvaluator14normalCallBackEPKfPv' filepath='libnurbs/interface/glcurveval.cc' line='378' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-23' is-artificial='yes'/>
-          <parameter type-id='type-id-28'/>
-          <parameter type-id='type-id-22'/>
-          <return type-id='type-id-11'/>
+          <parameter type-id='type-id-26' is-artificial='yes'/>
+          <parameter type-id='type-id-31'/>
+          <parameter type-id='type-id-25'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
         <function-decl name='colorCallBack' mangled-name='_ZN20OpenGLCurveEvaluator13colorCallBackEPKfPv' filepath='libnurbs/interface/glcurveval.cc' line='387' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-23' is-artificial='yes'/>
-          <parameter type-id='type-id-28'/>
-          <parameter type-id='type-id-22'/>
-          <return type-id='type-id-11'/>
+          <parameter type-id='type-id-26' is-artificial='yes'/>
+          <parameter type-id='type-id-31'/>
+          <parameter type-id='type-id-25'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
         <function-decl name='texcoordCallBack' mangled-name='_ZN20OpenGLCurveEvaluator16texcoordCallBackEPKfPv' filepath='libnurbs/interface/glcurveval.cc' line='396' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-23' is-artificial='yes'/>
-          <parameter type-id='type-id-28'/>
-          <parameter type-id='type-id-22'/>
-          <return type-id='type-id-11'/>
+          <parameter type-id='type-id-26' is-artificial='yes'/>
+          <parameter type-id='type-id-31'/>
+          <parameter type-id='type-id-25'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private' destructor='yes' vtable-offset='-1'>
         <function-decl name='~OpenGLCurveEvaluator' filepath='libnurbs/interface/glcurveval.cc' line='78' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-23' is-artificial='yes'/>
-          <parameter type-id='type-id-10' is-artificial='yes'/>
-          <return type-id='type-id-11'/>
+          <parameter type-id='type-id-26' is-artificial='yes'/>
+          <parameter type-id='type-id-11' is-artificial='yes'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private' vtable-offset='9'>
         <function-decl name='domain1f' mangled-name='_ZN20OpenGLCurveEvaluator8domain1fEff' filepath='libnurbs/interface/glcurveval.cc' line='98' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-23' is-artificial='yes'/>
+          <parameter type-id='type-id-26' is-artificial='yes'/>
           <parameter type-id='type-id-1'/>
           <parameter type-id='type-id-1'/>
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private' vtable-offset='10'>
         <function-decl name='range1f' mangled-name='_ZN20OpenGLCurveEvaluator7range1fElPfS0_' filepath='libnurbs/interface/glcurveval.cc' line='90' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-23' is-artificial='yes'/>
-          <parameter type-id='type-id-12'/>
-          <parameter type-id='type-id-13'/>
-          <parameter type-id='type-id-13'/>
-          <return type-id='type-id-11'/>
+          <parameter type-id='type-id-26' is-artificial='yes'/>
+          <parameter type-id='type-id-15'/>
+          <parameter type-id='type-id-16'/>
+          <parameter type-id='type-id-16'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private' vtable-offset='11'>
         <function-decl name='enable' mangled-name='_ZN20OpenGLCurveEvaluator6enableEl' filepath='libnurbs/interface/glcurveval.cc' line='137' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-23' is-artificial='yes'/>
-          <parameter type-id='type-id-12'/>
-          <return type-id='type-id-11'/>
+          <parameter type-id='type-id-26' is-artificial='yes'/>
+          <parameter type-id='type-id-15'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private' vtable-offset='12'>
         <function-decl name='disable' mangled-name='_ZN20OpenGLCurveEvaluator7disableEl' filepath='libnurbs/interface/glcurveval.cc' line='127' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-23' is-artificial='yes'/>
-          <parameter type-id='type-id-12'/>
-          <return type-id='type-id-11'/>
+          <parameter type-id='type-id-26' is-artificial='yes'/>
+          <parameter type-id='type-id-15'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private' vtable-offset='13'>
         <function-decl name='bgnmap1f' mangled-name='_ZN20OpenGLCurveEvaluator8bgnmap1fEl' filepath='libnurbs/interface/glcurveval.cc' line='164' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-23' is-artificial='yes'/>
-          <parameter type-id='type-id-12'/>
-          <return type-id='type-id-11'/>
+          <parameter type-id='type-id-26' is-artificial='yes'/>
+          <parameter type-id='type-id-15'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private' vtable-offset='14'>
         <function-decl name='map1f' mangled-name='_ZN20OpenGLCurveEvaluator5map1fElffllPf' filepath='libnurbs/interface/glcurveval.cc' line='199' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-23' is-artificial='yes'/>
-          <parameter type-id='type-id-12'/>
+          <parameter type-id='type-id-26' is-artificial='yes'/>
+          <parameter type-id='type-id-15'/>
           <parameter type-id='type-id-1'/>
           <parameter type-id='type-id-1'/>
-          <parameter type-id='type-id-12'/>
-          <parameter type-id='type-id-12'/>
-          <parameter type-id='type-id-13'/>
-          <return type-id='type-id-11'/>
+          <parameter type-id='type-id-15'/>
+          <parameter type-id='type-id-15'/>
+          <parameter type-id='type-id-16'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private' vtable-offset='15'>
         <function-decl name='mapgrid1f' mangled-name='_ZN20OpenGLCurveEvaluator9mapgrid1fElff' filepath='libnurbs/interface/glcurveval.cc' line='147' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-23' is-artificial='yes'/>
-          <parameter type-id='type-id-12'/>
+          <parameter type-id='type-id-26' is-artificial='yes'/>
+          <parameter type-id='type-id-15'/>
           <parameter type-id='type-id-1'/>
           <parameter type-id='type-id-1'/>
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private' vtable-offset='16'>
         <function-decl name='mapmesh1f' mangled-name='_ZN20OpenGLCurveEvaluator9mapmesh1fElll' filepath='libnurbs/interface/glcurveval.cc' line='262' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-23' is-artificial='yes'/>
-          <parameter type-id='type-id-12'/>
-          <parameter type-id='type-id-12'/>
-          <parameter type-id='type-id-12'/>
-          <return type-id='type-id-11'/>
+          <parameter type-id='type-id-26' is-artificial='yes'/>
+          <parameter type-id='type-id-15'/>
+          <parameter type-id='type-id-15'/>
+          <parameter type-id='type-id-15'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private' vtable-offset='17'>
         <function-decl name='evalcoord1f' mangled-name='_ZN20OpenGLCurveEvaluator11evalcoord1fElf' filepath='libnurbs/interface/glcurveval.cc' line='296' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-23' is-artificial='yes'/>
-          <parameter type-id='type-id-12'/>
+          <parameter type-id='type-id-26' is-artificial='yes'/>
+          <parameter type-id='type-id-15'/>
           <parameter type-id='type-id-1'/>
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private' vtable-offset='18'>
         <function-decl name='endmap1f' mangled-name='_ZN20OpenGLCurveEvaluator8endmap1fEv' filepath='libnurbs/interface/glcurveval.cc' line='184' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-23' is-artificial='yes'/>
-          <return type-id='type-id-11'/>
+          <parameter type-id='type-id-26' is-artificial='yes'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private' vtable-offset='19'>
         <function-decl name='bgnline' mangled-name='_ZN20OpenGLCurveEvaluator7bgnlineEv' filepath='libnurbs/interface/glcurveval.cc' line='105' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-23' is-artificial='yes'/>
-          <return type-id='type-id-11'/>
+          <parameter type-id='type-id-26' is-artificial='yes'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private' vtable-offset='20'>
         <function-decl name='endline' mangled-name='_ZN20OpenGLCurveEvaluator7endlineEv' filepath='libnurbs/interface/glcurveval.cc' line='114' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-23' is-artificial='yes'/>
-          <return type-id='type-id-11'/>
+          <parameter type-id='type-id-26' is-artificial='yes'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
     </class-decl>
-    <typedef-decl name='curveEvalMachine' type-id='type-id-29' filepath='libnurbs/interface/glcurveval.h' line='64' column='1' id='type-id-15'/>
-    <class-decl name='curveEvalMachine' size-in-bits='6592' is-struct='yes' visibility='default' filepath='libnurbs/interface/glcurveval.h' line='55' column='1' id='type-id-29'>
+    <typedef-decl name='curveEvalMachine' type-id='type-id-32' filepath='libnurbs/interface/glcurveval.h' line='64' column='1' id='type-id-18'/>
+    <class-decl name='curveEvalMachine' size-in-bits='6592' is-struct='yes' visibility='default' filepath='libnurbs/interface/glcurveval.h' line='55' column='1' id='type-id-32'>
       <data-member access='public' layout-offset-in-bits='0'>
         <var-decl name='uprime' type-id='type-id-1' visibility='default' filepath='libnurbs/interface/glcurveval.h' line='56' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='32'>
-        <var-decl name='k' type-id='type-id-10' visibility='default' filepath='libnurbs/interface/glcurveval.h' line='57' column='1'/>
+        <var-decl name='k' type-id='type-id-11' visibility='default' filepath='libnurbs/interface/glcurveval.h' line='57' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
         <var-decl name='u1' type-id='type-id-1' visibility='default' filepath='libnurbs/interface/glcurveval.h' line='58' column='1'/>
@@ -507,10 +571,10 @@
         <var-decl name='u2' type-id='type-id-1' visibility='default' filepath='libnurbs/interface/glcurveval.h' line='59' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
-        <var-decl name='ustride' type-id='type-id-10' visibility='default' filepath='libnurbs/interface/glcurveval.h' line='60' column='1'/>
+        <var-decl name='ustride' type-id='type-id-11' visibility='default' filepath='libnurbs/interface/glcurveval.h' line='60' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='160'>
-        <var-decl name='uorder' type-id='type-id-10' visibility='default' filepath='libnurbs/interface/glcurveval.h' line='61' column='1'/>
+        <var-decl name='uorder' type-id='type-id-11' visibility='default' filepath='libnurbs/interface/glcurveval.h' line='61' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='192'>
         <var-decl name='ctlpoints' type-id='type-id-2' visibility='default' filepath='libnurbs/interface/glcurveval.h' line='62' column='1'/>
@@ -519,91 +583,27 @@
         <var-decl name='ucoeff' type-id='type-id-5' visibility='default' filepath='libnurbs/interface/glcurveval.h' line='63' column='1'/>
       </data-member>
     </class-decl>
-    <typedef-decl name='REAL' type-id='type-id-30' filepath='libnurbs/internals/types.h' line='41' column='1' id='type-id-1'/>
-    <pointer-type-def type-id='type-id-7' size-in-bits='64' id='type-id-9'/>
-    <pointer-type-def type-id='type-id-8' size-in-bits='64' id='type-id-31'/>
-    <pointer-type-def type-id='type-id-32' size-in-bits='64' id='type-id-24'/>
-    <pointer-type-def type-id='type-id-14' size-in-bits='64' id='type-id-23'/>
-    <pointer-type-def type-id='type-id-1' size-in-bits='64' id='type-id-13'/>
-    <qualified-type-def type-id='type-id-33' const='yes' id='type-id-34'/>
-    <pointer-type-def type-id='type-id-34' size-in-bits='64' id='type-id-28'/>
-    <pointer-type-def type-id='type-id-15' size-in-bits='64' id='type-id-27'/>
-    <pointer-type-def type-id='type-id-35' size-in-bits='64' id='type-id-18'/>
-    <pointer-type-def type-id='type-id-36' size-in-bits='64' id='type-id-21'/>
-    <class-decl name='CachingEvaluator' size-in-bits='64' visibility='default' filepath='libnurbs/internals/cachingeval.h' line='39' column='1' is-declaration-only='yes' id='type-id-8'>
-      <member-type access='private'>
-        <enum-decl name='ServiceMode' filepath='libnurbs/internals/cachingeval.h' line='42' column='1' id='type-id-37'>
-          <underlying-type type-id='type-id-38'/>
-          <enumerator name='play' value='0'/>
-          <enumerator name='record' value='1'/>
-          <enumerator name='playAndRecord' value='2'/>
-        </enum-decl>
-      </member-type>
-      <member-function access='private' destructor='yes' vtable-offset='-1'>
-        <function-decl name='~CachingEvaluator' filepath='libnurbs/internals/cachingeval.h' line='41' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-31' is-artificial='yes'/>
-          <parameter type-id='type-id-10' is-artificial='yes'/>
-          <return type-id='type-id-11'/>
-        </function-decl>
-      </member-function>
-      <member-function access='private' vtable-offset='2'>
-        <function-decl name='canRecord' mangled-name='_ZN16CachingEvaluator9canRecordEv' filepath='libnurbs/internals/cachingeval.cc' line='43' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-31' is-artificial='yes'/>
-          <return type-id='type-id-10'/>
-        </function-decl>
-      </member-function>
-      <member-function access='private' vtable-offset='3'>
-        <function-decl name='canPlayAndRecord' mangled-name='_ZN16CachingEvaluator16canPlayAndRecordEv' filepath='libnurbs/internals/cachingeval.cc' line='49' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-31' is-artificial='yes'/>
-          <return type-id='type-id-10'/>
-        </function-decl>
-      </member-function>
-      <member-function access='private' vtable-offset='4'>
-        <function-decl name='createHandle' mangled-name='_ZN16CachingEvaluator12createHandleEi' filepath='libnurbs/internals/cachingeval.cc' line='55' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-31' is-artificial='yes'/>
-          <parameter type-id='type-id-10'/>
-          <return type-id='type-id-10'/>
-        </function-decl>
-      </member-function>
-      <member-function access='private' vtable-offset='5'>
-        <function-decl name='beginOutput' mangled-name='_ZN16CachingEvaluator11beginOutputENS_11ServiceModeEi' filepath='libnurbs/internals/cachingeval.cc' line='61' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-31' is-artificial='yes'/>
-          <parameter type-id='type-id-37'/>
-          <parameter type-id='type-id-10'/>
-          <return type-id='type-id-11'/>
-        </function-decl>
-      </member-function>
-      <member-function access='private' vtable-offset='6'>
-        <function-decl name='endOutput' mangled-name='_ZN16CachingEvaluator9endOutputEv' filepath='libnurbs/internals/cachingeval.cc' line='66' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-31' is-artificial='yes'/>
-          <return type-id='type-id-11'/>
-        </function-decl>
-      </member-function>
-      <member-function access='private' vtable-offset='7'>
-        <function-decl name='discardRecording' mangled-name='_ZN16CachingEvaluator16discardRecordingEi' filepath='libnurbs/internals/cachingeval.cc' line='71' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-31' is-artificial='yes'/>
-          <parameter type-id='type-id-10' is-artificial='yes'/>
-          <return type-id='type-id-11'/>
-        </function-decl>
-      </member-function>
-      <member-function access='private' vtable-offset='8'>
-        <function-decl name='playRecording' mangled-name='_ZN16CachingEvaluator13playRecordingEi' filepath='libnurbs/internals/cachingeval.cc' line='76' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-31' is-artificial='yes'/>
-          <parameter type-id='type-id-10' is-artificial='yes'/>
-          <return type-id='type-id-11'/>
-        </function-decl>
-      </member-function>
-    </class-decl>
-    <function-type size-in-bits='64' id='type-id-35'>
-      <parameter type-id='type-id-28'/>
-      <return type-id='type-id-11'/>
+    <typedef-decl name='REAL' type-id='type-id-33' filepath='libnurbs/internals/types.h' line='41' column='1' id='type-id-1'/>
+    <pointer-type-def type-id='type-id-13' size-in-bits='64' id='type-id-14'/>
+    <pointer-type-def type-id='type-id-7' size-in-bits='64' id='type-id-10'/>
+    <pointer-type-def type-id='type-id-34' size-in-bits='64' id='type-id-27'/>
+    <pointer-type-def type-id='type-id-17' size-in-bits='64' id='type-id-26'/>
+    <pointer-type-def type-id='type-id-1' size-in-bits='64' id='type-id-16'/>
+    <qualified-type-def type-id='type-id-35' const='yes' id='type-id-36'/>
+    <pointer-type-def type-id='type-id-36' size-in-bits='64' id='type-id-31'/>
+    <pointer-type-def type-id='type-id-18' size-in-bits='64' id='type-id-30'/>
+    <pointer-type-def type-id='type-id-37' size-in-bits='64' id='type-id-21'/>
+    <pointer-type-def type-id='type-id-38' size-in-bits='64' id='type-id-24'/>
+    <function-type size-in-bits='64' id='type-id-37'>
+      <parameter type-id='type-id-31'/>
+      <return type-id='type-id-12'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-36'>
-      <parameter type-id='type-id-28'/>
-      <parameter type-id='type-id-22'/>
-      <return type-id='type-id-11'/>
+    <function-type size-in-bits='64' id='type-id-38'>
+      <parameter type-id='type-id-31'/>
+      <parameter type-id='type-id-25'/>
+      <return type-id='type-id-12'/>
     </function-type>
-    <class-decl name='CurveMap' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-32'/>
+    <class-decl name='CurveMap' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-34'/>
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='libnurbs/interface/glinterface.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-T0fsxk/Mesa-8.0.5/src/glu/sgi' language='LANG_C_plus_plus'>
     <class-decl name='GLUnurbs' size-in-bits='1149440' is-struct='yes' visibility='default' filepath='libnurbs/interface/glrenderer.h' line='49' column='1' id='type-id-39'>
@@ -618,31 +618,31 @@
         <var-decl name='surfaceEvaluator' type-id='type-id-43' visibility='default' filepath='libnurbs/interface/glrenderer.h' line='131' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='1121792'>
-        <var-decl name='curveEvaluator' type-id='type-id-14' visibility='default' filepath='libnurbs/interface/glrenderer.h' line='132' column='1'/>
+        <var-decl name='curveEvaluator' type-id='type-id-17' visibility='default' filepath='libnurbs/interface/glrenderer.h' line='132' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='1149376'>
-        <var-decl name='callbackFlag' type-id='type-id-10' visibility='default' filepath='libnurbs/interface/glrenderer.h' line='143' column='1'/>
+        <var-decl name='callbackFlag' type-id='type-id-11' visibility='default' filepath='libnurbs/interface/glrenderer.h' line='143' column='1'/>
       </data-member>
       <member-function access='public'>
         <function-decl name='setNurbsCallbackData' mangled-name='_ZN8GLUnurbs20setNurbsCallbackDataEPv' filepath='libnurbs/interface/glrenderer.h' line='104' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-44' is-artificial='yes'/>
-          <parameter type-id='type-id-22'/>
-          <return type-id='type-id-11'/>
+          <parameter type-id='type-id-25'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
         <function-decl name='putSurfCallBack' mangled-name='_ZN8GLUnurbs15putSurfCallBackEjPFvvE' filepath='libnurbs/interface/glrenderer.h' line='77' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-44' is-artificial='yes'/>
-          <parameter type-id='type-id-25'/>
-          <parameter type-id='type-id-26'/>
-          <return type-id='type-id-11'/>
+          <parameter type-id='type-id-28'/>
+          <parameter type-id='type-id-29'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
         <function-decl name='postError' mangled-name='_ZN8GLUnurbs9postErrorEi' filepath='libnurbs/interface/glrenderer.h' line='72' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-44' is-artificial='yes'/>
-          <parameter type-id='type-id-10'/>
-          <return type-id='type-id-11'/>
+          <parameter type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
@@ -654,81 +654,81 @@
       <member-function access='public'>
         <function-decl name='is_callback' mangled-name='_ZN8GLUnurbs11is_callbackEv' filepath='libnurbs/interface/glrenderer.h' line='118' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-44' is-artificial='yes'/>
-          <return type-id='type-id-10'/>
+          <return type-id='type-id-11'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
         <function-decl name='setautoloadmode' mangled-name='_ZN8GLUnurbs15setautoloadmodeEf' filepath='libnurbs/interface/glrenderer.h' line='62' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-44' is-artificial='yes'/>
-          <parameter type-id='type-id-30'/>
-          <return type-id='type-id-11'/>
+          <parameter type-id='type-id-33'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
         <function-decl name='put_callbackFlag' mangled-name='_ZN8GLUnurbs16put_callbackFlagEi' filepath='libnurbs/interface/glrenderer.h' line='122' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-44' is-artificial='yes'/>
-          <parameter type-id='type-id-10'/>
-          <return type-id='type-id-11'/>
+          <parameter type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
         <function-decl name='LOD_eval_list' mangled-name='_ZN8GLUnurbs13LOD_eval_listEi' filepath='libnurbs/interface/glrenderer.h' line='112' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-44' is-artificial='yes'/>
-          <parameter type-id='type-id-10'/>
-          <return type-id='type-id-11'/>
+          <parameter type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public' constructor='yes'>
         <function-decl name='GLUnurbs' filepath='libnurbs/interface/glrenderer.cc' line='42' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-44' is-artificial='yes'/>
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
         <function-decl name='loadGLMatrices' mangled-name='_ZN8GLUnurbs14loadGLMatricesEv' filepath='libnurbs/interface/glrenderer.cc' line='129' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-44' is-artificial='yes'/>
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
         <function-decl name='useGLMatrices' mangled-name='_ZN8GLUnurbs13useGLMatricesEPKfS1_PKi' filepath='libnurbs/interface/glrenderer.cc' line='141' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-44' is-artificial='yes'/>
-          <parameter type-id='type-id-28'/>
-          <parameter type-id='type-id-28'/>
+          <parameter type-id='type-id-31'/>
+          <parameter type-id='type-id-31'/>
           <parameter type-id='type-id-45'/>
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
         <function-decl name='setSamplingMatrixIdentity' mangled-name='_ZN8GLUnurbs25setSamplingMatrixIdentityEv' filepath='libnurbs/interface/glrenderer.cc' line='171' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-44' is-artificial='yes'/>
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
         <function-decl name='get_vertices_call_back' mangled-name='_ZN8GLUnurbs22get_vertices_call_backEv' filepath='libnurbs/interface/glrenderer.h' line='84' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-44' is-artificial='yes'/>
-          <return type-id='type-id-10'/>
+          <return type-id='type-id-11'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
         <function-decl name='put_vertices_call_back' mangled-name='_ZN8GLUnurbs22put_vertices_call_backEi' filepath='libnurbs/interface/glrenderer.h' line='89' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-44' is-artificial='yes'/>
-          <parameter type-id='type-id-10'/>
-          <return type-id='type-id-11'/>
+          <parameter type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
         <function-decl name='get_callback_auto_normal' mangled-name='_ZN8GLUnurbs24get_callback_auto_normalEv' filepath='libnurbs/interface/glrenderer.h' line='94' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-44' is-artificial='yes'/>
-          <return type-id='type-id-10'/>
+          <return type-id='type-id-11'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
         <function-decl name='put_callback_auto_normal' mangled-name='_ZN8GLUnurbs24put_callback_auto_normalEi' filepath='libnurbs/interface/glrenderer.h' line='99' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-44' is-artificial='yes'/>
-          <parameter type-id='type-id-10'/>
-          <return type-id='type-id-11'/>
+          <parameter type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -736,20 +736,20 @@
           <parameter type-id='type-id-44' is-artificial='yes'/>
           <parameter type-id='type-id-46'/>
           <parameter type-id='type-id-45'/>
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
         <function-decl name='loadCullingMatrix' mangled-name='_ZN8GLUnurbs17loadCullingMatrixEPA4_f' filepath='libnurbs/interface/glrenderer.cc' line='237' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-44' is-artificial='yes'/>
           <parameter type-id='type-id-46'/>
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private' static='yes'>
         <function-decl name='grabGLMatrix' mangled-name='_ZN8GLUnurbs12grabGLMatrixEPA4_f' filepath='libnurbs/interface/glrenderer.cc' line='159' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-46'/>
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private' static='yes'>
@@ -757,7 +757,7 @@
           <parameter type-id='type-id-47'/>
           <parameter type-id='type-id-47'/>
           <parameter type-id='type-id-46'/>
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private' static='yes'>
@@ -765,26 +765,26 @@
           <parameter type-id='type-id-46'/>
           <parameter type-id='type-id-46'/>
           <parameter type-id='type-id-46'/>
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public' vtable-offset='2'>
         <function-decl name='bgnrender' mangled-name='_ZN8GLUnurbs9bgnrenderEv' filepath='libnurbs/interface/glrenderer.cc' line='107' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-44' is-artificial='yes'/>
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public' vtable-offset='3'>
         <function-decl name='endrender' mangled-name='_ZN8GLUnurbs9endrenderEv' filepath='libnurbs/interface/glrenderer.cc' line='115' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-44' is-artificial='yes'/>
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public' vtable-offset='6'>
         <function-decl name='errorHandler' mangled-name='_ZN8GLUnurbs12errorHandlerEi' filepath='libnurbs/interface/glrenderer.cc' line='120' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-44' is-artificial='yes'/>
-          <parameter type-id='type-id-10'/>
-          <return type-id='type-id-11'/>
+          <parameter type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
     </class-decl>
@@ -794,13 +794,13 @@
         <var-decl name='vertexCache' type-id='type-id-49' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='180' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='256'>
-        <var-decl name='tmeshing' type-id='type-id-10' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='181' column='1'/>
+        <var-decl name='tmeshing' type-id='type-id-11' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='181' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='288'>
-        <var-decl name='which' type-id='type-id-10' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='182' column='1'/>
+        <var-decl name='which' type-id='type-id-11' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='182' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='320'>
-        <var-decl name='vcount' type-id='type-id-10' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='183' column='1'/>
+        <var-decl name='vcount' type-id='type-id-11' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='183' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='352'>
         <var-decl name='gl_polygon_mode' type-id='type-id-50' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='185' column='1'/>
@@ -809,55 +809,55 @@
         <var-decl name='global_bpm' type-id='type-id-51' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='188' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='512'>
-        <var-decl name='output_triangles' type-id='type-id-10' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='189' column='1'/>
+        <var-decl name='output_triangles' type-id='type-id-11' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='189' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='576'>
-        <var-decl name='beginCallBackN' type-id='type-id-16' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='193' column='1'/>
+        <var-decl name='beginCallBackN' type-id='type-id-19' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='193' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='640'>
-        <var-decl name='endCallBackN' type-id='type-id-17' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='194' column='1'/>
+        <var-decl name='endCallBackN' type-id='type-id-20' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='194' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='704'>
-        <var-decl name='vertexCallBackN' type-id='type-id-18' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='195' column='1'/>
+        <var-decl name='vertexCallBackN' type-id='type-id-21' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='195' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='768'>
-        <var-decl name='normalCallBackN' type-id='type-id-18' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='196' column='1'/>
+        <var-decl name='normalCallBackN' type-id='type-id-21' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='196' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='832'>
-        <var-decl name='colorCallBackN' type-id='type-id-18' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='197' column='1'/>
+        <var-decl name='colorCallBackN' type-id='type-id-21' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='197' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='896'>
-        <var-decl name='texcoordCallBackN' type-id='type-id-18' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='198' column='1'/>
+        <var-decl name='texcoordCallBackN' type-id='type-id-21' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='198' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='960'>
-        <var-decl name='beginCallBackData' type-id='type-id-19' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='200' column='1'/>
+        <var-decl name='beginCallBackData' type-id='type-id-22' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='200' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='1024'>
-        <var-decl name='endCallBackData' type-id='type-id-20' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='201' column='1'/>
+        <var-decl name='endCallBackData' type-id='type-id-23' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='201' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='1088'>
-        <var-decl name='vertexCallBackData' type-id='type-id-21' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='202' column='1'/>
+        <var-decl name='vertexCallBackData' type-id='type-id-24' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='202' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='1152'>
-        <var-decl name='normalCallBackData' type-id='type-id-21' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='203' column='1'/>
+        <var-decl name='normalCallBackData' type-id='type-id-24' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='203' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='1216'>
-        <var-decl name='colorCallBackData' type-id='type-id-21' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='204' column='1'/>
+        <var-decl name='colorCallBackData' type-id='type-id-24' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='204' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='1280'>
-        <var-decl name='texcoordCallBackData' type-id='type-id-21' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='205' column='1'/>
+        <var-decl name='texcoordCallBackData' type-id='type-id-24' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='205' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='1344'>
-        <var-decl name='userData' type-id='type-id-22' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='215' column='1'/>
+        <var-decl name='userData' type-id='type-id-25' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='215' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='1408'>
-        <var-decl name='LOD_eval_level' type-id='type-id-10' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='222' column='1'/>
+        <var-decl name='LOD_eval_level' type-id='type-id-11' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='222' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='1440'>
-        <var-decl name='global_uorder' type-id='type-id-10' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='231' column='1'/>
+        <var-decl name='global_uorder' type-id='type-id-11' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='231' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='1472'>
-        <var-decl name='global_vorder' type-id='type-id-10' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='232' column='1'/>
+        <var-decl name='global_vorder' type-id='type-id-11' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='232' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='1504'>
         <var-decl name='global_uprime' type-id='type-id-1' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='233' column='1'/>
@@ -872,16 +872,16 @@
         <var-decl name='global_uprime_BU' type-id='type-id-1' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='236' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='1632'>
-        <var-decl name='global_uorder_BV' type-id='type-id-10' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='237' column='1'/>
+        <var-decl name='global_uorder_BV' type-id='type-id-11' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='237' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='1664'>
-        <var-decl name='global_vorder_BV' type-id='type-id-10' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='238' column='1'/>
+        <var-decl name='global_vorder_BV' type-id='type-id-11' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='238' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='1696'>
-        <var-decl name='global_uorder_BU' type-id='type-id-10' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='239' column='1'/>
+        <var-decl name='global_uorder_BU' type-id='type-id-11' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='239' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='1728'>
-        <var-decl name='global_vorder_BU' type-id='type-id-10' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='240' column='1'/>
+        <var-decl name='global_vorder_BU' type-id='type-id-11' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='240' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='1760'>
         <var-decl name='global_ucoeff' type-id='type-id-5' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='242' column='1'/>
@@ -908,10 +908,10 @@
         <var-decl name='global_PBU' type-id='type-id-52' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='250' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='27392'>
-        <var-decl name='global_baseData' type-id='type-id-13' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='251' column='1'/>
+        <var-decl name='global_baseData' type-id='type-id-16' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='251' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='27456'>
-        <var-decl name='global_ev_k' type-id='type-id-10' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='253' column='1'/>
+        <var-decl name='global_ev_k' type-id='type-id-11' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='253' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='27488'>
         <var-decl name='global_ev_u1' type-id='type-id-1' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='254' column='1'/>
@@ -920,10 +920,10 @@
         <var-decl name='global_ev_u2' type-id='type-id-1' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='255' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='27552'>
-        <var-decl name='global_ev_ustride' type-id='type-id-10' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='256' column='1'/>
+        <var-decl name='global_ev_ustride' type-id='type-id-11' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='256' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='27584'>
-        <var-decl name='global_ev_uorder' type-id='type-id-10' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='257' column='1'/>
+        <var-decl name='global_ev_uorder' type-id='type-id-11' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='257' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='27616'>
         <var-decl name='global_ev_v1' type-id='type-id-1' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='258' column='1'/>
@@ -932,10 +932,10 @@
         <var-decl name='global_ev_v2' type-id='type-id-1' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='259' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='27680'>
-        <var-decl name='global_ev_vstride' type-id='type-id-10' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='260' column='1'/>
+        <var-decl name='global_ev_vstride' type-id='type-id-11' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='260' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='27712'>
-        <var-decl name='global_ev_vorder' type-id='type-id-10' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='261' column='1'/>
+        <var-decl name='global_ev_vorder' type-id='type-id-11' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='261' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='27744'>
         <var-decl name='global_ev_ctlPoints' type-id='type-id-53' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='262' column='1'/>
@@ -947,7 +947,7 @@
         <var-decl name='global_grid_u1' type-id='type-id-1' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='265' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='232608'>
-        <var-decl name='global_grid_nu' type-id='type-id-10' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='266' column='1'/>
+        <var-decl name='global_grid_nu' type-id='type-id-11' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='266' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='232640'>
         <var-decl name='global_grid_v0' type-id='type-id-1' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='267' column='1'/>
@@ -956,7 +956,7 @@
         <var-decl name='global_grid_v1' type-id='type-id-1' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='268' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='232704'>
-        <var-decl name='global_grid_nv' type-id='type-id-10' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='269' column='1'/>
+        <var-decl name='global_grid_nv' type-id='type-id-11' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='269' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='232736'>
         <var-decl name='em_vertex' type-id='type-id-54' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='349' column='1'/>
@@ -971,48 +971,48 @@
         <var-decl name='em_texcoord' type-id='type-id-54' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='352' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='1073824'>
-        <var-decl name='auto_normal_flag' type-id='type-id-10' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='354' column='1'/>
+        <var-decl name='auto_normal_flag' type-id='type-id-11' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='354' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='1073856'>
-        <var-decl name='callback_auto_normal' type-id='type-id-10' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='356' column='1'/>
+        <var-decl name='callback_auto_normal' type-id='type-id-11' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='356' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='1073888'>
-        <var-decl name='vertex_flag' type-id='type-id-10' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='357' column='1'/>
+        <var-decl name='vertex_flag' type-id='type-id-11' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='357' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='1073920'>
-        <var-decl name='normal_flag' type-id='type-id-10' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='358' column='1'/>
+        <var-decl name='normal_flag' type-id='type-id-11' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='358' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='1073952'>
-        <var-decl name='color_flag' type-id='type-id-10' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='359' column='1'/>
+        <var-decl name='color_flag' type-id='type-id-11' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='359' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='1073984'>
-        <var-decl name='texcoord_flag' type-id='type-id-10' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='360' column='1'/>
+        <var-decl name='texcoord_flag' type-id='type-id-11' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='360' column='1'/>
       </data-member>
       <member-function access='public'>
         <function-decl name='set_callback_userData' mangled-name='_ZN22OpenGLSurfaceEvaluator21set_callback_userDataEPv' filepath='libnurbs/interface/glsurfeval.h' line='168' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-55' is-artificial='yes'/>
-          <parameter type-id='type-id-22'/>
-          <return type-id='type-id-11'/>
+          <parameter type-id='type-id-25'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
         <function-decl name='put_vertices_call_back' mangled-name='_ZN22OpenGLSurfaceEvaluator22put_vertices_call_backEi' filepath='libnurbs/interface/glsurfeval.h' line='153' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-55' is-artificial='yes'/>
-          <parameter type-id='type-id-10'/>
-          <return type-id='type-id-11'/>
+          <parameter type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public' constructor='yes'>
         <function-decl name='OpenGLSurfaceEvaluator' filepath='libnurbs/interface/glsurfeval.cc' line='99' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-55' is-artificial='yes'/>
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
         <function-decl name='addMap' mangled-name='_ZN22OpenGLSurfaceEvaluator6addMapEP10SurfaceMap' filepath='libnurbs/interface/glsurfeval.h' line='107' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-55' is-artificial='yes'/>
           <parameter type-id='type-id-56'/>
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
@@ -1020,15 +1020,15 @@
           <parameter type-id='type-id-55' is-artificial='yes'/>
           <parameter type-id='type-id-1'/>
           <parameter type-id='type-id-1'/>
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
         <function-decl name='point2i' mangled-name='_ZN22OpenGLSurfaceEvaluator7point2iEll' filepath='libnurbs/interface/glsurfeval.cc' line='1069' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-55' is-artificial='yes'/>
-          <parameter type-id='type-id-12'/>
-          <parameter type-id='type-id-12'/>
-          <return type-id='type-id-11'/>
+          <parameter type-id='type-id-15'/>
+          <parameter type-id='type-id-15'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
@@ -1036,172 +1036,172 @@
           <parameter type-id='type-id-55' is-artificial='yes'/>
           <parameter type-id='type-id-1'/>
           <parameter type-id='type-id-1'/>
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
         <function-decl name='newtmeshvert' mangled-name='_ZN22OpenGLSurfaceEvaluator12newtmeshvertEll' filepath='libnurbs/interface/glsurfeval.cc' line='1134' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-55' is-artificial='yes'/>
-          <parameter type-id='type-id-12'/>
-          <parameter type-id='type-id-12'/>
-          <return type-id='type-id-11'/>
+          <parameter type-id='type-id-15'/>
+          <parameter type-id='type-id-15'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
         <function-decl name='putCallBack' mangled-name='_ZN22OpenGLSurfaceEvaluator11putCallBackEjPFvvE' filepath='libnurbs/interface/glsurfeval.cc' line='1190' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-55' is-artificial='yes'/>
-          <parameter type-id='type-id-25'/>
-          <parameter type-id='type-id-26'/>
-          <return type-id='type-id-11'/>
+          <parameter type-id='type-id-28'/>
+          <parameter type-id='type-id-29'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
         <function-decl name='get_vertices_call_back' mangled-name='_ZN22OpenGLSurfaceEvaluator22get_vertices_call_backEv' filepath='libnurbs/interface/glsurfeval.h' line='149' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-55' is-artificial='yes'/>
-          <return type-id='type-id-10'/>
+          <return type-id='type-id-11'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
         <function-decl name='put_callback_auto_normal' mangled-name='_ZN22OpenGLSurfaceEvaluator24put_callback_auto_normalEi' filepath='libnurbs/interface/glsurfeval.h' line='158' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-55' is-artificial='yes'/>
-          <parameter type-id='type-id-10'/>
-          <return type-id='type-id-11'/>
+          <parameter type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
         <function-decl name='get_callback_auto_normal' mangled-name='_ZN22OpenGLSurfaceEvaluator24get_callback_auto_normalEv' filepath='libnurbs/interface/glsurfeval.h' line='163' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-55' is-artificial='yes'/>
-          <return type-id='type-id-10'/>
+          <return type-id='type-id-11'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
         <function-decl name='LOD_eval_list' mangled-name='_ZN22OpenGLSurfaceEvaluator13LOD_eval_listEi' filepath='libnurbs/interface/glsurfeval.cc' line='84' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-55' is-artificial='yes'/>
-          <parameter type-id='type-id-10'/>
-          <return type-id='type-id-11'/>
+          <parameter type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
         <function-decl name='beginCallBack' mangled-name='_ZN22OpenGLSurfaceEvaluator13beginCallBackEjPv' filepath='libnurbs/interface/glsurfeval.cc' line='1237' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-55' is-artificial='yes'/>
+          <parameter type-id='type-id-28'/>
           <parameter type-id='type-id-25'/>
-          <parameter type-id='type-id-22'/>
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
         <function-decl name='endCallBack' mangled-name='_ZN22OpenGLSurfaceEvaluator11endCallBackEPv' filepath='libnurbs/interface/glsurfeval.cc' line='1246' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-55' is-artificial='yes'/>
-          <parameter type-id='type-id-22'/>
-          <return type-id='type-id-11'/>
+          <parameter type-id='type-id-25'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
         <function-decl name='vertexCallBack' mangled-name='_ZN22OpenGLSurfaceEvaluator14vertexCallBackEPKfPv' filepath='libnurbs/interface/glsurfeval.cc' line='1255' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-55' is-artificial='yes'/>
-          <parameter type-id='type-id-28'/>
-          <parameter type-id='type-id-22'/>
-          <return type-id='type-id-11'/>
+          <parameter type-id='type-id-31'/>
+          <parameter type-id='type-id-25'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
         <function-decl name='normalCallBack' mangled-name='_ZN22OpenGLSurfaceEvaluator14normalCallBackEPKfPv' filepath='libnurbs/interface/glsurfeval.cc' line='1265' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-55' is-artificial='yes'/>
-          <parameter type-id='type-id-28'/>
-          <parameter type-id='type-id-22'/>
-          <return type-id='type-id-11'/>
+          <parameter type-id='type-id-31'/>
+          <parameter type-id='type-id-25'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
         <function-decl name='colorCallBack' mangled-name='_ZN22OpenGLSurfaceEvaluator13colorCallBackEPKfPv' filepath='libnurbs/interface/glsurfeval.cc' line='1274' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-55' is-artificial='yes'/>
-          <parameter type-id='type-id-28'/>
-          <parameter type-id='type-id-22'/>
-          <return type-id='type-id-11'/>
+          <parameter type-id='type-id-31'/>
+          <parameter type-id='type-id-25'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
         <function-decl name='texcoordCallBack' mangled-name='_ZN22OpenGLSurfaceEvaluator16texcoordCallBackEPKfPv' filepath='libnurbs/interface/glsurfeval.cc' line='1283' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-55' is-artificial='yes'/>
-          <parameter type-id='type-id-28'/>
-          <parameter type-id='type-id-22'/>
-          <return type-id='type-id-11'/>
+          <parameter type-id='type-id-31'/>
+          <parameter type-id='type-id-25'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
         <function-decl name='LOD_triangle' mangled-name='_ZN22OpenGLSurfaceEvaluator12LOD_triangleEPfS0_S0_i' filepath='libnurbs/interface/glsurfeval.h' line='218' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-55' is-artificial='yes'/>
-          <parameter type-id='type-id-13'/>
-          <parameter type-id='type-id-13'/>
-          <parameter type-id='type-id-13'/>
-          <parameter type-id='type-id-10'/>
-          <return type-id='type-id-11'/>
+          <parameter type-id='type-id-16'/>
+          <parameter type-id='type-id-16'/>
+          <parameter type-id='type-id-16'/>
+          <parameter type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
         <function-decl name='LOD_eval' mangled-name='_ZN22OpenGLSurfaceEvaluator8LOD_evalEiPfii' filepath='libnurbs/interface/glsurfeval.h' line='220' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-55' is-artificial='yes'/>
-          <parameter type-id='type-id-10'/>
-          <parameter type-id='type-id-13'/>
-          <parameter type-id='type-id-10'/>
-          <parameter type-id='type-id-10'/>
-          <return type-id='type-id-11'/>
+          <parameter type-id='type-id-11'/>
+          <parameter type-id='type-id-16'/>
+          <parameter type-id='type-id-11'/>
+          <parameter type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
         <function-decl name='inDoDomain2WithDerivs' mangled-name='_ZN22OpenGLSurfaceEvaluator21inDoDomain2WithDerivsEiffffiffiPfS0_S0_S0_' filepath='libnurbs/interface/glsurfeval.h' line='272' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-55' is-artificial='yes'/>
-          <parameter type-id='type-id-10'/>
+          <parameter type-id='type-id-11'/>
           <parameter type-id='type-id-1'/>
           <parameter type-id='type-id-1'/>
           <parameter type-id='type-id-1'/>
           <parameter type-id='type-id-1'/>
-          <parameter type-id='type-id-10'/>
+          <parameter type-id='type-id-11'/>
           <parameter type-id='type-id-1'/>
           <parameter type-id='type-id-1'/>
-          <parameter type-id='type-id-10'/>
-          <parameter type-id='type-id-13'/>
-          <parameter type-id='type-id-13'/>
-          <parameter type-id='type-id-13'/>
-          <parameter type-id='type-id-13'/>
-          <return type-id='type-id-11'/>
+          <parameter type-id='type-id-11'/>
+          <parameter type-id='type-id-16'/>
+          <parameter type-id='type-id-16'/>
+          <parameter type-id='type-id-16'/>
+          <parameter type-id='type-id-16'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
         <function-decl name='inPreEvaluate' mangled-name='_ZN22OpenGLSurfaceEvaluator13inPreEvaluateEifPf' filepath='libnurbs/interface/glsurfeval.h' line='277' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-55' is-artificial='yes'/>
-          <parameter type-id='type-id-10'/>
+          <parameter type-id='type-id-11'/>
           <parameter type-id='type-id-1'/>
-          <parameter type-id='type-id-13'/>
-          <return type-id='type-id-11'/>
+          <parameter type-id='type-id-16'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
         <function-decl name='inPreEvaluateWithDeriv' mangled-name='_ZN22OpenGLSurfaceEvaluator22inPreEvaluateWithDerivEifPfS0_' filepath='libnurbs/interface/glsurfeval.h' line='278' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-55' is-artificial='yes'/>
-          <parameter type-id='type-id-10'/>
+          <parameter type-id='type-id-11'/>
           <parameter type-id='type-id-1'/>
-          <parameter type-id='type-id-13'/>
-          <parameter type-id='type-id-13'/>
-          <return type-id='type-id-11'/>
+          <parameter type-id='type-id-16'/>
+          <parameter type-id='type-id-16'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
         <function-decl name='inComputeFirstPartials' mangled-name='_ZN22OpenGLSurfaceEvaluator22inComputeFirstPartialsEPfS0_S0_' filepath='libnurbs/interface/glsurfeval.h' line='279' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-55' is-artificial='yes'/>
-          <parameter type-id='type-id-13'/>
-          <parameter type-id='type-id-13'/>
-          <parameter type-id='type-id-13'/>
-          <return type-id='type-id-11'/>
+          <parameter type-id='type-id-16'/>
+          <parameter type-id='type-id-16'/>
+          <parameter type-id='type-id-16'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
         <function-decl name='inComputeNormal2' mangled-name='_ZN22OpenGLSurfaceEvaluator16inComputeNormal2EPfS0_S0_' filepath='libnurbs/interface/glsurfeval.h' line='280' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-55' is-artificial='yes'/>
-          <parameter type-id='type-id-13'/>
-          <parameter type-id='type-id-13'/>
-          <parameter type-id='type-id-13'/>
-          <return type-id='type-id-11'/>
+          <parameter type-id='type-id-16'/>
+          <parameter type-id='type-id-16'/>
+          <parameter type-id='type-id-16'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -1209,55 +1209,55 @@
           <parameter type-id='type-id-55' is-artificial='yes'/>
           <parameter type-id='type-id-1'/>
           <parameter type-id='type-id-1'/>
-          <parameter type-id='type-id-13'/>
-          <parameter type-id='type-id-13'/>
-          <return type-id='type-id-11'/>
+          <parameter type-id='type-id-16'/>
+          <parameter type-id='type-id-16'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
         <function-decl name='inMap2f' mangled-name='_ZN22OpenGLSurfaceEvaluator7inMap2fEiffiiffiiPf' filepath='libnurbs/interface/glsurfeval.h' line='285' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-55' is-artificial='yes'/>
-          <parameter type-id='type-id-10'/>
+          <parameter type-id='type-id-11'/>
           <parameter type-id='type-id-1'/>
           <parameter type-id='type-id-1'/>
-          <parameter type-id='type-id-10'/>
-          <parameter type-id='type-id-10'/>
+          <parameter type-id='type-id-11'/>
+          <parameter type-id='type-id-11'/>
           <parameter type-id='type-id-1'/>
           <parameter type-id='type-id-1'/>
-          <parameter type-id='type-id-10'/>
-          <parameter type-id='type-id-10'/>
-          <parameter type-id='type-id-13'/>
-          <return type-id='type-id-11'/>
+          <parameter type-id='type-id-11'/>
+          <parameter type-id='type-id-11'/>
+          <parameter type-id='type-id-16'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
         <function-decl name='inMapGrid2f' mangled-name='_ZN22OpenGLSurfaceEvaluator11inMapGrid2fEiffiff' filepath='libnurbs/interface/glsurfeval.h' line='296' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-55' is-artificial='yes'/>
-          <parameter type-id='type-id-10'/>
+          <parameter type-id='type-id-11'/>
           <parameter type-id='type-id-1'/>
           <parameter type-id='type-id-1'/>
-          <parameter type-id='type-id-10'/>
+          <parameter type-id='type-id-11'/>
           <parameter type-id='type-id-1'/>
           <parameter type-id='type-id-1'/>
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
         <function-decl name='inEvalMesh2' mangled-name='_ZN22OpenGLSurfaceEvaluator11inEvalMesh2Eiiii' filepath='libnurbs/interface/glsurfeval.h' line='299' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-55' is-artificial='yes'/>
-          <parameter type-id='type-id-10'/>
-          <parameter type-id='type-id-10'/>
-          <parameter type-id='type-id-10'/>
-          <parameter type-id='type-id-10'/>
-          <return type-id='type-id-11'/>
+          <parameter type-id='type-id-11'/>
+          <parameter type-id='type-id-11'/>
+          <parameter type-id='type-id-11'/>
+          <parameter type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
         <function-decl name='inEvalPoint2' mangled-name='_ZN22OpenGLSurfaceEvaluator12inEvalPoint2Eii' filepath='libnurbs/interface/glsurfeval.h' line='300' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-55' is-artificial='yes'/>
-          <parameter type-id='type-id-10'/>
-          <parameter type-id='type-id-10'/>
-          <return type-id='type-id-11'/>
+          <parameter type-id='type-id-11'/>
+          <parameter type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -1265,146 +1265,146 @@
           <parameter type-id='type-id-55' is-artificial='yes'/>
           <parameter type-id='type-id-1'/>
           <parameter type-id='type-id-1'/>
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
         <function-decl name='inEvalULine' mangled-name='_ZN22OpenGLSurfaceEvaluator11inEvalULineEifPfiPA3_fS2_' filepath='libnurbs/interface/glsurfeval.h' line='303' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-55' is-artificial='yes'/>
-          <parameter type-id='type-id-10'/>
+          <parameter type-id='type-id-11'/>
           <parameter type-id='type-id-1'/>
-          <parameter type-id='type-id-13'/>
-          <parameter type-id='type-id-10'/>
+          <parameter type-id='type-id-16'/>
+          <parameter type-id='type-id-11'/>
           <parameter type-id='type-id-57'/>
           <parameter type-id='type-id-57'/>
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
         <function-decl name='inEvalVLine' mangled-name='_ZN22OpenGLSurfaceEvaluator11inEvalVLineEifPfiPA3_fS2_' filepath='libnurbs/interface/glsurfeval.h' line='306' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-55' is-artificial='yes'/>
-          <parameter type-id='type-id-10'/>
+          <parameter type-id='type-id-11'/>
           <parameter type-id='type-id-1'/>
-          <parameter type-id='type-id-13'/>
-          <parameter type-id='type-id-10'/>
+          <parameter type-id='type-id-16'/>
+          <parameter type-id='type-id-11'/>
           <parameter type-id='type-id-57'/>
           <parameter type-id='type-id-57'/>
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
         <function-decl name='inEvalUStrip' mangled-name='_ZN22OpenGLSurfaceEvaluator12inEvalUStripEifPfifS0_' filepath='libnurbs/interface/glsurfeval.h' line='309' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-55' is-artificial='yes'/>
-          <parameter type-id='type-id-10'/>
+          <parameter type-id='type-id-11'/>
           <parameter type-id='type-id-1'/>
-          <parameter type-id='type-id-13'/>
-          <parameter type-id='type-id-10'/>
+          <parameter type-id='type-id-16'/>
+          <parameter type-id='type-id-11'/>
           <parameter type-id='type-id-1'/>
-          <parameter type-id='type-id-13'/>
-          <return type-id='type-id-11'/>
+          <parameter type-id='type-id-16'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
         <function-decl name='inEvalVStrip' mangled-name='_ZN22OpenGLSurfaceEvaluator12inEvalVStripEifPfifS0_' filepath='libnurbs/interface/glsurfeval.h' line='312' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-55' is-artificial='yes'/>
-          <parameter type-id='type-id-10'/>
+          <parameter type-id='type-id-11'/>
           <parameter type-id='type-id-1'/>
-          <parameter type-id='type-id-13'/>
-          <parameter type-id='type-id-10'/>
+          <parameter type-id='type-id-16'/>
+          <parameter type-id='type-id-11'/>
           <parameter type-id='type-id-1'/>
-          <parameter type-id='type-id-13'/>
-          <return type-id='type-id-11'/>
+          <parameter type-id='type-id-16'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
         <function-decl name='inPreEvaluateBV' mangled-name='_ZN22OpenGLSurfaceEvaluator15inPreEvaluateBVEiiifPf' filepath='libnurbs/interface/glsurfeval.h' line='314' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-55' is-artificial='yes'/>
-          <parameter type-id='type-id-10'/>
-          <parameter type-id='type-id-10'/>
-          <parameter type-id='type-id-10'/>
+          <parameter type-id='type-id-11'/>
+          <parameter type-id='type-id-11'/>
+          <parameter type-id='type-id-11'/>
           <parameter type-id='type-id-1'/>
-          <parameter type-id='type-id-13'/>
-          <return type-id='type-id-11'/>
+          <parameter type-id='type-id-16'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
         <function-decl name='inPreEvaluateBU' mangled-name='_ZN22OpenGLSurfaceEvaluator15inPreEvaluateBUEiiifPf' filepath='libnurbs/interface/glsurfeval.h' line='315' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-55' is-artificial='yes'/>
-          <parameter type-id='type-id-10'/>
-          <parameter type-id='type-id-10'/>
-          <parameter type-id='type-id-10'/>
+          <parameter type-id='type-id-11'/>
+          <parameter type-id='type-id-11'/>
+          <parameter type-id='type-id-11'/>
           <parameter type-id='type-id-1'/>
-          <parameter type-id='type-id-13'/>
-          <return type-id='type-id-11'/>
+          <parameter type-id='type-id-16'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
         <function-decl name='inDoDomain2WithDerivsBV' mangled-name='_ZN22OpenGLSurfaceEvaluator23inDoDomain2WithDerivsBVEiffffiffiPfS0_S0_S0_' filepath='libnurbs/interface/glsurfeval.h' line='326' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-55' is-artificial='yes'/>
-          <parameter type-id='type-id-10'/>
+          <parameter type-id='type-id-11'/>
           <parameter type-id='type-id-1'/>
           <parameter type-id='type-id-1'/>
           <parameter type-id='type-id-1'/>
           <parameter type-id='type-id-1'/>
-          <parameter type-id='type-id-10'/>
+          <parameter type-id='type-id-11'/>
           <parameter type-id='type-id-1'/>
           <parameter type-id='type-id-1'/>
-          <parameter type-id='type-id-10'/>
-          <parameter type-id='type-id-13'/>
-          <parameter type-id='type-id-13'/>
-          <parameter type-id='type-id-13'/>
-          <parameter type-id='type-id-13'/>
-          <return type-id='type-id-11'/>
+          <parameter type-id='type-id-11'/>
+          <parameter type-id='type-id-16'/>
+          <parameter type-id='type-id-16'/>
+          <parameter type-id='type-id-16'/>
+          <parameter type-id='type-id-16'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
         <function-decl name='inDoDomain2WithDerivsBU' mangled-name='_ZN22OpenGLSurfaceEvaluator23inDoDomain2WithDerivsBUEiffffiffiPfS0_S0_S0_' filepath='libnurbs/interface/glsurfeval.h' line='332' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-55' is-artificial='yes'/>
-          <parameter type-id='type-id-10'/>
+          <parameter type-id='type-id-11'/>
           <parameter type-id='type-id-1'/>
           <parameter type-id='type-id-1'/>
           <parameter type-id='type-id-1'/>
           <parameter type-id='type-id-1'/>
-          <parameter type-id='type-id-10'/>
+          <parameter type-id='type-id-11'/>
           <parameter type-id='type-id-1'/>
           <parameter type-id='type-id-1'/>
-          <parameter type-id='type-id-10'/>
-          <parameter type-id='type-id-13'/>
-          <parameter type-id='type-id-13'/>
-          <parameter type-id='type-id-13'/>
-          <parameter type-id='type-id-13'/>
-          <return type-id='type-id-11'/>
+          <parameter type-id='type-id-11'/>
+          <parameter type-id='type-id-16'/>
+          <parameter type-id='type-id-16'/>
+          <parameter type-id='type-id-16'/>
+          <parameter type-id='type-id-16'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
         <function-decl name='inBPMEval' mangled-name='_ZN22OpenGLSurfaceEvaluator9inBPMEvalEP15bezierPatchMesh' filepath='libnurbs/interface/glsurfeval.h' line='345' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-55' is-artificial='yes'/>
           <parameter type-id='type-id-51'/>
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
         <function-decl name='inBPMListEval' mangled-name='_ZN22OpenGLSurfaceEvaluator13inBPMListEvalEP15bezierPatchMesh' filepath='libnurbs/interface/glsurfeval.h' line='346' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-55' is-artificial='yes'/>
           <parameter type-id='type-id-51'/>
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
         <function-decl name='inMap2fEM' mangled-name='_ZN22OpenGLSurfaceEvaluator9inMap2fEMEiiffiiffiiPf' filepath='libnurbs/interface/glsurfeval.h' line='362' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-55' is-artificial='yes'/>
-          <parameter type-id='type-id-10'/>
-          <parameter type-id='type-id-10'/>
+          <parameter type-id='type-id-11'/>
+          <parameter type-id='type-id-11'/>
           <parameter type-id='type-id-1'/>
           <parameter type-id='type-id-1'/>
-          <parameter type-id='type-id-10'/>
-          <parameter type-id='type-id-10'/>
+          <parameter type-id='type-id-11'/>
+          <parameter type-id='type-id-11'/>
           <parameter type-id='type-id-1'/>
           <parameter type-id='type-id-1'/>
-          <parameter type-id='type-id-10'/>
-          <parameter type-id='type-id-10'/>
-          <parameter type-id='type-id-13'/>
-          <return type-id='type-id-11'/>
+          <parameter type-id='type-id-11'/>
+          <parameter type-id='type-id-11'/>
+          <parameter type-id='type-id-16'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -1413,10 +1413,10 @@
           <parameter type-id='type-id-58'/>
           <parameter type-id='type-id-1'/>
           <parameter type-id='type-id-1'/>
-          <parameter type-id='type-id-13'/>
-          <parameter type-id='type-id-13'/>
-          <parameter type-id='type-id-13'/>
-          <return type-id='type-id-11'/>
+          <parameter type-id='type-id-16'/>
+          <parameter type-id='type-id-16'/>
+          <parameter type-id='type-id-16'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -1425,8 +1425,8 @@
           <parameter type-id='type-id-58'/>
           <parameter type-id='type-id-1'/>
           <parameter type-id='type-id-1'/>
-          <parameter type-id='type-id-13'/>
-          <return type-id='type-id-11'/>
+          <parameter type-id='type-id-16'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -1434,37 +1434,37 @@
           <parameter type-id='type-id-55' is-artificial='yes'/>
           <parameter type-id='type-id-1'/>
           <parameter type-id='type-id-1'/>
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
         <function-decl name='inBPMEvalEM' mangled-name='_ZN22OpenGLSurfaceEvaluator11inBPMEvalEMEP15bezierPatchMesh' filepath='libnurbs/interface/glsurfeval.h' line='380' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-55' is-artificial='yes'/>
           <parameter type-id='type-id-51'/>
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
         <function-decl name='inBPMListEvalEM' mangled-name='_ZN22OpenGLSurfaceEvaluator15inBPMListEvalEMEP15bezierPatchMesh' filepath='libnurbs/interface/glsurfeval.h' line='381' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-55' is-artificial='yes'/>
           <parameter type-id='type-id-51'/>
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public' destructor='yes' vtable-offset='-1'>
         <function-decl name='~OpenGLSurfaceEvaluator' filepath='libnurbs/interface/glsurfeval.cc' line='162' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-55' is-artificial='yes'/>
-          <parameter type-id='type-id-10'/>
-          <return type-id='type-id-11'/>
+          <parameter type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public' vtable-offset='9'>
         <function-decl name='range2f' mangled-name='_ZN22OpenGLSurfaceEvaluator7range2fElPfS0_' filepath='libnurbs/interface/glsurfeval.cc' line='258' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-55' is-artificial='yes'/>
-          <parameter type-id='type-id-12'/>
-          <parameter type-id='type-id-13'/>
-          <parameter type-id='type-id-13'/>
-          <return type-id='type-id-11'/>
+          <parameter type-id='type-id-15'/>
+          <parameter type-id='type-id-16'/>
+          <parameter type-id='type-id-16'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public' vtable-offset='10'>
@@ -1474,187 +1474,187 @@
           <parameter type-id='type-id-1'/>
           <parameter type-id='type-id-1'/>
           <parameter type-id='type-id-1'/>
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public' vtable-offset='11'>
         <function-decl name='enable' mangled-name='_ZN22OpenGLSurfaceEvaluator6enableEl' filepath='libnurbs/interface/glsurfeval.cc' line='185' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-55' is-artificial='yes'/>
-          <parameter type-id='type-id-12'/>
-          <return type-id='type-id-11'/>
+          <parameter type-id='type-id-15'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public' vtable-offset='12'>
         <function-decl name='disable' mangled-name='_ZN22OpenGLSurfaceEvaluator7disableEl' filepath='libnurbs/interface/glsurfeval.cc' line='175' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-55' is-artificial='yes'/>
-          <parameter type-id='type-id-12'/>
-          <return type-id='type-id-11'/>
+          <parameter type-id='type-id-15'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public' vtable-offset='13'>
         <function-decl name='bgnmap2f' mangled-name='_ZN22OpenGLSurfaceEvaluator8bgnmap2fEl' filepath='libnurbs/interface/glsurfeval.cc' line='739' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-55' is-artificial='yes'/>
-          <parameter type-id='type-id-12'/>
-          <return type-id='type-id-11'/>
+          <parameter type-id='type-id-15'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public' vtable-offset='14'>
         <function-decl name='map2f' mangled-name='_ZN22OpenGLSurfaceEvaluator5map2fElffllffllPf' filepath='libnurbs/interface/glsurfeval.cc' line='872' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-55' is-artificial='yes'/>
-          <parameter type-id='type-id-12'/>
+          <parameter type-id='type-id-15'/>
           <parameter type-id='type-id-1'/>
           <parameter type-id='type-id-1'/>
-          <parameter type-id='type-id-12'/>
-          <parameter type-id='type-id-12'/>
+          <parameter type-id='type-id-15'/>
+          <parameter type-id='type-id-15'/>
           <parameter type-id='type-id-1'/>
           <parameter type-id='type-id-1'/>
-          <parameter type-id='type-id-12'/>
-          <parameter type-id='type-id-12'/>
-          <parameter type-id='type-id-13'/>
-          <return type-id='type-id-11'/>
+          <parameter type-id='type-id-15'/>
+          <parameter type-id='type-id-15'/>
+          <parameter type-id='type-id-16'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public' vtable-offset='15'>
         <function-decl name='mapgrid2f' mangled-name='_ZN22OpenGLSurfaceEvaluator9mapgrid2fElfflff' filepath='libnurbs/interface/glsurfeval.cc' line='195' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-55' is-artificial='yes'/>
-          <parameter type-id='type-id-12'/>
+          <parameter type-id='type-id-15'/>
           <parameter type-id='type-id-1'/>
           <parameter type-id='type-id-1'/>
-          <parameter type-id='type-id-12'/>
+          <parameter type-id='type-id-15'/>
           <parameter type-id='type-id-1'/>
           <parameter type-id='type-id-1'/>
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public' vtable-offset='16'>
         <function-decl name='mapmesh2f' mangled-name='_ZN22OpenGLSurfaceEvaluator9mapmesh2fElllll' filepath='libnurbs/interface/glsurfeval.cc' line='946' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-55' is-artificial='yes'/>
-          <parameter type-id='type-id-12'/>
-          <parameter type-id='type-id-12'/>
-          <parameter type-id='type-id-12'/>
-          <parameter type-id='type-id-12'/>
-          <parameter type-id='type-id-12'/>
-          <return type-id='type-id-11'/>
+          <parameter type-id='type-id-15'/>
+          <parameter type-id='type-id-15'/>
+          <parameter type-id='type-id-15'/>
+          <parameter type-id='type-id-15'/>
+          <parameter type-id='type-id-15'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public' vtable-offset='17'>
         <function-decl name='evalcoord2f' mangled-name='_ZN22OpenGLSurfaceEvaluator11evalcoord2fElff' filepath='libnurbs/interface/glsurfeval.cc' line='1042' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-55' is-artificial='yes'/>
-          <parameter type-id='type-id-12'/>
+          <parameter type-id='type-id-15'/>
           <parameter type-id='type-id-1'/>
           <parameter type-id='type-id-1'/>
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public' vtable-offset='18'>
         <function-decl name='evalpoint2i' mangled-name='_ZN22OpenGLSurfaceEvaluator11evalpoint2iEll' filepath='libnurbs/interface/glsurfeval.cc' line='1059' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-55' is-artificial='yes'/>
-          <parameter type-id='type-id-12'/>
-          <parameter type-id='type-id-12'/>
-          <return type-id='type-id-11'/>
+          <parameter type-id='type-id-15'/>
+          <parameter type-id='type-id-15'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public' vtable-offset='19'>
         <function-decl name='endmap2f' mangled-name='_ZN22OpenGLSurfaceEvaluator8endmap2fEv' filepath='libnurbs/interface/glsurfeval.cc' line='801' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-55' is-artificial='yes'/>
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public' vtable-offset='20'>
         <function-decl name='polymode' mangled-name='_ZN22OpenGLSurfaceEvaluator8polymodeEl' filepath='libnurbs/interface/glsurfeval.cc' line='219' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-55' is-artificial='yes'/>
-          <parameter type-id='type-id-12'/>
-          <return type-id='type-id-11'/>
+          <parameter type-id='type-id-15'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public' vtable-offset='21'>
         <function-decl name='bgnline' mangled-name='_ZN22OpenGLSurfaceEvaluator7bgnlineEv' filepath='libnurbs/interface/glsurfeval.cc' line='240' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-55' is-artificial='yes'/>
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public' vtable-offset='22'>
         <function-decl name='endline' mangled-name='_ZN22OpenGLSurfaceEvaluator7endlineEv' filepath='libnurbs/interface/glsurfeval.cc' line='249' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-55' is-artificial='yes'/>
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public' vtable-offset='23'>
         <function-decl name='bgnclosedline' mangled-name='_ZN22OpenGLSurfaceEvaluator13bgnclosedlineEv' filepath='libnurbs/interface/glsurfeval.cc' line='268' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-55' is-artificial='yes'/>
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public' vtable-offset='24'>
         <function-decl name='endclosedline' mangled-name='_ZN22OpenGLSurfaceEvaluator13endclosedlineEv' filepath='libnurbs/interface/glsurfeval.cc' line='277' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-55' is-artificial='yes'/>
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public' vtable-offset='25'>
         <function-decl name='bgntmesh' mangled-name='_ZN22OpenGLSurfaceEvaluator8bgntmeshEv' filepath='libnurbs/interface/glsurfeval.cc' line='290' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-55' is-artificial='yes'/>
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public' vtable-offset='26'>
         <function-decl name='swaptmesh' mangled-name='_ZN22OpenGLSurfaceEvaluator9swaptmeshEv' filepath='libnurbs/interface/glsurfeval.cc' line='305' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-55' is-artificial='yes'/>
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public' vtable-offset='27'>
         <function-decl name='endtmesh' mangled-name='_ZN22OpenGLSurfaceEvaluator8endtmeshEv' filepath='libnurbs/interface/glsurfeval.cc' line='312' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-55' is-artificial='yes'/>
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public' vtable-offset='28'>
         <function-decl name='bgnqstrip' mangled-name='_ZN22OpenGLSurfaceEvaluator9bgnqstripEv' filepath='libnurbs/interface/glsurfeval.cc' line='712' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-55' is-artificial='yes'/>
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public' vtable-offset='29'>
         <function-decl name='endqstrip' mangled-name='_ZN22OpenGLSurfaceEvaluator9endqstripEv' filepath='libnurbs/interface/glsurfeval.cc' line='725' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-55' is-artificial='yes'/>
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public' vtable-offset='30'>
         <function-decl name='bgntfan' mangled-name='_ZN22OpenGLSurfaceEvaluator7bgntfanEv' filepath='libnurbs/interface/glsurfeval.cc' line='324' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-55' is-artificial='yes'/>
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public' vtable-offset='31'>
         <function-decl name='endtfan' mangled-name='_ZN22OpenGLSurfaceEvaluator7endtfanEv' filepath='libnurbs/interface/glsurfeval.cc' line='334' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-55' is-artificial='yes'/>
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public' vtable-offset='32'>
         <function-decl name='evalUStrip' mangled-name='_ZN22OpenGLSurfaceEvaluator10evalUStripEifPfifS0_' filepath='libnurbs/interface/glsurfeval.cc' line='343' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-55' is-artificial='yes'/>
-          <parameter type-id='type-id-10'/>
+          <parameter type-id='type-id-11'/>
           <parameter type-id='type-id-1'/>
-          <parameter type-id='type-id-13'/>
-          <parameter type-id='type-id-10'/>
+          <parameter type-id='type-id-16'/>
+          <parameter type-id='type-id-11'/>
           <parameter type-id='type-id-1'/>
-          <parameter type-id='type-id-13'/>
-          <return type-id='type-id-11'/>
+          <parameter type-id='type-id-16'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public' vtable-offset='33'>
         <function-decl name='evalVStrip' mangled-name='_ZN22OpenGLSurfaceEvaluator10evalVStripEifPfifS0_' filepath='libnurbs/interface/glsurfeval.cc' line='530' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-55' is-artificial='yes'/>
-          <parameter type-id='type-id-10'/>
+          <parameter type-id='type-id-11'/>
           <parameter type-id='type-id-1'/>
-          <parameter type-id='type-id-13'/>
-          <parameter type-id='type-id-10'/>
+          <parameter type-id='type-id-16'/>
+          <parameter type-id='type-id-11'/>
           <parameter type-id='type-id-1'/>
-          <parameter type-id='type-id-13'/>
-          <return type-id='type-id-11'/>
+          <parameter type-id='type-id-16'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private' vtable-offset='34'>
@@ -1662,9 +1662,9 @@
           <parameter type-id='type-id-55' is-artificial='yes'/>
           <parameter type-id='type-id-1'/>
           <parameter type-id='type-id-1'/>
-          <parameter type-id='type-id-13'/>
-          <parameter type-id='type-id-13'/>
-          <return type-id='type-id-11'/>
+          <parameter type-id='type-id-16'/>
+          <parameter type-id='type-id-16'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private' vtable-offset='35'>
@@ -1672,9 +1672,9 @@
           <parameter type-id='type-id-55' is-artificial='yes'/>
           <parameter type-id='type-id-1'/>
           <parameter type-id='type-id-1'/>
-          <parameter type-id='type-id-13'/>
-          <parameter type-id='type-id-13'/>
-          <return type-id='type-id-11'/>
+          <parameter type-id='type-id-16'/>
+          <parameter type-id='type-id-16'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private' vtable-offset='36'>
@@ -1682,67 +1682,67 @@
           <parameter type-id='type-id-55' is-artificial='yes'/>
           <parameter type-id='type-id-1'/>
           <parameter type-id='type-id-1'/>
-          <parameter type-id='type-id-13'/>
-          <parameter type-id='type-id-13'/>
-          <return type-id='type-id-11'/>
+          <parameter type-id='type-id-16'/>
+          <parameter type-id='type-id-16'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private' vtable-offset='37'>
         <function-decl name='inPreEvaluateBV_intfac' mangled-name='_ZN22OpenGLSurfaceEvaluator22inPreEvaluateBV_intfacEf' filepath='libnurbs/interface/glsurfeval.h' line='316' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-55' is-artificial='yes'/>
           <parameter type-id='type-id-1'/>
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private' vtable-offset='38'>
         <function-decl name='inPreEvaluateBU_intfac' mangled-name='_ZN22OpenGLSurfaceEvaluator22inPreEvaluateBU_intfacEf' filepath='libnurbs/interface/glsurfeval.h' line='321' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-55' is-artificial='yes'/>
           <parameter type-id='type-id-1'/>
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
     </class-decl>
     <pointer-type-def type-id='type-id-39' size-in-bits='64' id='type-id-44'/>
     <pointer-type-def type-id='type-id-43' size-in-bits='64' id='type-id-55'/>
-    <pointer-type-def type-id='type-id-30' size-in-bits='64' id='type-id-59'/>
+    <pointer-type-def type-id='type-id-33' size-in-bits='64' id='type-id-59'/>
     <function-decl name='gluDeleteNurbsRenderer' mangled-name='gluDeleteNurbsRenderer' filepath='libnurbs/interface/glinterface.cc' line='75' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gluDeleteNurbsRenderer'>
       <parameter type-id='type-id-44' name='r' filepath='libnurbs/interface/glinterface.cc' line='75' column='1'/>
-      <return type-id='type-id-11'/>
+      <return type-id='type-id-12'/>
     </function-decl>
     <function-decl name='gluNurbsCallbackDataEXT' mangled-name='gluNurbsCallbackDataEXT' filepath='libnurbs/interface/glinterface.cc' line='459' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gluNurbsCallbackDataEXT'>
       <parameter type-id='type-id-44' name='r' filepath='libnurbs/interface/glinterface.cc' line='459' column='1'/>
-      <parameter type-id='type-id-22' name='userData' filepath='libnurbs/interface/glinterface.cc' line='459' column='1'/>
-      <return type-id='type-id-11'/>
+      <parameter type-id='type-id-25' name='userData' filepath='libnurbs/interface/glinterface.cc' line='459' column='1'/>
+      <return type-id='type-id-12'/>
     </function-decl>
     <function-decl name='gluNurbsCallbackData' mangled-name='gluNurbsCallbackData' filepath='libnurbs/interface/glinterface.cc' line='466' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gluNurbsCallbackData'>
       <parameter type-id='type-id-44' name='r' filepath='libnurbs/interface/glinterface.cc' line='459' column='1'/>
-      <parameter type-id='type-id-22' name='userData' filepath='libnurbs/interface/glinterface.cc' line='459' column='1'/>
-      <return type-id='type-id-11'/>
+      <parameter type-id='type-id-25' name='userData' filepath='libnurbs/interface/glinterface.cc' line='459' column='1'/>
+      <return type-id='type-id-12'/>
     </function-decl>
     <function-decl name='gluNurbsCallback' mangled-name='gluNurbsCallback' filepath='libnurbs/interface/glinterface.cc' line='430' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gluNurbsCallback'>
       <parameter type-id='type-id-44' name='r' filepath='libnurbs/interface/glinterface.cc' line='430' column='1'/>
-      <parameter type-id='type-id-25' name='which' filepath='libnurbs/interface/glinterface.cc' line='430' column='1'/>
-      <parameter type-id='type-id-26' name='fn' filepath='libnurbs/interface/glinterface.cc' line='430' column='1'/>
-      <return type-id='type-id-11'/>
+      <parameter type-id='type-id-28' name='which' filepath='libnurbs/interface/glinterface.cc' line='430' column='1'/>
+      <parameter type-id='type-id-29' name='fn' filepath='libnurbs/interface/glinterface.cc' line='430' column='1'/>
+      <return type-id='type-id-12'/>
     </function-decl>
     <function-decl name='gluGetNurbsProperty' mangled-name='gluGetNurbsProperty' filepath='libnurbs/interface/glinterface.cc' line='359' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gluGetNurbsProperty'>
       <parameter type-id='type-id-44' name='r' filepath='libnurbs/interface/glinterface.cc' line='359' column='1'/>
-      <parameter type-id='type-id-25' name='property' filepath='libnurbs/interface/glinterface.cc' line='359' column='1'/>
+      <parameter type-id='type-id-28' name='property' filepath='libnurbs/interface/glinterface.cc' line='359' column='1'/>
       <parameter type-id='type-id-47' name='value' filepath='libnurbs/interface/glinterface.cc' line='359' column='1'/>
-      <return type-id='type-id-11'/>
+      <return type-id='type-id-12'/>
     </function-decl>
     <function-decl name='gluNurbsProperty' mangled-name='gluNurbsProperty' filepath='libnurbs/interface/glinterface.cc' line='243' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gluNurbsProperty'>
       <parameter type-id='type-id-44' name='r' filepath='libnurbs/interface/glinterface.cc' line='243' column='1'/>
-      <parameter type-id='type-id-25' name='property' filepath='libnurbs/interface/glinterface.cc' line='243' column='1'/>
-      <parameter type-id='type-id-33' name='value' filepath='libnurbs/interface/glinterface.cc' line='243' column='1'/>
-      <return type-id='type-id-11'/>
+      <parameter type-id='type-id-28' name='property' filepath='libnurbs/interface/glinterface.cc' line='243' column='1'/>
+      <parameter type-id='type-id-35' name='value' filepath='libnurbs/interface/glinterface.cc' line='243' column='1'/>
+      <return type-id='type-id-12'/>
     </function-decl>
     <function-decl name='gluLoadSamplingMatrices' mangled-name='gluLoadSamplingMatrices' filepath='libnurbs/interface/glinterface.cc' line='235' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gluLoadSamplingMatrices'>
       <parameter type-id='type-id-44' name='r' filepath='libnurbs/interface/glinterface.cc' line='235' column='1'/>
-      <parameter type-id='type-id-28' name='modelMatrix' filepath='libnurbs/interface/glinterface.cc' line='235' column='1'/>
-      <parameter type-id='type-id-28' name='projMatrix' filepath='libnurbs/interface/glinterface.cc' line='236' column='1'/>
+      <parameter type-id='type-id-31' name='modelMatrix' filepath='libnurbs/interface/glinterface.cc' line='235' column='1'/>
+      <parameter type-id='type-id-31' name='projMatrix' filepath='libnurbs/interface/glinterface.cc' line='236' column='1'/>
       <parameter type-id='type-id-45' name='viewport' filepath='libnurbs/interface/glinterface.cc' line='237' column='1'/>
-      <return type-id='type-id-11'/>
+      <return type-id='type-id-12'/>
     </function-decl>
     <function-decl name='gluNurbsSurface' mangled-name='gluNurbsSurface' filepath='libnurbs/interface/glinterface.cc' line='199' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gluNurbsSurface'>
       <parameter type-id='type-id-44' name='r' filepath='libnurbs/interface/glinterface.cc' line='199' column='1'/>
@@ -1755,8 +1755,8 @@
       <parameter type-id='type-id-47' name='ctlarray' filepath='libnurbs/interface/glinterface.cc' line='202' column='1'/>
       <parameter type-id='type-id-60' name='sorder' filepath='libnurbs/interface/glinterface.cc' line='202' column='1'/>
       <parameter type-id='type-id-60' name='torder' filepath='libnurbs/interface/glinterface.cc' line='202' column='1'/>
-      <parameter type-id='type-id-25' name='type' filepath='libnurbs/interface/glinterface.cc' line='203' column='1'/>
-      <return type-id='type-id-11'/>
+      <parameter type-id='type-id-28' name='type' filepath='libnurbs/interface/glinterface.cc' line='203' column='1'/>
+      <return type-id='type-id-12'/>
     </function-decl>
     <function-decl name='gluNurbsCurve' mangled-name='gluNurbsCurve' filepath='libnurbs/interface/glinterface.cc' line='173' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gluNurbsCurve'>
       <parameter type-id='type-id-44' name='r' filepath='libnurbs/interface/glinterface.cc' line='173' column='1'/>
@@ -1765,50 +1765,50 @@
       <parameter type-id='type-id-60' name='stride' filepath='libnurbs/interface/glinterface.cc' line='173' column='1'/>
       <parameter type-id='type-id-59' name='ctlarray' filepath='libnurbs/interface/glinterface.cc' line='174' column='1'/>
       <parameter type-id='type-id-60' name='order' filepath='libnurbs/interface/glinterface.cc' line='174' column='1'/>
-      <parameter type-id='type-id-25' name='type' filepath='libnurbs/interface/glinterface.cc' line='174' column='1'/>
-      <return type-id='type-id-11'/>
+      <parameter type-id='type-id-28' name='type' filepath='libnurbs/interface/glinterface.cc' line='174' column='1'/>
+      <return type-id='type-id-12'/>
     </function-decl>
     <function-decl name='gluPwlCurve' mangled-name='gluPwlCurve' filepath='libnurbs/interface/glinterface.cc' line='150' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gluPwlCurve'>
       <parameter type-id='type-id-44' name='r' filepath='libnurbs/interface/glinterface.cc' line='150' column='1'/>
       <parameter type-id='type-id-60' name='count' filepath='libnurbs/interface/glinterface.cc' line='150' column='1'/>
       <parameter type-id='type-id-59' name='array' filepath='libnurbs/interface/glinterface.cc' line='150' column='1'/>
       <parameter type-id='type-id-60' name='stride' filepath='libnurbs/interface/glinterface.cc' line='151' column='1'/>
-      <parameter type-id='type-id-25' name='type' filepath='libnurbs/interface/glinterface.cc' line='151' column='1'/>
-      <return type-id='type-id-11'/>
+      <parameter type-id='type-id-28' name='type' filepath='libnurbs/interface/glinterface.cc' line='151' column='1'/>
+      <return type-id='type-id-12'/>
     </function-decl>
     <function-decl name='gluEndTrim' mangled-name='gluEndTrim' filepath='libnurbs/interface/glinterface.cc' line='141' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gluEndTrim'>
       <parameter type-id='type-id-44' name='r' filepath='libnurbs/interface/glinterface.cc' line='75' column='1'/>
-      <return type-id='type-id-11'/>
+      <return type-id='type-id-12'/>
     </function-decl>
     <function-decl name='gluBeginTrim' mangled-name='gluBeginTrim' filepath='libnurbs/interface/glinterface.cc' line='131' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gluBeginTrim'>
       <parameter type-id='type-id-44' name='r' filepath='libnurbs/interface/glinterface.cc' line='75' column='1'/>
-      <return type-id='type-id-11'/>
+      <return type-id='type-id-12'/>
     </function-decl>
     <function-decl name='gluEndSurface' mangled-name='gluEndSurface' filepath='libnurbs/interface/glinterface.cc' line='111' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gluEndSurface'>
       <parameter type-id='type-id-44' name='r' filepath='libnurbs/interface/glinterface.cc' line='75' column='1'/>
-      <return type-id='type-id-11'/>
+      <return type-id='type-id-12'/>
     </function-decl>
     <function-decl name='gluEndCurve' mangled-name='gluEndCurve' filepath='libnurbs/interface/glinterface.cc' line='105' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gluEndCurve'>
       <parameter type-id='type-id-44' name='r' filepath='libnurbs/interface/glinterface.cc' line='75' column='1'/>
-      <return type-id='type-id-11'/>
+      <return type-id='type-id-12'/>
     </function-decl>
     <function-decl name='gluBeginCurve' mangled-name='gluBeginCurve' filepath='libnurbs/interface/glinterface.cc' line='99' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gluBeginCurve'>
       <parameter type-id='type-id-44' name='r' filepath='libnurbs/interface/glinterface.cc' line='75' column='1'/>
-      <return type-id='type-id-11'/>
+      <return type-id='type-id-12'/>
     </function-decl>
     <function-decl name='gluBeginSurface' mangled-name='gluBeginSurface' filepath='libnurbs/interface/glinterface.cc' line='89' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gluBeginSurface'>
       <parameter type-id='type-id-44' name='r' filepath='libnurbs/interface/glinterface.cc' line='75' column='1'/>
-      <return type-id='type-id-11'/>
+      <return type-id='type-id-12'/>
     </function-decl>
     <function-decl name='gluNewNurbsRenderer' mangled-name='gluNewNurbsRenderer' filepath='libnurbs/interface/glinterface.cc' line='66' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gluNewNurbsRenderer'>
       <return type-id='type-id-44'/>
     </function-decl>
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='libnurbs/interface/glrenderer.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-T0fsxk/Mesa-8.0.5/src/glu/sgi' language='LANG_C_plus_plus'>
-    <array-type-def dimensions='1' type-id='type-id-33' size-in-bits='128' id='type-id-61'>
+    <array-type-def dimensions='1' type-id='type-id-35' size-in-bits='128' id='type-id-61'>
       <subrange length='4' type-id='type-id-3' id='type-id-62'/>
     </array-type-def>
-    <typedef-decl name='errorCallbackType' type-id='type-id-16' filepath='libnurbs/interface/glrenderer.h' line='46' column='1' id='type-id-41'/>
+    <typedef-decl name='errorCallbackType' type-id='type-id-19' filepath='libnurbs/interface/glrenderer.h' line='46' column='1' id='type-id-41'/>
     <class-decl name='NurbsTessellator' size-in-bits='47616' visibility='default' filepath='libnurbs/internals/nurbstess.h' line='53' column='1' id='type-id-40'>
       <data-member access='protected' layout-offset-in-bits='64'>
         <var-decl name='renderhints' type-id='type-id-63' visibility='default' filepath='libnurbs/internals/nurbstess.h' line='104' column='1'/>
@@ -1853,31 +1853,31 @@
         <var-decl name='extTrimVertexPool' type-id='type-id-69' visibility='default' filepath='libnurbs/internals/nurbstess.h' line='146' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='46720'>
-        <var-decl name='inSurface' type-id='type-id-10' visibility='default' filepath='libnurbs/internals/nurbstess.h' line='148' column='1'/>
+        <var-decl name='inSurface' type-id='type-id-11' visibility='default' filepath='libnurbs/internals/nurbstess.h' line='148' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='46752'>
-        <var-decl name='inCurve' type-id='type-id-10' visibility='default' filepath='libnurbs/internals/nurbstess.h' line='149' column='1'/>
+        <var-decl name='inCurve' type-id='type-id-11' visibility='default' filepath='libnurbs/internals/nurbstess.h' line='149' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='46784'>
-        <var-decl name='inTrim' type-id='type-id-10' visibility='default' filepath='libnurbs/internals/nurbstess.h' line='150' column='1'/>
+        <var-decl name='inTrim' type-id='type-id-11' visibility='default' filepath='libnurbs/internals/nurbstess.h' line='150' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='46816'>
-        <var-decl name='isCurveModified' type-id='type-id-10' visibility='default' filepath='libnurbs/internals/nurbstess.h' line='151' column='1'/>
+        <var-decl name='isCurveModified' type-id='type-id-11' visibility='default' filepath='libnurbs/internals/nurbstess.h' line='151' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='46848'>
-        <var-decl name='isTrimModified' type-id='type-id-10' visibility='default' filepath='libnurbs/internals/nurbstess.h' line='152' column='1'/>
+        <var-decl name='isTrimModified' type-id='type-id-11' visibility='default' filepath='libnurbs/internals/nurbstess.h' line='152' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='46880'>
-        <var-decl name='isSurfaceModified' type-id='type-id-10' visibility='default' filepath='libnurbs/internals/nurbstess.h' line='153' column='1'/>
+        <var-decl name='isSurfaceModified' type-id='type-id-11' visibility='default' filepath='libnurbs/internals/nurbstess.h' line='153' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='46912'>
-        <var-decl name='isDataValid' type-id='type-id-10' visibility='default' filepath='libnurbs/internals/nurbstess.h' line='154' column='1'/>
+        <var-decl name='isDataValid' type-id='type-id-11' visibility='default' filepath='libnurbs/internals/nurbstess.h' line='154' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='46944'>
-        <var-decl name='numTrims' type-id='type-id-10' visibility='default' filepath='libnurbs/internals/nurbstess.h' line='155' column='1'/>
+        <var-decl name='numTrims' type-id='type-id-11' visibility='default' filepath='libnurbs/internals/nurbstess.h' line='155' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='46976'>
-        <var-decl name='playBack' type-id='type-id-10' visibility='default' filepath='libnurbs/internals/nurbstess.h' line='156' column='1'/>
+        <var-decl name='playBack' type-id='type-id-11' visibility='default' filepath='libnurbs/internals/nurbstess.h' line='156' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='47040'>
         <var-decl name='nextTrim' type-id='type-id-70' visibility='default' filepath='libnurbs/internals/nurbstess.h' line='158' column='1'/>
@@ -1911,205 +1911,205 @@
           <parameter type-id='type-id-79' is-artificial='yes'/>
           <parameter type-id='type-id-80'/>
           <parameter type-id='type-id-81'/>
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
         <function-decl name='getnurbsproperty' mangled-name='_ZN16NurbsTessellator16getnurbspropertyElPf' filepath='libnurbs/internals/nurbsinterfac.cc' line='415' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-79' is-artificial='yes'/>
-          <parameter type-id='type-id-12'/>
+          <parameter type-id='type-id-15'/>
           <parameter type-id='type-id-59'/>
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
         <function-decl name='getnurbsproperty' mangled-name='_ZN16NurbsTessellator16getnurbspropertyEllPf' filepath='libnurbs/internals/nurbsinterfac.cc' line='431' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-79' is-artificial='yes'/>
-          <parameter type-id='type-id-12'/>
-          <parameter type-id='type-id-12'/>
+          <parameter type-id='type-id-15'/>
+          <parameter type-id='type-id-15'/>
           <parameter type-id='type-id-59'/>
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
         <function-decl name='setnurbsproperty' mangled-name='_ZN16NurbsTessellator16setnurbspropertyElf' filepath='libnurbs/internals/nurbsinterfac.cc' line='373' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-79' is-artificial='yes'/>
-          <parameter type-id='type-id-12'/>
-          <parameter type-id='type-id-30'/>
-          <return type-id='type-id-11'/>
+          <parameter type-id='type-id-15'/>
+          <parameter type-id='type-id-33'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
         <function-decl name='setnurbsproperty' mangled-name='_ZN16NurbsTessellator16setnurbspropertyEllf' filepath='libnurbs/internals/nurbsinterfac.cc' line='389' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-79' is-artificial='yes'/>
-          <parameter type-id='type-id-12'/>
-          <parameter type-id='type-id-12'/>
-          <parameter type-id='type-id-30'/>
-          <return type-id='type-id-11'/>
+          <parameter type-id='type-id-15'/>
+          <parameter type-id='type-id-15'/>
+          <parameter type-id='type-id-33'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
         <function-decl name='setnurbsproperty' mangled-name='_ZN16NurbsTessellator16setnurbspropertyEllPf' filepath='libnurbs/internals/nurbsinterfac.cc' line='451' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-79' is-artificial='yes'/>
-          <parameter type-id='type-id-12'/>
-          <parameter type-id='type-id-12'/>
+          <parameter type-id='type-id-15'/>
+          <parameter type-id='type-id-15'/>
           <parameter type-id='type-id-59'/>
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
         <function-decl name='setnurbsproperty' mangled-name='_ZN16NurbsTessellator16setnurbspropertyEllPfll' filepath='libnurbs/internals/nurbsinterfac.cc' line='474' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-79' is-artificial='yes'/>
-          <parameter type-id='type-id-12'/>
-          <parameter type-id='type-id-12'/>
+          <parameter type-id='type-id-15'/>
+          <parameter type-id='type-id-15'/>
           <parameter type-id='type-id-59'/>
-          <parameter type-id='type-id-12'/>
-          <parameter type-id='type-id-12'/>
-          <return type-id='type-id-11'/>
+          <parameter type-id='type-id-15'/>
+          <parameter type-id='type-id-15'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
         <function-decl name='bgnsurface' mangled-name='_ZN16NurbsTessellator10bgnsurfaceEl' filepath='libnurbs/internals/nurbsinterfac.cc' line='113' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-79' is-artificial='yes'/>
-          <parameter type-id='type-id-12'/>
-          <return type-id='type-id-11'/>
+          <parameter type-id='type-id-15'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
         <function-decl name='endsurface' mangled-name='_ZN16NurbsTessellator10endsurfaceEv' filepath='libnurbs/internals/nurbsinterfac.cc' line='153' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-79' is-artificial='yes'/>
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
         <function-decl name='bgntrim' mangled-name='_ZN16NurbsTessellator7bgntrimEv' filepath='libnurbs/internals/nurbsinterfac.cc' line='166' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-79' is-artificial='yes'/>
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
         <function-decl name='endtrim' mangled-name='_ZN16NurbsTessellator7endtrimEv' filepath='libnurbs/internals/nurbsinterfac.cc' line='179' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-79' is-artificial='yes'/>
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
         <function-decl name='bgncurve' mangled-name='_ZN16NurbsTessellator8bgncurveEl' filepath='libnurbs/internals/nurbsinterfac.cc' line='127' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-79' is-artificial='yes'/>
-          <parameter type-id='type-id-12'/>
-          <return type-id='type-id-11'/>
+          <parameter type-id='type-id-15'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
         <function-decl name='endcurve' mangled-name='_ZN16NurbsTessellator8endcurveEv' filepath='libnurbs/internals/nurbsinterfac.cc' line='141' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-79' is-artificial='yes'/>
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
         <function-decl name='pwlcurve' mangled-name='_ZN16NurbsTessellator8pwlcurveElPfll' filepath='libnurbs/internals/nurbsinterfac.cc' line='197' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-79' is-artificial='yes'/>
-          <parameter type-id='type-id-12'/>
+          <parameter type-id='type-id-15'/>
           <parameter type-id='type-id-59'/>
-          <parameter type-id='type-id-12'/>
-          <parameter type-id='type-id-12'/>
-          <return type-id='type-id-11'/>
+          <parameter type-id='type-id-15'/>
+          <parameter type-id='type-id-15'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
         <function-decl name='nurbscurve' mangled-name='_ZN16NurbsTessellator10nurbscurveElPflS0_ll' filepath='libnurbs/internals/nurbsinterfac.cc' line='269' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-79' is-artificial='yes'/>
-          <parameter type-id='type-id-12'/>
+          <parameter type-id='type-id-15'/>
           <parameter type-id='type-id-59'/>
-          <parameter type-id='type-id-12'/>
+          <parameter type-id='type-id-15'/>
           <parameter type-id='type-id-59'/>
-          <parameter type-id='type-id-12'/>
-          <parameter type-id='type-id-12'/>
-          <return type-id='type-id-11'/>
+          <parameter type-id='type-id-15'/>
+          <parameter type-id='type-id-15'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
         <function-decl name='nurbssurface' mangled-name='_ZN16NurbsTessellator12nurbssurfaceElPflS0_llS0_lll' filepath='libnurbs/internals/nurbsinterfac.cc' line='318' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-79' is-artificial='yes'/>
-          <parameter type-id='type-id-12'/>
+          <parameter type-id='type-id-15'/>
           <parameter type-id='type-id-59'/>
-          <parameter type-id='type-id-12'/>
+          <parameter type-id='type-id-15'/>
           <parameter type-id='type-id-59'/>
-          <parameter type-id='type-id-12'/>
-          <parameter type-id='type-id-12'/>
+          <parameter type-id='type-id-15'/>
+          <parameter type-id='type-id-15'/>
           <parameter type-id='type-id-59'/>
-          <parameter type-id='type-id-12'/>
-          <parameter type-id='type-id-12'/>
-          <parameter type-id='type-id-12'/>
-          <return type-id='type-id-11'/>
+          <parameter type-id='type-id-15'/>
+          <parameter type-id='type-id-15'/>
+          <parameter type-id='type-id-15'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
         <function-decl name='defineMap' mangled-name='_ZN16NurbsTessellator9defineMapElll' filepath='libnurbs/internals/nurbsinterfac.cc' line='503' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-79' is-artificial='yes'/>
-          <parameter type-id='type-id-12'/>
-          <parameter type-id='type-id-12'/>
-          <parameter type-id='type-id-12'/>
-          <return type-id='type-id-11'/>
+          <parameter type-id='type-id-15'/>
+          <parameter type-id='type-id-15'/>
+          <parameter type-id='type-id-15'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
         <function-decl name='redefineMaps' mangled-name='_ZN16NurbsTessellator12redefineMapsEv' filepath='libnurbs/internals/nurbsinterfac.cc' line='497' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-79' is-artificial='yes'/>
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
         <function-decl name='discardRecording' mangled-name='_ZN16NurbsTessellator16discardRecordingEPv' filepath='libnurbs/internals/nurbsinterfac.cc' line='509' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-79' is-artificial='yes'/>
-          <parameter type-id='type-id-22'/>
-          <return type-id='type-id-11'/>
+          <parameter type-id='type-id-25'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
         <function-decl name='beginRecording' mangled-name='_ZN16NurbsTessellator14beginRecordingEv' filepath='libnurbs/internals/nurbsinterfac.cc' line='515' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-79' is-artificial='yes'/>
-          <return type-id='type-id-22'/>
+          <return type-id='type-id-25'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
         <function-decl name='endRecording' mangled-name='_ZN16NurbsTessellator12endRecordingEv' filepath='libnurbs/internals/nurbsinterfac.cc' line='522' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-79' is-artificial='yes'/>
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
         <function-decl name='playRecording' mangled-name='_ZN16NurbsTessellator13playRecordingEPv' filepath='libnurbs/internals/nurbsinterfac.cc' line='529' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-79' is-artificial='yes'/>
-          <parameter type-id='type-id-22'/>
-          <return type-id='type-id-11'/>
+          <parameter type-id='type-id-25'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
         <function-decl name='set_domain_distance_u_rate' mangled-name='_ZN16NurbsTessellator26set_domain_distance_u_rateEf' filepath='libnurbs/internals/nurbstess.h' line='98' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-79' is-artificial='yes'/>
           <parameter type-id='type-id-1'/>
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
         <function-decl name='set_domain_distance_v_rate' mangled-name='_ZN16NurbsTessellator26set_domain_distance_v_rateEf' filepath='libnurbs/internals/nurbstess.h' line='99' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-79' is-artificial='yes'/>
           <parameter type-id='type-id-1'/>
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
         <function-decl name='set_is_domain_distance_sampling' mangled-name='_ZN16NurbsTessellator31set_is_domain_distance_samplingEi' filepath='libnurbs/internals/nurbstess.h' line='100' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-79' is-artificial='yes'/>
-          <parameter type-id='type-id-10' is-artificial='yes'/>
-          <return type-id='type-id-11'/>
+          <parameter type-id='type-id-11' is-artificial='yes'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
         <function-decl name='resetObjects' mangled-name='_ZN16NurbsTessellator12resetObjectsEv' filepath='libnurbs/internals/nurbstess.h' line='110' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-79' is-artificial='yes'/>
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -2117,189 +2117,189 @@
           <parameter type-id='type-id-79' is-artificial='yes'/>
           <parameter type-id='type-id-82'/>
           <parameter type-id='type-id-83'/>
-          <return type-id='type-id-10'/>
+          <return type-id='type-id-11'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
         <function-decl name='do_nurbserror' mangled-name='_ZN16NurbsTessellator13do_nurbserrorEi' filepath='libnurbs/internals/nurbstess.h' line='112' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-79' is-artificial='yes'/>
-          <parameter type-id='type-id-10' is-artificial='yes'/>
-          <return type-id='type-id-11'/>
+          <parameter type-id='type-id-11' is-artificial='yes'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
         <function-decl name='do_bgncurve' mangled-name='_ZN16NurbsTessellator11do_bgncurveEP7O_curve' filepath='libnurbs/internals/nurbstess.h' line='113' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-79' is-artificial='yes'/>
           <parameter type-id='type-id-77'/>
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
         <function-decl name='do_endcurve' mangled-name='_ZN16NurbsTessellator11do_endcurveEv' filepath='libnurbs/internals/nurbstess.h' line='114' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-79' is-artificial='yes'/>
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
         <function-decl name='do_freeall' mangled-name='_ZN16NurbsTessellator10do_freeallEv' filepath='libnurbs/internals/nurbstess.h' line='115' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-79' is-artificial='yes'/>
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
         <function-decl name='do_freecurveall' mangled-name='_ZN16NurbsTessellator15do_freecurveallEP7O_curve' filepath='libnurbs/internals/nurbstess.h' line='116' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-79' is-artificial='yes'/>
           <parameter type-id='type-id-77'/>
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
         <function-decl name='do_freebgntrim' mangled-name='_ZN16NurbsTessellator14do_freebgntrimEP6O_trim' filepath='libnurbs/internals/nurbstess.h' line='117' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-79' is-artificial='yes'/>
           <parameter type-id='type-id-76'/>
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
         <function-decl name='do_freebgncurve' mangled-name='_ZN16NurbsTessellator15do_freebgncurveEP7O_curve' filepath='libnurbs/internals/nurbstess.h' line='118' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-79' is-artificial='yes'/>
           <parameter type-id='type-id-77'/>
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
         <function-decl name='do_freepwlcurve' mangled-name='_ZN16NurbsTessellator15do_freepwlcurveEP10O_pwlcurve' filepath='libnurbs/internals/nurbstess.h' line='119' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-79' is-artificial='yes'/>
           <parameter type-id='type-id-84'/>
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
         <function-decl name='do_freenurbscurve' mangled-name='_ZN16NurbsTessellator17do_freenurbscurveEP12O_nurbscurve' filepath='libnurbs/internals/nurbstess.h' line='120' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-79' is-artificial='yes'/>
           <parameter type-id='type-id-85'/>
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
         <function-decl name='do_freenurbssurface' mangled-name='_ZN16NurbsTessellator19do_freenurbssurfaceEP14O_nurbssurface' filepath='libnurbs/internals/nurbstess.h' line='121' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-79' is-artificial='yes'/>
           <parameter type-id='type-id-86'/>
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
         <function-decl name='do_freebgnsurface' mangled-name='_ZN16NurbsTessellator17do_freebgnsurfaceEP9O_surface' filepath='libnurbs/internals/nurbstess.h' line='122' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-79' is-artificial='yes'/>
           <parameter type-id='type-id-75'/>
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
         <function-decl name='do_bgnsurface' mangled-name='_ZN16NurbsTessellator13do_bgnsurfaceEP9O_surface' filepath='libnurbs/internals/nurbstess.h' line='123' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-79' is-artificial='yes'/>
           <parameter type-id='type-id-75'/>
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
         <function-decl name='do_endsurface' mangled-name='_ZN16NurbsTessellator13do_endsurfaceEv' filepath='libnurbs/internals/nurbstess.h' line='124' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-79' is-artificial='yes'/>
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
         <function-decl name='do_bgntrim' mangled-name='_ZN16NurbsTessellator10do_bgntrimEP6O_trim' filepath='libnurbs/internals/nurbstess.h' line='125' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-79' is-artificial='yes'/>
           <parameter type-id='type-id-76'/>
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
         <function-decl name='do_endtrim' mangled-name='_ZN16NurbsTessellator10do_endtrimEv' filepath='libnurbs/internals/nurbstess.h' line='126' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-79' is-artificial='yes'/>
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
         <function-decl name='do_pwlcurve' mangled-name='_ZN16NurbsTessellator11do_pwlcurveEP10O_pwlcurve' filepath='libnurbs/internals/nurbstess.h' line='127' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-79' is-artificial='yes'/>
           <parameter type-id='type-id-84'/>
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
         <function-decl name='do_nurbscurve' mangled-name='_ZN16NurbsTessellator13do_nurbscurveEP12O_nurbscurve' filepath='libnurbs/internals/nurbstess.h' line='128' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-79' is-artificial='yes'/>
           <parameter type-id='type-id-85'/>
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
         <function-decl name='do_nurbssurface' mangled-name='_ZN16NurbsTessellator15do_nurbssurfaceEP14O_nurbssurface' filepath='libnurbs/internals/nurbstess.h' line='129' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-79' is-artificial='yes'/>
           <parameter type-id='type-id-86'/>
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
         <function-decl name='do_freenurbsproperty' mangled-name='_ZN16NurbsTessellator20do_freenurbspropertyEP8Property' filepath='libnurbs/internals/nurbstess.h' line='130' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-79' is-artificial='yes'/>
           <parameter type-id='type-id-87'/>
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
         <function-decl name='do_setnurbsproperty' mangled-name='_ZN16NurbsTessellator19do_setnurbspropertyEP8Property' filepath='libnurbs/internals/nurbstess.h' line='131' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-79' is-artificial='yes'/>
           <parameter type-id='type-id-87'/>
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
         <function-decl name='do_setnurbsproperty2' mangled-name='_ZN16NurbsTessellator20do_setnurbsproperty2EP8Property' filepath='libnurbs/internals/nurbstess.h' line='132' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-79' is-artificial='yes'/>
           <parameter type-id='type-id-87'/>
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private' destructor='yes' vtable-offset='-1'>
         <function-decl name='~NurbsTessellator' filepath='libnurbs/internals/nurbsinterfac.cc' line='88' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-79' is-artificial='yes'/>
-          <parameter type-id='type-id-10' is-artificial='yes'/>
-          <return type-id='type-id-11'/>
+          <parameter type-id='type-id-11' is-artificial='yes'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private' vtable-offset='2'>
         <function-decl name='bgnrender' mangled-name='_ZN16NurbsTessellator9bgnrenderEv' filepath='libnurbs/internals/nurbstess.h' line='67' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-79' is-artificial='yes'/>
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private' vtable-offset='3'>
         <function-decl name='endrender' mangled-name='_ZN16NurbsTessellator9endrenderEv' filepath='libnurbs/internals/nurbstess.h' line='68' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-79' is-artificial='yes'/>
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private' vtable-offset='4'>
         <function-decl name='makeobj' mangled-name='_ZN16NurbsTessellator7makeobjEi' filepath='libnurbs/internals/nurbstess.h' line='71' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-79' is-artificial='yes'/>
-          <parameter type-id='type-id-10' is-artificial='yes'/>
-          <return type-id='type-id-11'/>
+          <parameter type-id='type-id-11' is-artificial='yes'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private' vtable-offset='5'>
         <function-decl name='closeobj' mangled-name='_ZN16NurbsTessellator8closeobjEv' filepath='libnurbs/internals/nurbstess.h' line='72' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-79' is-artificial='yes'/>
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private' vtable-offset='6'>
         <function-decl name='errorHandler' mangled-name='_ZN16NurbsTessellator12errorHandlerEi' filepath='libnurbs/internals/nurbstess.h' line='75' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-79' is-artificial='yes'/>
-          <parameter type-id='type-id-10' is-artificial='yes'/>
-          <return type-id='type-id-11'/>
+          <parameter type-id='type-id-11' is-artificial='yes'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
     </class-decl>
@@ -2325,12 +2325,12 @@
     <array-type-def dimensions='1' type-id='type-id-93' size-in-bits='192' id='type-id-49'>
       <subrange length='3' type-id='type-id-3' id='type-id-91'/>
     </array-type-def>
-    <array-type-def dimensions='1' type-id='type-id-12' size-in-bits='128' id='type-id-94'>
+    <array-type-def dimensions='1' type-id='type-id-15' size-in-bits='128' id='type-id-94'>
       <subrange length='2' type-id='type-id-3' id='type-id-88'/>
     </array-type-def>
     <class-decl name='StoredVertex' size-in-bits='256' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='84' column='1' id='type-id-95'>
       <data-member access='private' layout-offset-in-bits='0'>
-        <var-decl name='type' type-id='type-id-10' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='95' column='1'/>
+        <var-decl name='type' type-id='type-id-11' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='95' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='32'>
         <var-decl name='coord' type-id='type-id-89' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='96' column='1'/>
@@ -2341,14 +2341,14 @@
       <member-function access='private' constructor='yes'>
         <function-decl name='StoredVertex' filepath='libnurbs/interface/glsurfeval.h' line='86' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-93' is-artificial='yes'/>
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private' destructor='yes'>
         <function-decl name='~StoredVertex' filepath='libnurbs/interface/glsurfeval.h' line='87' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-93' is-artificial='yes'/>
-          <parameter type-id='type-id-10' is-artificial='yes'/>
-          <return type-id='type-id-11'/>
+          <parameter type-id='type-id-11' is-artificial='yes'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -2356,41 +2356,41 @@
           <parameter type-id='type-id-93' is-artificial='yes'/>
           <parameter type-id='type-id-1'/>
           <parameter type-id='type-id-1'/>
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
         <function-decl name='saveEvalPoint' mangled-name='_ZN12StoredVertex13saveEvalPointEll' filepath='libnurbs/interface/glsurfeval.h' line='90' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-93' is-artificial='yes'/>
-          <parameter type-id='type-id-12'/>
-          <parameter type-id='type-id-12'/>
-          <return type-id='type-id-11'/>
+          <parameter type-id='type-id-15'/>
+          <parameter type-id='type-id-15'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
         <function-decl name='invoke' mangled-name='_ZN12StoredVertex6invokeEP22OpenGLSurfaceEvaluator' filepath='libnurbs/interface/glsurfeval.h' line='92' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-93' is-artificial='yes'/>
           <parameter type-id='type-id-55'/>
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
     </class-decl>
     <class-decl name='BasicSurfaceEvaluator' size-in-bits='64' is-struct='yes' visibility='default' filepath='libnurbs/internals/basicsurfeval.h' line='43' column='1' id='type-id-48'>
-      <base-class access='public' layout-offset-in-bits='0' type-id='type-id-8'/>
+      <base-class access='public' layout-offset-in-bits='0' type-id='type-id-7'/>
       <member-function access='public' destructor='yes' vtable-offset='-1'>
         <function-decl name='~BasicSurfaceEvaluator' filepath='libnurbs/internals/basicsurfeval.h' line='45' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-96' is-artificial='yes'/>
-          <parameter type-id='type-id-10' is-artificial='yes'/>
-          <return type-id='type-id-11'/>
+          <parameter type-id='type-id-11' is-artificial='yes'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public' vtable-offset='9'>
         <function-decl name='range2f' mangled-name='_ZN21BasicSurfaceEvaluator7range2fElPfS0_' filepath='libnurbs/internals/basicsurfeval.cc' line='65' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-96' is-artificial='yes'/>
-          <parameter type-id='type-id-12'/>
-          <parameter type-id='type-id-13'/>
-          <parameter type-id='type-id-13'/>
-          <return type-id='type-id-11'/>
+          <parameter type-id='type-id-15'/>
+          <parameter type-id='type-id-16'/>
+          <parameter type-id='type-id-16'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public' vtable-offset='10'>
@@ -2400,187 +2400,187 @@
           <parameter type-id='type-id-1'/>
           <parameter type-id='type-id-1'/>
           <parameter type-id='type-id-1'/>
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public' vtable-offset='11'>
         <function-decl name='enable' mangled-name='_ZN21BasicSurfaceEvaluator6enableEl' filepath='libnurbs/internals/basicsurfeval.cc' line='74' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-96' is-artificial='yes'/>
-          <parameter type-id='type-id-12'/>
-          <return type-id='type-id-11'/>
+          <parameter type-id='type-id-15'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public' vtable-offset='12'>
         <function-decl name='disable' mangled-name='_ZN21BasicSurfaceEvaluator7disableEl' filepath='libnurbs/internals/basicsurfeval.cc' line='82' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-96' is-artificial='yes'/>
-          <parameter type-id='type-id-12'/>
-          <return type-id='type-id-11'/>
+          <parameter type-id='type-id-15'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public' vtable-offset='13'>
         <function-decl name='bgnmap2f' mangled-name='_ZN21BasicSurfaceEvaluator8bgnmap2fEl' filepath='libnurbs/internals/basicsurfeval.cc' line='90' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-96' is-artificial='yes'/>
-          <parameter type-id='type-id-12'/>
-          <return type-id='type-id-11'/>
+          <parameter type-id='type-id-15'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public' vtable-offset='14'>
         <function-decl name='map2f' mangled-name='_ZN21BasicSurfaceEvaluator5map2fElffllffllPf' filepath='libnurbs/internals/basicsurfeval.cc' line='106' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-96' is-artificial='yes'/>
-          <parameter type-id='type-id-12'/>
+          <parameter type-id='type-id-15'/>
           <parameter type-id='type-id-1'/>
           <parameter type-id='type-id-1'/>
-          <parameter type-id='type-id-12'/>
-          <parameter type-id='type-id-12'/>
+          <parameter type-id='type-id-15'/>
+          <parameter type-id='type-id-15'/>
           <parameter type-id='type-id-1'/>
           <parameter type-id='type-id-1'/>
-          <parameter type-id='type-id-12'/>
-          <parameter type-id='type-id-12'/>
-          <parameter type-id='type-id-13'/>
-          <return type-id='type-id-11'/>
+          <parameter type-id='type-id-15'/>
+          <parameter type-id='type-id-15'/>
+          <parameter type-id='type-id-16'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public' vtable-offset='15'>
         <function-decl name='mapgrid2f' mangled-name='_ZN21BasicSurfaceEvaluator9mapgrid2fElfflff' filepath='libnurbs/internals/basicsurfeval.cc' line='116' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-96' is-artificial='yes'/>
-          <parameter type-id='type-id-12'/>
+          <parameter type-id='type-id-15'/>
           <parameter type-id='type-id-1'/>
           <parameter type-id='type-id-1'/>
-          <parameter type-id='type-id-12'/>
+          <parameter type-id='type-id-15'/>
           <parameter type-id='type-id-1'/>
           <parameter type-id='type-id-1'/>
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public' vtable-offset='16'>
         <function-decl name='mapmesh2f' mangled-name='_ZN21BasicSurfaceEvaluator9mapmesh2fElllll' filepath='libnurbs/internals/basicsurfeval.cc' line='124' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-96' is-artificial='yes'/>
-          <parameter type-id='type-id-12'/>
-          <parameter type-id='type-id-12'/>
-          <parameter type-id='type-id-12'/>
-          <parameter type-id='type-id-12'/>
-          <parameter type-id='type-id-12'/>
-          <return type-id='type-id-11'/>
+          <parameter type-id='type-id-15'/>
+          <parameter type-id='type-id-15'/>
+          <parameter type-id='type-id-15'/>
+          <parameter type-id='type-id-15'/>
+          <parameter type-id='type-id-15'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public' vtable-offset='17'>
         <function-decl name='evalcoord2f' mangled-name='_ZN21BasicSurfaceEvaluator11evalcoord2fElff' filepath='libnurbs/internals/basicsurfeval.cc' line='132' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-96' is-artificial='yes'/>
-          <parameter type-id='type-id-12'/>
+          <parameter type-id='type-id-15'/>
           <parameter type-id='type-id-1'/>
           <parameter type-id='type-id-1'/>
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public' vtable-offset='18'>
         <function-decl name='evalpoint2i' mangled-name='_ZN21BasicSurfaceEvaluator11evalpoint2iEll' filepath='libnurbs/internals/basicsurfeval.cc' line='140' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-96' is-artificial='yes'/>
-          <parameter type-id='type-id-12'/>
-          <parameter type-id='type-id-12'/>
-          <return type-id='type-id-11'/>
+          <parameter type-id='type-id-15'/>
+          <parameter type-id='type-id-15'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public' vtable-offset='19'>
         <function-decl name='endmap2f' mangled-name='_ZN21BasicSurfaceEvaluator8endmap2fEv' filepath='libnurbs/internals/basicsurfeval.cc' line='98' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-96' is-artificial='yes'/>
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public' vtable-offset='20'>
         <function-decl name='polymode' mangled-name='_ZN21BasicSurfaceEvaluator8polymodeEl' filepath='libnurbs/internals/basicsurfeval.cc' line='57' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-96' is-artificial='yes'/>
-          <parameter type-id='type-id-12'/>
-          <return type-id='type-id-11'/>
+          <parameter type-id='type-id-15'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public' vtable-offset='21'>
         <function-decl name='bgnline' mangled-name='_ZN21BasicSurfaceEvaluator7bgnlineEv' filepath='libnurbs/internals/basicsurfeval.cc' line='148' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-96' is-artificial='yes'/>
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public' vtable-offset='22'>
         <function-decl name='endline' mangled-name='_ZN21BasicSurfaceEvaluator7endlineEv' filepath='libnurbs/internals/basicsurfeval.cc' line='156' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-96' is-artificial='yes'/>
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public' vtable-offset='23'>
         <function-decl name='bgnclosedline' mangled-name='_ZN21BasicSurfaceEvaluator13bgnclosedlineEv' filepath='libnurbs/internals/basicsurfeval.cc' line='164' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-96' is-artificial='yes'/>
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public' vtable-offset='24'>
         <function-decl name='endclosedline' mangled-name='_ZN21BasicSurfaceEvaluator13endclosedlineEv' filepath='libnurbs/internals/basicsurfeval.cc' line='172' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-96' is-artificial='yes'/>
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public' vtable-offset='25'>
         <function-decl name='bgntmesh' mangled-name='_ZN21BasicSurfaceEvaluator8bgntmeshEv' filepath='libnurbs/internals/basicsurfeval.cc' line='194' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-96' is-artificial='yes'/>
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public' vtable-offset='26'>
         <function-decl name='swaptmesh' mangled-name='_ZN21BasicSurfaceEvaluator9swaptmeshEv' filepath='libnurbs/internals/basicsurfeval.cc' line='202' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-96' is-artificial='yes'/>
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public' vtable-offset='27'>
         <function-decl name='endtmesh' mangled-name='_ZN21BasicSurfaceEvaluator8endtmeshEv' filepath='libnurbs/internals/basicsurfeval.cc' line='210' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-96' is-artificial='yes'/>
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public' vtable-offset='28'>
         <function-decl name='bgnqstrip' mangled-name='_ZN21BasicSurfaceEvaluator9bgnqstripEv' filepath='libnurbs/internals/basicsurfeval.cc' line='218' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-96' is-artificial='yes'/>
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public' vtable-offset='29'>
         <function-decl name='endqstrip' mangled-name='_ZN21BasicSurfaceEvaluator9endqstripEv' filepath='libnurbs/internals/basicsurfeval.cc' line='226' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-96' is-artificial='yes'/>
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public' vtable-offset='30'>
         <function-decl name='bgntfan' mangled-name='_ZN21BasicSurfaceEvaluator7bgntfanEv' filepath='libnurbs/internals/basicsurfeval.cc' line='180' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-96' is-artificial='yes'/>
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public' vtable-offset='31'>
         <function-decl name='endtfan' mangled-name='_ZN21BasicSurfaceEvaluator7endtfanEv' filepath='libnurbs/internals/basicsurfeval.cc' line='188' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-96' is-artificial='yes'/>
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public' vtable-offset='32'>
         <function-decl name='evalUStrip' mangled-name='_ZN21BasicSurfaceEvaluator10evalUStripEifPfifS0_' filepath='libnurbs/internals/basicsurfeval.h' line='75' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-96' is-artificial='yes'/>
-          <parameter type-id='type-id-10'/>
+          <parameter type-id='type-id-11'/>
           <parameter type-id='type-id-1'/>
-          <parameter type-id='type-id-13'/>
-          <parameter type-id='type-id-10'/>
+          <parameter type-id='type-id-16'/>
+          <parameter type-id='type-id-11'/>
           <parameter type-id='type-id-1'/>
-          <parameter type-id='type-id-13'/>
-          <return type-id='type-id-11'/>
+          <parameter type-id='type-id-16'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public' vtable-offset='33'>
         <function-decl name='evalVStrip' mangled-name='_ZN21BasicSurfaceEvaluator10evalVStripEifPfifS0_' filepath='libnurbs/internals/basicsurfeval.h' line='79' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-96' is-artificial='yes'/>
-          <parameter type-id='type-id-10'/>
+          <parameter type-id='type-id-11'/>
           <parameter type-id='type-id-1'/>
-          <parameter type-id='type-id-13'/>
-          <parameter type-id='type-id-10'/>
+          <parameter type-id='type-id-16'/>
+          <parameter type-id='type-id-11'/>
           <parameter type-id='type-id-1'/>
-          <parameter type-id='type-id-13'/>
-          <return type-id='type-id-11'/>
+          <parameter type-id='type-id-16'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public' vtable-offset='34'>
@@ -2588,9 +2588,9 @@
           <parameter type-id='type-id-96' is-artificial='yes'/>
           <parameter type-id='type-id-1'/>
           <parameter type-id='type-id-1'/>
-          <parameter type-id='type-id-13'/>
-          <parameter type-id='type-id-13'/>
-          <return type-id='type-id-11'/>
+          <parameter type-id='type-id-16'/>
+          <parameter type-id='type-id-16'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public' vtable-offset='35'>
@@ -2598,9 +2598,9 @@
           <parameter type-id='type-id-96' is-artificial='yes'/>
           <parameter type-id='type-id-1'/>
           <parameter type-id='type-id-1'/>
-          <parameter type-id='type-id-13'/>
-          <parameter type-id='type-id-13'/>
-          <return type-id='type-id-11'/>
+          <parameter type-id='type-id-16'/>
+          <parameter type-id='type-id-16'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public' vtable-offset='36'>
@@ -2608,23 +2608,23 @@
           <parameter type-id='type-id-96' is-artificial='yes'/>
           <parameter type-id='type-id-1'/>
           <parameter type-id='type-id-1'/>
-          <parameter type-id='type-id-13'/>
-          <parameter type-id='type-id-13'/>
-          <return type-id='type-id-11'/>
+          <parameter type-id='type-id-16'/>
+          <parameter type-id='type-id-16'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public' vtable-offset='37'>
         <function-decl name='inPreEvaluateBV_intfac' mangled-name='_ZN21BasicSurfaceEvaluator22inPreEvaluateBV_intfacEf' filepath='libnurbs/internals/basicsurfeval.h' line='85' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-96' is-artificial='yes'/>
           <parameter type-id='type-id-1'/>
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public' vtable-offset='38'>
         <function-decl name='inPreEvaluateBU_intfac' mangled-name='_ZN21BasicSurfaceEvaluator22inPreEvaluateBU_intfacEf' filepath='libnurbs/internals/basicsurfeval.h' line='86' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-96' is-artificial='yes'/>
           <parameter type-id='type-id-1'/>
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
     </class-decl>
@@ -2652,22 +2652,22 @@
         <var-decl name='type_array' type-id='type-id-101' visibility='default' filepath='libnurbs/interface/bezierPatchMesh.h' line='47' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='448'>
-        <var-decl name='size_UVarray' type-id='type-id-10' visibility='default' filepath='libnurbs/interface/bezierPatchMesh.h' line='50' column='1'/>
+        <var-decl name='size_UVarray' type-id='type-id-11' visibility='default' filepath='libnurbs/interface/bezierPatchMesh.h' line='50' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='480'>
-        <var-decl name='index_UVarray' type-id='type-id-10' visibility='default' filepath='libnurbs/interface/bezierPatchMesh.h' line='51' column='1'/>
+        <var-decl name='index_UVarray' type-id='type-id-11' visibility='default' filepath='libnurbs/interface/bezierPatchMesh.h' line='51' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='512'>
-        <var-decl name='size_length_array' type-id='type-id-10' visibility='default' filepath='libnurbs/interface/bezierPatchMesh.h' line='52' column='1'/>
+        <var-decl name='size_length_array' type-id='type-id-11' visibility='default' filepath='libnurbs/interface/bezierPatchMesh.h' line='52' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='544'>
-        <var-decl name='index_length_array' type-id='type-id-10' visibility='default' filepath='libnurbs/interface/bezierPatchMesh.h' line='53' column='1'/>
+        <var-decl name='index_length_array' type-id='type-id-11' visibility='default' filepath='libnurbs/interface/bezierPatchMesh.h' line='53' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='576'>
-        <var-decl name='counter' type-id='type-id-10' visibility='default' filepath='libnurbs/interface/bezierPatchMesh.h' line='55' column='1'/>
+        <var-decl name='counter' type-id='type-id-11' visibility='default' filepath='libnurbs/interface/bezierPatchMesh.h' line='55' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='608'>
-        <var-decl name='type' type-id='type-id-25' visibility='default' filepath='libnurbs/interface/bezierPatchMesh.h' line='56' column='1'/>
+        <var-decl name='type' type-id='type-id-28' visibility='default' filepath='libnurbs/interface/bezierPatchMesh.h' line='56' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='640'>
         <var-decl name='vertex_array' type-id='type-id-59' visibility='default' filepath='libnurbs/interface/bezierPatchMesh.h' line='59' column='1'/>
@@ -2688,25 +2688,25 @@
     <typedef-decl name='bezierPatch' type-id='type-id-102' filepath='libnurbs/interface/bezierPatch.h' line='65' column='1' id='type-id-103'/>
     <class-decl name='bezierPatch' size-in-bits='384' is-struct='yes' visibility='default' filepath='libnurbs/interface/bezierPatch.h' line='36' column='1' id='type-id-102'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='umin' type-id='type-id-30' visibility='default' filepath='libnurbs/interface/bezierPatch.h' line='37' column='1'/>
+        <var-decl name='umin' type-id='type-id-33' visibility='default' filepath='libnurbs/interface/bezierPatch.h' line='37' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='32'>
-        <var-decl name='vmin' type-id='type-id-30' visibility='default' filepath='libnurbs/interface/bezierPatch.h' line='37' column='1'/>
+        <var-decl name='vmin' type-id='type-id-33' visibility='default' filepath='libnurbs/interface/bezierPatch.h' line='37' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
-        <var-decl name='umax' type-id='type-id-30' visibility='default' filepath='libnurbs/interface/bezierPatch.h' line='37' column='1'/>
+        <var-decl name='umax' type-id='type-id-33' visibility='default' filepath='libnurbs/interface/bezierPatch.h' line='37' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='96'>
-        <var-decl name='vmax' type-id='type-id-30' visibility='default' filepath='libnurbs/interface/bezierPatch.h' line='37' column='1'/>
+        <var-decl name='vmax' type-id='type-id-33' visibility='default' filepath='libnurbs/interface/bezierPatch.h' line='37' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
-        <var-decl name='uorder' type-id='type-id-10' visibility='default' filepath='libnurbs/interface/bezierPatch.h' line='38' column='1'/>
+        <var-decl name='uorder' type-id='type-id-11' visibility='default' filepath='libnurbs/interface/bezierPatch.h' line='38' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='160'>
-        <var-decl name='vorder' type-id='type-id-10' visibility='default' filepath='libnurbs/interface/bezierPatch.h' line='39' column='1'/>
+        <var-decl name='vorder' type-id='type-id-11' visibility='default' filepath='libnurbs/interface/bezierPatch.h' line='39' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='192'>
-        <var-decl name='dimension' type-id='type-id-10' visibility='default' filepath='libnurbs/interface/bezierPatch.h' line='57' column='1'/>
+        <var-decl name='dimension' type-id='type-id-11' visibility='default' filepath='libnurbs/interface/bezierPatch.h' line='57' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='256'>
         <var-decl name='ctlpoints' type-id='type-id-59' visibility='default' filepath='libnurbs/interface/bezierPatch.h' line='58' column='1'/>
@@ -2724,7 +2724,7 @@
         <var-decl name='vprime' type-id='type-id-1' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='65' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
-        <var-decl name='k' type-id='type-id-10' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='66' column='1'/>
+        <var-decl name='k' type-id='type-id-11' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='66' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='96'>
         <var-decl name='u1' type-id='type-id-1' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='67' column='1'/>
@@ -2733,10 +2733,10 @@
         <var-decl name='u2' type-id='type-id-1' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='68' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='160'>
-        <var-decl name='ustride' type-id='type-id-10' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='69' column='1'/>
+        <var-decl name='ustride' type-id='type-id-11' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='69' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='192'>
-        <var-decl name='uorder' type-id='type-id-10' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='70' column='1'/>
+        <var-decl name='uorder' type-id='type-id-11' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='70' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='224'>
         <var-decl name='v1' type-id='type-id-1' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='71' column='1'/>
@@ -2745,10 +2745,10 @@
         <var-decl name='v2' type-id='type-id-1' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='72' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='288'>
-        <var-decl name='vstride' type-id='type-id-10' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='73' column='1'/>
+        <var-decl name='vstride' type-id='type-id-11' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='73' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='320'>
-        <var-decl name='vorder' type-id='type-id-10' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='74' column='1'/>
+        <var-decl name='vorder' type-id='type-id-11' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='74' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='352'>
         <var-decl name='ctlPoints' type-id='type-id-53' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='75' column='1'/>
@@ -2767,13 +2767,13 @@
       </data-member>
     </class-decl>
     <pointer-type-def type-id='type-id-48' size-in-bits='64' id='type-id-96'/>
-    <pointer-type-def type-id='type-id-25' size-in-bits='64' id='type-id-101'/>
+    <pointer-type-def type-id='type-id-28' size-in-bits='64' id='type-id-101'/>
     <pointer-type-def type-id='type-id-90' size-in-bits='64' id='type-id-57'/>
     <pointer-type-def type-id='type-id-95' size-in-bits='64' id='type-id-93'/>
     <pointer-type-def type-id='type-id-105' size-in-bits='64' id='type-id-56'/>
     <pointer-type-def type-id='type-id-102' size-in-bits='64' id='type-id-99'/>
     <pointer-type-def type-id='type-id-97' size-in-bits='64' id='type-id-51'/>
-    <pointer-type-def type-id='type-id-10' size-in-bits='64' id='type-id-100'/>
+    <pointer-type-def type-id='type-id-11' size-in-bits='64' id='type-id-100'/>
     <pointer-type-def type-id='type-id-54' size-in-bits='64' id='type-id-58'/>
     <class-decl name='SurfaceMap' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-105'/>
   </abi-instr>
@@ -2811,25 +2811,25 @@
         <var-decl name='pwlArc' type-id='type-id-115' visibility='default' filepath='libnurbs/internals/arc.h' line='65' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='320'>
-        <var-decl name='type' type-id='type-id-12' visibility='default' filepath='libnurbs/internals/arc.h' line='66' column='1'/>
+        <var-decl name='type' type-id='type-id-15' visibility='default' filepath='libnurbs/internals/arc.h' line='66' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='384'>
-        <var-decl name='nuid' type-id='type-id-12' visibility='default' filepath='libnurbs/internals/arc.h' line='67' column='1'/>
+        <var-decl name='nuid' type-id='type-id-15' visibility='default' filepath='libnurbs/internals/arc.h' line='67' column='1'/>
       </data-member>
       <member-function access='public' constructor='yes'>
         <function-decl name='Arc' filepath='libnurbs/internals/arc.h' line='69' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-116' is-artificial='yes'/>
           <parameter type-id='type-id-116'/>
           <parameter type-id='type-id-115'/>
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public' constructor='yes'>
         <function-decl name='Arc' filepath='libnurbs/internals/arc.h' line='70' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-116' is-artificial='yes'/>
           <parameter type-id='type-id-117'/>
-          <parameter type-id='type-id-12'/>
-          <return type-id='type-id-11'/>
+          <parameter type-id='type-id-15'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
@@ -2842,50 +2842,50 @@
       <member-function access='public'>
         <function-decl name='check' mangled-name='_ZN3Arc5checkEv' filepath='libnurbs/internals/arc.h' line='73' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-116' is-artificial='yes'/>
-          <return type-id='type-id-10'/>
+          <return type-id='type-id-11'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
         <function-decl name='isMonotone' mangled-name='_ZN3Arc10isMonotoneEv' filepath='libnurbs/internals/arc.h' line='74' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-116' is-artificial='yes'/>
-          <return type-id='type-id-10'/>
+          <return type-id='type-id-11'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
         <function-decl name='isDisconnected' mangled-name='_ZN3Arc14isDisconnectedEv' filepath='libnurbs/internals/arc.h' line='75' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-116' is-artificial='yes'/>
-          <return type-id='type-id-10'/>
+          <return type-id='type-id-11'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
         <function-decl name='numpts' mangled-name='_ZN3Arc6numptsEv' filepath='libnurbs/internals/arc.h' line='76' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-116' is-artificial='yes'/>
-          <return type-id='type-id-10'/>
+          <return type-id='type-id-11'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
         <function-decl name='markverts' mangled-name='_ZN3Arc9markvertsEv' filepath='libnurbs/internals/arc.h' line='77' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-116' is-artificial='yes'/>
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
         <function-decl name='getextrema' mangled-name='_ZN3Arc10getextremaEPPS_' filepath='libnurbs/internals/arc.h' line='78' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-116' is-artificial='yes'/>
           <parameter type-id='type-id-118'/>
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
         <function-decl name='print' mangled-name='_ZN3Arc5printEv' filepath='libnurbs/internals/arc.h' line='79' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-116' is-artificial='yes'/>
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
         <function-decl name='show' mangled-name='_ZN3Arc4showEv' filepath='libnurbs/internals/arc.h' line='80' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-116' is-artificial='yes'/>
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
@@ -2893,37 +2893,37 @@
           <parameter type-id='type-id-116' is-artificial='yes'/>
           <parameter type-id='type-id-115'/>
           <parameter type-id='type-id-117'/>
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
         <function-decl name='isTessellated' mangled-name='_ZN3Arc13isTessellatedEv' filepath='libnurbs/internals/arc.h' line='82' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-116' is-artificial='yes'/>
-          <return type-id='type-id-10'/>
+          <return type-id='type-id-11'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
         <function-decl name='isbezier' mangled-name='_ZN3Arc8isbezierEv' filepath='libnurbs/internals/arc.h' line='83' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-116' is-artificial='yes'/>
-          <return type-id='type-id-12'/>
+          <return type-id='type-id-15'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
         <function-decl name='setbezier' mangled-name='_ZN3Arc9setbezierEv' filepath='libnurbs/internals/arc.h' line='84' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-116' is-artificial='yes'/>
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
         <function-decl name='clearbezier' mangled-name='_ZN3Arc11clearbezierEv' filepath='libnurbs/internals/arc.h' line='85' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-116' is-artificial='yes'/>
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
         <function-decl name='npts' mangled-name='_ZN3Arc4nptsEv' filepath='libnurbs/internals/arc.h' line='86' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-116' is-artificial='yes'/>
-          <return type-id='type-id-12'/>
+          <return type-id='type-id-15'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
@@ -2935,50 +2935,50 @@
       <member-function access='public'>
         <function-decl name='tail' mangled-name='_ZN3Arc4tailEv' filepath='libnurbs/internals/arc.h' line='88' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-116' is-artificial='yes'/>
-          <return type-id='type-id-13'/>
+          <return type-id='type-id-16'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
         <function-decl name='head' mangled-name='_ZN3Arc4headEv' filepath='libnurbs/internals/arc.h' line='89' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-116' is-artificial='yes'/>
-          <return type-id='type-id-13'/>
+          <return type-id='type-id-16'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
         <function-decl name='rhead' mangled-name='_ZN3Arc5rheadEv' filepath='libnurbs/internals/arc.h' line='90' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-116' is-artificial='yes'/>
-          <return type-id='type-id-13'/>
+          <return type-id='type-id-16'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
         <function-decl name='ismarked' mangled-name='_ZN3Arc8ismarkedEv' filepath='libnurbs/internals/arc.h' line='91' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-116' is-artificial='yes'/>
-          <return type-id='type-id-12'/>
+          <return type-id='type-id-15'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
         <function-decl name='setmark' mangled-name='_ZN3Arc7setmarkEv' filepath='libnurbs/internals/arc.h' line='92' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-116' is-artificial='yes'/>
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
         <function-decl name='clearmark' mangled-name='_ZN3Arc9clearmarkEv' filepath='libnurbs/internals/arc.h' line='93' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-116' is-artificial='yes'/>
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
         <function-decl name='clearside' mangled-name='_ZN3Arc9clearsideEv' filepath='libnurbs/internals/arc.h' line='94' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-116' is-artificial='yes'/>
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
         <function-decl name='setside' mangled-name='_ZN3Arc7setsideE8arc_side' filepath='libnurbs/internals/arc.h' line='95' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-116' is-artificial='yes'/>
           <parameter type-id='type-id-117'/>
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
@@ -2990,26 +2990,26 @@
       <member-function access='public'>
         <function-decl name='getitail' mangled-name='_ZN3Arc8getitailEv' filepath='libnurbs/internals/arc.h' line='97' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-116' is-artificial='yes'/>
-          <return type-id='type-id-10'/>
+          <return type-id='type-id-11'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
         <function-decl name='setitail' mangled-name='_ZN3Arc8setitailEv' filepath='libnurbs/internals/arc.h' line='98' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-116' is-artificial='yes'/>
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
         <function-decl name='clearitail' mangled-name='_ZN3Arc10clearitailEv' filepath='libnurbs/internals/arc.h' line='99' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-116' is-artificial='yes'/>
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
     </class-decl>
     <class-decl name='Pool' size-in-bits='2496' visibility='default' filepath='libnurbs/internals/bufpool.h' line='50' column='1' id='type-id-68'>
       <member-type access='protected'>
         <enum-decl name='Magic' filepath='libnurbs/internals/bufpool.h' line='70' column='1' id='type-id-120'>
-          <underlying-type type-id='type-id-38'/>
+          <underlying-type type-id='type-id-9'/>
           <enumerator name='is_allocated' value='62369'/>
           <enumerator name='is_free' value='61858'/>
         </enum-decl>
@@ -3021,22 +3021,22 @@
         <var-decl name='blocklist' type-id='type-id-108' visibility='default' filepath='libnurbs/internals/bufpool.h' line='63' column='1'/>
       </data-member>
       <data-member access='protected' layout-offset-in-bits='2112'>
-        <var-decl name='nextblock' type-id='type-id-10' visibility='default' filepath='libnurbs/internals/bufpool.h' line='64' column='1'/>
+        <var-decl name='nextblock' type-id='type-id-11' visibility='default' filepath='libnurbs/internals/bufpool.h' line='64' column='1'/>
       </data-member>
       <data-member access='protected' layout-offset-in-bits='2176'>
         <var-decl name='curblock' type-id='type-id-107' visibility='default' filepath='libnurbs/internals/bufpool.h' line='65' column='1'/>
       </data-member>
       <data-member access='protected' layout-offset-in-bits='2240'>
-        <var-decl name='buffersize' type-id='type-id-10' visibility='default' filepath='libnurbs/internals/bufpool.h' line='66' column='1'/>
+        <var-decl name='buffersize' type-id='type-id-11' visibility='default' filepath='libnurbs/internals/bufpool.h' line='66' column='1'/>
       </data-member>
       <data-member access='protected' layout-offset-in-bits='2272'>
-        <var-decl name='nextsize' type-id='type-id-10' visibility='default' filepath='libnurbs/internals/bufpool.h' line='67' column='1'/>
+        <var-decl name='nextsize' type-id='type-id-11' visibility='default' filepath='libnurbs/internals/bufpool.h' line='67' column='1'/>
       </data-member>
       <data-member access='protected' layout-offset-in-bits='2304'>
-        <var-decl name='nextfree' type-id='type-id-10' visibility='default' filepath='libnurbs/internals/bufpool.h' line='68' column='1'/>
+        <var-decl name='nextfree' type-id='type-id-11' visibility='default' filepath='libnurbs/internals/bufpool.h' line='68' column='1'/>
       </data-member>
       <data-member access='protected' layout-offset-in-bits='2336'>
-        <var-decl name='initsize' type-id='type-id-10' visibility='default' filepath='libnurbs/internals/bufpool.h' line='69' column='1'/>
+        <var-decl name='initsize' type-id='type-id-11' visibility='default' filepath='libnurbs/internals/bufpool.h' line='69' column='1'/>
       </data-member>
       <data-member access='protected' layout-offset-in-bits='2368'>
         <var-decl name='name' type-id='type-id-83' visibility='default' filepath='libnurbs/internals/bufpool.h' line='71' column='1'/>
@@ -3047,42 +3047,42 @@
       <member-function access='private' constructor='yes'>
         <function-decl name='Pool' filepath='libnurbs/internals/bufpool.h' line='52' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-122' is-artificial='yes'/>
-          <parameter type-id='type-id-10'/>
-          <parameter type-id='type-id-10'/>
+          <parameter type-id='type-id-11'/>
+          <parameter type-id='type-id-11'/>
           <parameter type-id='type-id-83'/>
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private' destructor='yes'>
         <function-decl name='~Pool' filepath='libnurbs/internals/bufpool.h' line='53' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-122' is-artificial='yes'/>
-          <parameter type-id='type-id-10' is-artificial='yes'/>
-          <return type-id='type-id-11'/>
+          <parameter type-id='type-id-11' is-artificial='yes'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
         <function-decl name='new_buffer' mangled-name='_ZN4Pool10new_bufferEv' filepath='libnurbs/internals/bufpool.h' line='54' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-122' is-artificial='yes'/>
-          <return type-id='type-id-22'/>
+          <return type-id='type-id-25'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
         <function-decl name='free_buffer' mangled-name='_ZN4Pool11free_bufferEPv' filepath='libnurbs/internals/bufpool.h' line='55' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-122' is-artificial='yes'/>
-          <parameter type-id='type-id-22'/>
-          <return type-id='type-id-11'/>
+          <parameter type-id='type-id-25'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
         <function-decl name='clear' mangled-name='_ZN4Pool5clearEv' filepath='libnurbs/internals/bufpool.h' line='56' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-122' is-artificial='yes'/>
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
         <function-decl name='grow' mangled-name='_ZN4Pool4growEv' filepath='libnurbs/internals/bufpool.h' line='59' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-122' is-artificial='yes'/>
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
     </class-decl>
@@ -3097,46 +3097,46 @@
         <function-decl name='operator new' mangled-name='_ZN9PooledObjnwEmR4Pool' filepath='libnurbs/internals/bufpool.h' line='120' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-123'/>
           <parameter type-id='type-id-125'/>
-          <return type-id='type-id-22'/>
+          <return type-id='type-id-25'/>
         </function-decl>
       </member-function>
       <member-function access='private' static='yes'>
         <function-decl name='operator new' mangled-name='_ZN9PooledObjnwEmPv' filepath='libnurbs/internals/bufpool.h' line='121' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-123'/>
-          <parameter type-id='type-id-22'/>
-          <return type-id='type-id-22'/>
+          <parameter type-id='type-id-25'/>
+          <return type-id='type-id-25'/>
         </function-decl>
       </member-function>
       <member-function access='private' static='yes'>
         <function-decl name='operator new' mangled-name='_ZN9PooledObjnwEm' filepath='libnurbs/internals/bufpool.h' line='122' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-123'/>
-          <return type-id='type-id-22'/>
+          <return type-id='type-id-25'/>
         </function-decl>
       </member-function>
       <member-function access='private' static='yes'>
         <function-decl name='operator delete' mangled-name='_ZN9PooledObjdlEPv' filepath='libnurbs/internals/bufpool.h' line='124' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-22'/>
-          <return type-id='type-id-11'/>
+          <parameter type-id='type-id-25'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private' static='yes'>
         <function-decl name='operator delete' mangled-name='_ZN9PooledObjdlEPvR4Pool' filepath='libnurbs/internals/bufpool.h' line='125' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-22'/>
+          <parameter type-id='type-id-25'/>
           <parameter type-id='type-id-125'/>
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
         <function-decl name='deleteMe' mangled-name='_ZN9PooledObj8deleteMeER4Pool' filepath='libnurbs/internals/bufpool.h' line='126' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-126' is-artificial='yes'/>
           <parameter type-id='type-id-125'/>
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
     </class-decl>
     <typedef-decl name='Arc_ptr' type-id='type-id-116' filepath='libnurbs/internals/arc.h' line='50' column='1' id='type-id-113'/>
     <enum-decl name='arc_side' filepath='libnurbs/internals/arc.h' line='52' column='1' id='type-id-117'>
-      <underlying-type type-id='type-id-38'/>
+      <underlying-type type-id='type-id-9'/>
       <enumerator name='arc_none' value='0'/>
       <enumerator name='arc_right' value='1'/>
       <enumerator name='arc_top' value='2'/>
@@ -3149,32 +3149,32 @@
         <var-decl name='pts' type-id='type-id-119' visibility='default' filepath='libnurbs/internals/pwlarc.h' line='46' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='64'>
-        <var-decl name='npts' type-id='type-id-10' visibility='default' filepath='libnurbs/internals/pwlarc.h' line='47' column='1'/>
+        <var-decl name='npts' type-id='type-id-11' visibility='default' filepath='libnurbs/internals/pwlarc.h' line='47' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='128'>
-        <var-decl name='type' type-id='type-id-12' visibility='default' filepath='libnurbs/internals/pwlarc.h' line='48' column='1'/>
+        <var-decl name='type' type-id='type-id-15' visibility='default' filepath='libnurbs/internals/pwlarc.h' line='48' column='1'/>
       </data-member>
       <member-function access='private' constructor='yes'>
         <function-decl name='PwlArc' filepath='libnurbs/internals/pwlarc.h' line='49' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-115' is-artificial='yes'/>
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private' constructor='yes'>
         <function-decl name='PwlArc' filepath='libnurbs/internals/pwlarc.h' line='50' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-115' is-artificial='yes'/>
-          <parameter type-id='type-id-10'/>
+          <parameter type-id='type-id-11'/>
           <parameter type-id='type-id-119'/>
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private' constructor='yes'>
         <function-decl name='PwlArc' filepath='libnurbs/internals/pwlarc.h' line='51' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-115' is-artificial='yes'/>
-          <parameter type-id='type-id-10'/>
+          <parameter type-id='type-id-11'/>
           <parameter type-id='type-id-119'/>
-          <parameter type-id='type-id-12'/>
-          <return type-id='type-id-11'/>
+          <parameter type-id='type-id-15'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
     </class-decl>
@@ -3183,7 +3183,7 @@
         <var-decl name='param' type-id='type-id-89' visibility='default' filepath='libnurbs/internals/trimvertex.h' line='45' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
-        <var-decl name='nuid' type-id='type-id-12' visibility='default' filepath='libnurbs/internals/trimvertex.h' line='50' column='1'/>
+        <var-decl name='nuid' type-id='type-id-15' visibility='default' filepath='libnurbs/internals/trimvertex.h' line='50' column='1'/>
       </data-member>
     </class-decl>
     <pointer-type-def type-id='type-id-110' size-in-bits='64' id='type-id-116'/>
@@ -3198,7 +3198,7 @@
     <pointer-type-def type-id='type-id-106' size-in-bits='64' id='type-id-107'/>
     <qualified-type-def type-id='type-id-106' const='yes' id='type-id-130'/>
     <pointer-type-def type-id='type-id-130' size-in-bits='64' id='type-id-83'/>
-    <qualified-type-def type-id='type-id-10' const='yes' id='type-id-112'/>
+    <qualified-type-def type-id='type-id-11' const='yes' id='type-id-112'/>
     <class-decl name='BezierArc' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-129'/>
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='libnurbs/internals/arcsorter.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-T0fsxk/Mesa-8.0.5/src/glu/sgi' language='LANG_C_plus_plus'>
@@ -3218,10 +3218,10 @@
         <var-decl name='range' type-id='type-id-137' visibility='default' filepath='libnurbs/internals/curvelist.h' line='58' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='160'>
-        <var-decl name='needsSubdivision' type-id='type-id-10' visibility='default' filepath='libnurbs/internals/curvelist.h' line='59' column='1'/>
+        <var-decl name='needsSubdivision' type-id='type-id-11' visibility='default' filepath='libnurbs/internals/curvelist.h' line='59' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='192'>
-        <var-decl name='stepsize' type-id='type-id-30' visibility='default' filepath='libnurbs/internals/curvelist.h' line='60' column='1'/>
+        <var-decl name='stepsize' type-id='type-id-33' visibility='default' filepath='libnurbs/internals/curvelist.h' line='60' column='1'/>
       </data-member>
       <member-function access='public' constructor='yes'>
         <function-decl name='Curvelist' filepath='libnurbs/internals/curvelist.h' line='50' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -3229,7 +3229,7 @@
           <parameter type-id='type-id-139'/>
           <parameter type-id='type-id-1'/>
           <parameter type-id='type-id-1'/>
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public' constructor='yes'>
@@ -3237,32 +3237,32 @@
           <parameter type-id='type-id-138' is-artificial='yes'/>
           <parameter type-id='type-id-140'/>
           <parameter type-id='type-id-1'/>
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public' destructor='yes'>
         <function-decl name='~Curvelist' filepath='libnurbs/internals/curvelist.h' line='52' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-138' is-artificial='yes'/>
-          <parameter type-id='type-id-10' is-artificial='yes'/>
-          <return type-id='type-id-11'/>
+          <parameter type-id='type-id-11' is-artificial='yes'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
         <function-decl name='cullCheck' mangled-name='_ZN9Curvelist9cullCheckEv' filepath='libnurbs/internals/curvelist.h' line='53' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-138' is-artificial='yes'/>
-          <return type-id='type-id-10'/>
+          <return type-id='type-id-11'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
         <function-decl name='getstepsize' mangled-name='_ZN9Curvelist11getstepsizeEv' filepath='libnurbs/internals/curvelist.h' line='54' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-138' is-artificial='yes'/>
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
         <function-decl name='needsSamplingSubdivision' mangled-name='_ZN9Curvelist24needsSamplingSubdivisionEv' filepath='libnurbs/internals/curvelist.h' line='55' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-138' is-artificial='yes'/>
-          <return type-id='type-id-10'/>
+          <return type-id='type-id-11'/>
         </function-decl>
       </member-function>
     </class-decl>
@@ -3280,69 +3280,69 @@
         <var-decl name='tmp1' type-id='type-id-1' visibility='default' filepath='libnurbs/internals/renderhints.h' line='52' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
-        <var-decl name='displaydomain' type-id='type-id-10' visibility='default' filepath='libnurbs/internals/renderhints.h' line='54' column='1'/>
+        <var-decl name='displaydomain' type-id='type-id-11' visibility='default' filepath='libnurbs/internals/renderhints.h' line='54' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='160'>
-        <var-decl name='maxsubdivisions' type-id='type-id-10' visibility='default' filepath='libnurbs/internals/renderhints.h' line='55' column='1'/>
+        <var-decl name='maxsubdivisions' type-id='type-id-11' visibility='default' filepath='libnurbs/internals/renderhints.h' line='55' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='192'>
-        <var-decl name='wiretris' type-id='type-id-10' visibility='default' filepath='libnurbs/internals/renderhints.h' line='56' column='1'/>
+        <var-decl name='wiretris' type-id='type-id-11' visibility='default' filepath='libnurbs/internals/renderhints.h' line='56' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='224'>
-        <var-decl name='wirequads' type-id='type-id-10' visibility='default' filepath='libnurbs/internals/renderhints.h' line='57' column='1'/>
+        <var-decl name='wirequads' type-id='type-id-11' visibility='default' filepath='libnurbs/internals/renderhints.h' line='57' column='1'/>
       </data-member>
       <member-function access='public' constructor='yes'>
         <function-decl name='Renderhints' filepath='libnurbs/internals/renderhints.h' line='43' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-141' is-artificial='yes'/>
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
         <function-decl name='init' mangled-name='_ZN11Renderhints4initEv' filepath='libnurbs/internals/renderhints.h' line='44' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-141' is-artificial='yes'/>
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
         <function-decl name='isProperty' mangled-name='_ZN11Renderhints10isPropertyEl' filepath='libnurbs/internals/renderhints.h' line='45' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-141' is-artificial='yes'/>
-          <parameter type-id='type-id-12'/>
-          <return type-id='type-id-10'/>
+          <parameter type-id='type-id-15'/>
+          <return type-id='type-id-11'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
         <function-decl name='getProperty' mangled-name='_ZN11Renderhints11getPropertyEl' filepath='libnurbs/internals/renderhints.h' line='46' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-141' is-artificial='yes'/>
-          <parameter type-id='type-id-12'/>
+          <parameter type-id='type-id-15'/>
           <return type-id='type-id-1'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
         <function-decl name='setProperty' mangled-name='_ZN11Renderhints11setPropertyElf' filepath='libnurbs/internals/renderhints.h' line='47' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-141' is-artificial='yes'/>
-          <parameter type-id='type-id-12'/>
+          <parameter type-id='type-id-15'/>
           <parameter type-id='type-id-1'/>
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
     </class-decl>
     <class-decl name='Sorter' size-in-bits='128' visibility='default' filepath='libnurbs/internals/sorter.h' line='36' column='1' id='type-id-142'>
       <data-member access='private' layout-offset-in-bits='64'>
-        <var-decl name='es' type-id='type-id-10' visibility='default' filepath='libnurbs/internals/sorter.h' line='49' column='1'/>
+        <var-decl name='es' type-id='type-id-11' visibility='default' filepath='libnurbs/internals/sorter.h' line='49' column='1'/>
       </data-member>
       <member-function access='private' constructor='yes'>
         <function-decl name='Sorter' filepath='libnurbs/internals/sorter.cc' line='44' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-143' is-artificial='yes'/>
-          <parameter type-id='type-id-10' is-artificial='yes'/>
-          <return type-id='type-id-11'/>
+          <parameter type-id='type-id-11' is-artificial='yes'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
         <function-decl name='qsort' mangled-name='_ZN6Sorter5qsortEPvi' filepath='libnurbs/internals/sorter.cc' line='50' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-143' is-artificial='yes'/>
-          <parameter type-id='type-id-22'/>
-          <parameter type-id='type-id-10'/>
-          <return type-id='type-id-11'/>
+          <parameter type-id='type-id-25'/>
+          <parameter type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -3350,14 +3350,14 @@
           <parameter type-id='type-id-143' is-artificial='yes'/>
           <parameter type-id='type-id-107'/>
           <parameter type-id='type-id-107'/>
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private' destructor='yes' vtable-offset='-1'>
         <function-decl name='~Sorter' filepath='libnurbs/internals/sorter.h' line='39' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-143' is-artificial='yes'/>
-          <parameter type-id='type-id-10' is-artificial='yes'/>
-          <return type-id='type-id-11'/>
+          <parameter type-id='type-id-143' is-artificial='yes'/>
+          <parameter type-id='type-id-11' is-artificial='yes'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='protected' vtable-offset='2'>
@@ -3365,7 +3365,7 @@
           <parameter type-id='type-id-143' is-artificial='yes'/>
           <parameter type-id='type-id-107'/>
           <parameter type-id='type-id-107'/>
-          <return type-id='type-id-10'/>
+          <return type-id='type-id-11'/>
         </function-decl>
       </member-function>
       <member-function access='protected' vtable-offset='3'>
@@ -3373,7 +3373,7 @@
           <parameter type-id='type-id-143' is-artificial='yes'/>
           <parameter type-id='type-id-107'/>
           <parameter type-id='type-id-107'/>
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='protected' vtable-offset='4'>
@@ -3382,7 +3382,7 @@
           <parameter type-id='type-id-107'/>
           <parameter type-id='type-id-107'/>
           <parameter type-id='type-id-107'/>
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
     </class-decl>
@@ -3395,15 +3395,15 @@
         <function-decl name='ArcSorter' filepath='libnurbs/internals/arcsorter.cc' line='48' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-146' is-artificial='yes'/>
           <parameter type-id='type-id-147'/>
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
         <function-decl name='qsort' mangled-name='_ZN9ArcSorter5qsortEPP3Arci' filepath='libnurbs/internals/arcsorter.cc' line='60' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-146' is-artificial='yes'/>
           <parameter type-id='type-id-148'/>
-          <parameter type-id='type-id-10'/>
-          <return type-id='type-id-11'/>
+          <parameter type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='protected' vtable-offset='2'>
@@ -3411,7 +3411,7 @@
           <parameter type-id='type-id-146' is-artificial='yes'/>
           <parameter type-id='type-id-107'/>
           <parameter type-id='type-id-107'/>
-          <return type-id='type-id-10'/>
+          <return type-id='type-id-11'/>
         </function-decl>
       </member-function>
       <member-function access='private' vtable-offset='3'>
@@ -3419,7 +3419,7 @@
           <parameter type-id='type-id-146' is-artificial='yes'/>
           <parameter type-id='type-id-107'/>
           <parameter type-id='type-id-107'/>
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private' vtable-offset='4'>
@@ -3428,7 +3428,7 @@
           <parameter type-id='type-id-107'/>
           <parameter type-id='type-id-107'/>
           <parameter type-id='type-id-107'/>
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
     </class-decl>
@@ -3437,22 +3437,22 @@
       <member-function access='private' constructor='yes'>
         <function-decl name='FlistSorter' filepath='libnurbs/internals/flistsorter.cc' line='43' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-150' is-artificial='yes'/>
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
         <function-decl name='qsort' mangled-name='_ZN11FlistSorter5qsortEPfi' filepath='libnurbs/internals/flistsorter.cc' line='48' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-150' is-artificial='yes'/>
-          <parameter type-id='type-id-13'/>
-          <parameter type-id='type-id-10'/>
-          <return type-id='type-id-11'/>
+          <parameter type-id='type-id-16'/>
+          <parameter type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private' destructor='yes' vtable-offset='-1'>
         <function-decl name='~FlistSorter' filepath='libnurbs/internals/flistsorter.h' line='45' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-150' is-artificial='yes'/>
-          <parameter type-id='type-id-10' is-artificial='yes'/>
-          <return type-id='type-id-11'/>
+          <parameter type-id='type-id-11' is-artificial='yes'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='protected' vtable-offset='2'>
@@ -3460,7 +3460,7 @@
           <parameter type-id='type-id-150' is-artificial='yes'/>
           <parameter type-id='type-id-107'/>
           <parameter type-id='type-id-107'/>
-          <return type-id='type-id-10'/>
+          <return type-id='type-id-11'/>
         </function-decl>
       </member-function>
       <member-function access='protected' vtable-offset='3'>
@@ -3468,7 +3468,7 @@
           <parameter type-id='type-id-150' is-artificial='yes'/>
           <parameter type-id='type-id-107'/>
           <parameter type-id='type-id-107'/>
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='protected' vtable-offset='4'>
@@ -3477,22 +3477,22 @@
           <parameter type-id='type-id-107'/>
           <parameter type-id='type-id-107'/>
           <parameter type-id='type-id-107'/>
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
     </class-decl>
     <class-decl name='Flist' size-in-bits='320' visibility='default' filepath='libnurbs/internals/flist.h' line='42' column='1' id='type-id-151'>
       <data-member access='private' layout-offset-in-bits='0'>
-        <var-decl name='pts' type-id='type-id-13' visibility='default' filepath='libnurbs/internals/flist.h' line='44' column='1'/>
+        <var-decl name='pts' type-id='type-id-16' visibility='default' filepath='libnurbs/internals/flist.h' line='44' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='64'>
-        <var-decl name='npts' type-id='type-id-10' visibility='default' filepath='libnurbs/internals/flist.h' line='45' column='1'/>
+        <var-decl name='npts' type-id='type-id-11' visibility='default' filepath='libnurbs/internals/flist.h' line='45' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='96'>
-        <var-decl name='start' type-id='type-id-10' visibility='default' filepath='libnurbs/internals/flist.h' line='46' column='1'/>
+        <var-decl name='start' type-id='type-id-11' visibility='default' filepath='libnurbs/internals/flist.h' line='46' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='128'>
-        <var-decl name='end' type-id='type-id-10' visibility='default' filepath='libnurbs/internals/flist.h' line='47' column='1'/>
+        <var-decl name='end' type-id='type-id-11' visibility='default' filepath='libnurbs/internals/flist.h' line='47' column='1'/>
       </data-member>
       <data-member access='protected' layout-offset-in-bits='192'>
         <var-decl name='sorter' type-id='type-id-149' visibility='default' filepath='libnurbs/internals/flist.h' line='56' column='1'/>
@@ -3500,34 +3500,34 @@
       <member-function access='private' constructor='yes'>
         <function-decl name='Flist' filepath='libnurbs/internals/flist.h' line='49' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-152' is-artificial='yes'/>
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private' destructor='yes'>
         <function-decl name='~Flist' filepath='libnurbs/internals/flist.h' line='50' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-152' is-artificial='yes'/>
-          <parameter type-id='type-id-10' is-artificial='yes'/>
-          <return type-id='type-id-11'/>
+          <parameter type-id='type-id-11' is-artificial='yes'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
         <function-decl name='add' mangled-name='_ZN5Flist3addEf' filepath='libnurbs/internals/flist.h' line='51' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-152' is-artificial='yes'/>
           <parameter type-id='type-id-1'/>
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
         <function-decl name='filter' mangled-name='_ZN5Flist6filterEv' filepath='libnurbs/internals/flist.h' line='52' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-152' is-artificial='yes'/>
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
         <function-decl name='grow' mangled-name='_ZN5Flist4growEi' filepath='libnurbs/internals/flist.h' line='53' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-152' is-artificial='yes'/>
-          <parameter type-id='type-id-10' is-artificial='yes'/>
-          <return type-id='type-id-11'/>
+          <parameter type-id='type-id-11' is-artificial='yes'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -3535,7 +3535,7 @@
           <parameter type-id='type-id-152' is-artificial='yes'/>
           <parameter type-id='type-id-1'/>
           <parameter type-id='type-id-1'/>
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
     </class-decl>
@@ -3547,34 +3547,34 @@
         <var-decl name='vlist' type-id='type-id-153' visibility='default' filepath='libnurbs/internals/trimvertpool.h' line='53' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='2560'>
-        <var-decl name='nextvlistslot' type-id='type-id-10' visibility='default' filepath='libnurbs/internals/trimvertpool.h' line='54' column='1'/>
+        <var-decl name='nextvlistslot' type-id='type-id-11' visibility='default' filepath='libnurbs/internals/trimvertpool.h' line='54' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='2592'>
-        <var-decl name='vlistsize' type-id='type-id-10' visibility='default' filepath='libnurbs/internals/trimvertpool.h' line='55' column='1'/>
+        <var-decl name='vlistsize' type-id='type-id-11' visibility='default' filepath='libnurbs/internals/trimvertpool.h' line='55' column='1'/>
       </data-member>
       <member-function access='public' constructor='yes'>
         <function-decl name='TrimVertexPool' filepath='libnurbs/internals/trimvertpool.h' line='47' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-154' is-artificial='yes'/>
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public' destructor='yes'>
         <function-decl name='~TrimVertexPool' filepath='libnurbs/internals/trimvertpool.h' line='48' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-154' is-artificial='yes'/>
-          <parameter type-id='type-id-10' is-artificial='yes'/>
-          <return type-id='type-id-11'/>
+          <parameter type-id='type-id-11' is-artificial='yes'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
         <function-decl name='clear' mangled-name='_ZN14TrimVertexPool5clearEv' filepath='libnurbs/internals/trimvertpool.h' line='49' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-154' is-artificial='yes'/>
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
         <function-decl name='get' mangled-name='_ZN14TrimVertexPool3getEi' filepath='libnurbs/internals/trimvertpool.h' line='50' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-154' is-artificial='yes'/>
-          <parameter type-id='type-id-10'/>
+          <parameter type-id='type-id-11'/>
           <return type-id='type-id-119'/>
         </function-decl>
       </member-function>
@@ -3589,14 +3589,14 @@
       <member-function access='private' constructor='yes'>
         <function-decl name='Bin' filepath='libnurbs/internals/bin.h' line='49' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-156' is-artificial='yes'/>
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private' destructor='yes'>
         <function-decl name='~Bin' filepath='libnurbs/internals/bin.h' line='50' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-156' is-artificial='yes'/>
-          <parameter type-id='type-id-10' is-artificial='yes'/>
-          <return type-id='type-id-11'/>
+          <parameter type-id='type-id-11' is-artificial='yes'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -3620,52 +3620,52 @@
       <member-function access='private'>
         <function-decl name='isnonempty' mangled-name='_ZN3Bin10isnonemptyEv' filepath='libnurbs/internals/bin.h' line='54' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-156' is-artificial='yes'/>
-          <return type-id='type-id-10'/>
+          <return type-id='type-id-11'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
         <function-decl name='addarc' mangled-name='_ZN3Bin6addarcEP3Arc' filepath='libnurbs/internals/bin.h' line='55' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-156' is-artificial='yes'/>
           <parameter type-id='type-id-113'/>
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
         <function-decl name='remove_this_arc' mangled-name='_ZN3Bin15remove_this_arcEP3Arc' filepath='libnurbs/internals/bin.h' line='56' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-156' is-artificial='yes'/>
           <parameter type-id='type-id-113'/>
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
         <function-decl name='numarcs' mangled-name='_ZN3Bin7numarcsEv' filepath='libnurbs/internals/bin.h' line='57' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-156' is-artificial='yes'/>
-          <return type-id='type-id-10'/>
+          <return type-id='type-id-11'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
         <function-decl name='adopt' mangled-name='_ZN3Bin5adoptEv' filepath='libnurbs/internals/bin.h' line='58' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-156' is-artificial='yes'/>
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
         <function-decl name='markall' mangled-name='_ZN3Bin7markallEv' filepath='libnurbs/internals/bin.h' line='59' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-156' is-artificial='yes'/>
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
         <function-decl name='show' mangled-name='_ZN3Bin4showEPKc' filepath='libnurbs/internals/bin.h' line='60' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-156' is-artificial='yes'/>
           <parameter type-id='type-id-83'/>
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
         <function-decl name='listBezier' mangled-name='_ZN3Bin10listBezierEv' filepath='libnurbs/internals/bin.h' line='61' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-156' is-artificial='yes'/>
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
     </class-decl>
@@ -3684,14 +3684,14 @@
           <parameter type-id='type-id-160' is-artificial='yes'/>
           <parameter type-id='type-id-161'/>
           <parameter type-id='type-id-125'/>
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private' destructor='yes'>
         <function-decl name='~ArcTessellator' filepath='libnurbs/internals/arctess.h' line='50' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-160' is-artificial='yes'/>
-          <parameter type-id='type-id-10' is-artificial='yes'/>
-          <return type-id='type-id-11'/>
+          <parameter type-id='type-id-11' is-artificial='yes'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -3702,7 +3702,7 @@
           <parameter type-id='type-id-1'/>
           <parameter type-id='type-id-1'/>
           <parameter type-id='type-id-1'/>
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -3714,7 +3714,7 @@
           <parameter type-id='type-id-1'/>
           <parameter type-id='type-id-1'/>
           <parameter type-id='type-id-1'/>
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -3725,7 +3725,7 @@
           <parameter type-id='type-id-1'/>
           <parameter type-id='type-id-1'/>
           <parameter type-id='type-id-1'/>
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -3736,7 +3736,7 @@
           <parameter type-id='type-id-1'/>
           <parameter type-id='type-id-1'/>
           <parameter type-id='type-id-1'/>
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -3747,7 +3747,7 @@
           <parameter type-id='type-id-1'/>
           <parameter type-id='type-id-1'/>
           <parameter type-id='type-id-1'/>
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -3758,7 +3758,7 @@
           <parameter type-id='type-id-1'/>
           <parameter type-id='type-id-1'/>
           <parameter type-id='type-id-1'/>
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -3767,8 +3767,8 @@
           <parameter type-id='type-id-113'/>
           <parameter type-id='type-id-1'/>
           <parameter type-id='type-id-1'/>
-          <parameter type-id='type-id-10'/>
-          <return type-id='type-id-11'/>
+          <parameter type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -3777,16 +3777,16 @@
           <parameter type-id='type-id-113'/>
           <parameter type-id='type-id-1'/>
           <parameter type-id='type-id-1'/>
-          <parameter type-id='type-id-10'/>
-          <return type-id='type-id-11'/>
+          <parameter type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private' static='yes'>
         <function-decl name='trim_power_coeffs' mangled-name='_ZN14ArcTessellator17trim_power_coeffsEP9BezierArcPfi' filepath='libnurbs/internals/arctess.h' line='63' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-114'/>
-          <parameter type-id='type-id-13'/>
-          <parameter type-id='type-id-10'/>
-          <return type-id='type-id-11'/>
+          <parameter type-id='type-id-16'/>
+          <parameter type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
     </class-decl>
@@ -3796,7 +3796,7 @@
         <var-decl name='mapdesc' type-id='type-id-163' visibility='default' filepath='libnurbs/internals/quilt.h' line='67' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
-        <var-decl name='cpts' type-id='type-id-13' visibility='default' filepath='libnurbs/internals/quilt.h' line='68' column='1'/>
+        <var-decl name='cpts' type-id='type-id-16' visibility='default' filepath='libnurbs/internals/quilt.h' line='68' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
         <var-decl name='qspec' type-id='type-id-164' visibility='default' filepath='libnurbs/internals/quilt.h' line='69' column='1'/>
@@ -3811,14 +3811,14 @@
         <function-decl name='Quilt' filepath='libnurbs/internals/quilt.h' line='66' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-139' is-artificial='yes'/>
           <parameter type-id='type-id-163'/>
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
         <function-decl name='deleteMe' mangled-name='_ZN5Quilt8deleteMeER4Pool' filepath='libnurbs/internals/quilt.h' line='74' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-139' is-artificial='yes'/>
           <parameter type-id='type-id-125'/>
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
@@ -3826,8 +3826,8 @@
           <parameter type-id='type-id-139' is-artificial='yes'/>
           <parameter type-id='type-id-166'/>
           <parameter type-id='type-id-59'/>
-          <parameter type-id='type-id-12'/>
-          <return type-id='type-id-11'/>
+          <parameter type-id='type-id-15'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
@@ -3836,73 +3836,73 @@
           <parameter type-id='type-id-166'/>
           <parameter type-id='type-id-166'/>
           <parameter type-id='type-id-59'/>
-          <parameter type-id='type-id-12'/>
-          <return type-id='type-id-11'/>
+          <parameter type-id='type-id-15'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
         <function-decl name='select' mangled-name='_ZN5Quilt6selectEPfS0_' filepath='libnurbs/internals/quilt.h' line='77' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-139' is-artificial='yes'/>
-          <parameter type-id='type-id-13'/>
-          <parameter type-id='type-id-13'/>
-          <return type-id='type-id-11'/>
+          <parameter type-id='type-id-16'/>
+          <parameter type-id='type-id-16'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
         <function-decl name='getDimension' mangled-name='_ZN5Quilt12getDimensionEv' filepath='libnurbs/internals/quilt.h' line='78' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-139' is-artificial='yes'/>
-          <return type-id='type-id-10'/>
+          <return type-id='type-id-11'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
         <function-decl name='download' mangled-name='_ZN5Quilt8downloadER7Backend' filepath='libnurbs/internals/quilt.h' line='79' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-139' is-artificial='yes'/>
           <parameter type-id='type-id-167'/>
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
         <function-decl name='downloadAll' mangled-name='_ZN5Quilt11downloadAllEPfS0_R7Backend' filepath='libnurbs/internals/quilt.h' line='80' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-139' is-artificial='yes'/>
-          <parameter type-id='type-id-13'/>
-          <parameter type-id='type-id-13'/>
+          <parameter type-id='type-id-16'/>
+          <parameter type-id='type-id-16'/>
           <parameter type-id='type-id-167'/>
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
         <function-decl name='isCulled' mangled-name='_ZN5Quilt8isCulledEv' filepath='libnurbs/internals/quilt.h' line='81' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-139' is-artificial='yes'/>
-          <return type-id='type-id-10'/>
+          <return type-id='type-id-11'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
         <function-decl name='getRange' mangled-name='_ZN5Quilt8getRangeEPfS0_R5FlistS2_' filepath='libnurbs/internals/quilt.h' line='82' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-139' is-artificial='yes'/>
-          <parameter type-id='type-id-13'/>
-          <parameter type-id='type-id-13'/>
+          <parameter type-id='type-id-16'/>
+          <parameter type-id='type-id-16'/>
           <parameter type-id='type-id-168'/>
           <parameter type-id='type-id-168'/>
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
         <function-decl name='getRange' mangled-name='_ZN5Quilt8getRangeEPfS0_iR5Flist' filepath='libnurbs/internals/quilt.h' line='83' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-139' is-artificial='yes'/>
-          <parameter type-id='type-id-13'/>
-          <parameter type-id='type-id-13'/>
-          <parameter type-id='type-id-10'/>
+          <parameter type-id='type-id-16'/>
+          <parameter type-id='type-id-16'/>
+          <parameter type-id='type-id-11'/>
           <parameter type-id='type-id-168'/>
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
         <function-decl name='getRange' mangled-name='_ZN5Quilt8getRangeEPfS0_R5Flist' filepath='libnurbs/internals/quilt.h' line='84' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-139' is-artificial='yes'/>
-          <parameter type-id='type-id-13'/>
-          <parameter type-id='type-id-13'/>
+          <parameter type-id='type-id-16'/>
+          <parameter type-id='type-id-16'/>
           <parameter type-id='type-id-168'/>
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
@@ -3910,8 +3910,8 @@
           <parameter type-id='type-id-139' is-artificial='yes'/>
           <parameter type-id='type-id-168'/>
           <parameter type-id='type-id-168'/>
-          <parameter type-id='type-id-13'/>
-          <return type-id='type-id-11'/>
+          <parameter type-id='type-id-16'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
@@ -3919,20 +3919,20 @@
           <parameter type-id='type-id-139' is-artificial='yes'/>
           <parameter type-id='type-id-168'/>
           <parameter type-id='type-id-168'/>
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
         <function-decl name='show' mangled-name='_ZN5Quilt4showEv' filepath='libnurbs/internals/quilt.h' line='87' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-139' is-artificial='yes'/>
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
     </class-decl>
     <class-decl name='Subdivider' size-in-bits='20416' visibility='default' filepath='libnurbs/internals/subdivider.h' line='55' column='1' id='type-id-66'>
       <member-type access='private'>
         <enum-decl name='dir' filepath='libnurbs/internals/subdivider.h' line='105' column='1' id='type-id-169'>
-          <underlying-type type-id='type-id-38'/>
+          <underlying-type type-id='type-id-9'/>
           <enumerator name='down' value='0'/>
           <enumerator name='same' value='1'/>
           <enumerator name='up' value='2'/>
@@ -3973,10 +3973,10 @@
         <var-decl name='pjarc' type-id='type-id-113' visibility='default' filepath='libnurbs/internals/subdivider.h' line='124' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='18688'>
-        <var-decl name='s_index' type-id='type-id-10' visibility='default' filepath='libnurbs/internals/subdivider.h' line='125' column='1'/>
+        <var-decl name='s_index' type-id='type-id-11' visibility='default' filepath='libnurbs/internals/subdivider.h' line='125' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='18720'>
-        <var-decl name='t_index' type-id='type-id-10' visibility='default' filepath='libnurbs/internals/subdivider.h' line='126' column='1'/>
+        <var-decl name='t_index' type-id='type-id-11' visibility='default' filepath='libnurbs/internals/subdivider.h' line='126' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='18752'>
         <var-decl name='qlist' type-id='type-id-139' visibility='default' filepath='libnurbs/internals/subdivider.h' line='127' column='1'/>
@@ -3997,10 +3997,10 @@
         <var-decl name='stepsizes' type-id='type-id-131' visibility='default' filepath='libnurbs/internals/subdivider.h' line='132' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='20224'>
-        <var-decl name='showDegenerate' type-id='type-id-10' visibility='default' filepath='libnurbs/internals/subdivider.h' line='133' column='1'/>
+        <var-decl name='showDegenerate' type-id='type-id-11' visibility='default' filepath='libnurbs/internals/subdivider.h' line='133' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='20256'>
-        <var-decl name='isArcTypeBezier' type-id='type-id-10' visibility='default' filepath='libnurbs/internals/subdivider.h' line='134' column='1'/>
+        <var-decl name='isArcTypeBezier' type-id='type-id-11' visibility='default' filepath='libnurbs/internals/subdivider.h' line='134' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='20288'>
         <var-decl name='domain_distance_u_rate' type-id='type-id-1' visibility='default' filepath='libnurbs/internals/subdivider.h' line='188' column='1'/>
@@ -4009,101 +4009,101 @@
         <var-decl name='domain_distance_v_rate' type-id='type-id-1' visibility='default' filepath='libnurbs/internals/subdivider.h' line='189' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='20352'>
-        <var-decl name='is_domain_distance_sampling' type-id='type-id-10' visibility='default' filepath='libnurbs/internals/subdivider.h' line='190' column='1'/>
+        <var-decl name='is_domain_distance_sampling' type-id='type-id-11' visibility='default' filepath='libnurbs/internals/subdivider.h' line='190' column='1'/>
       </data-member>
       <member-function access='private' constructor='yes'>
         <function-decl name='Subdivider' filepath='libnurbs/internals/subdivider.h' line='57' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-173' is-artificial='yes'/>
           <parameter type-id='type-id-174'/>
           <parameter type-id='type-id-167'/>
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private' destructor='yes'>
         <function-decl name='~Subdivider' filepath='libnurbs/internals/subdivider.h' line='58' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-173' is-artificial='yes'/>
-          <parameter type-id='type-id-10' is-artificial='yes'/>
-          <return type-id='type-id-11'/>
+          <parameter type-id='type-id-11' is-artificial='yes'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
         <function-decl name='clear' mangled-name='_ZN10Subdivider5clearEv' filepath='libnurbs/internals/subdivider.h' line='59' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-173' is-artificial='yes'/>
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
         <function-decl name='beginTrims' mangled-name='_ZN10Subdivider10beginTrimsEv' filepath='libnurbs/internals/subdivider.h' line='61' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-173' is-artificial='yes'/>
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
         <function-decl name='beginLoop' mangled-name='_ZN10Subdivider9beginLoopEv' filepath='libnurbs/internals/subdivider.h' line='62' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-173' is-artificial='yes'/>
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
         <function-decl name='addArc' mangled-name='_ZN10Subdivider6addArcEPfP5Quiltl' filepath='libnurbs/internals/subdivider.h' line='63' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-173' is-artificial='yes'/>
-          <parameter type-id='type-id-13'/>
+          <parameter type-id='type-id-16'/>
           <parameter type-id='type-id-139'/>
-          <parameter type-id='type-id-12'/>
-          <return type-id='type-id-11'/>
+          <parameter type-id='type-id-15'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
         <function-decl name='addArc' mangled-name='_ZN10Subdivider6addArcEiP10TrimVertexl' filepath='libnurbs/internals/subdivider.h' line='64' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-173' is-artificial='yes'/>
-          <parameter type-id='type-id-10'/>
+          <parameter type-id='type-id-11'/>
           <parameter type-id='type-id-119'/>
-          <parameter type-id='type-id-12'/>
-          <return type-id='type-id-11'/>
+          <parameter type-id='type-id-15'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
         <function-decl name='endLoop' mangled-name='_ZN10Subdivider7endLoopEv' filepath='libnurbs/internals/subdivider.h' line='65' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-173' is-artificial='yes'/>
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
         <function-decl name='endTrims' mangled-name='_ZN10Subdivider8endTrimsEv' filepath='libnurbs/internals/subdivider.h' line='66' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-173' is-artificial='yes'/>
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
         <function-decl name='beginQuilts' mangled-name='_ZN10Subdivider11beginQuiltsEv' filepath='libnurbs/internals/subdivider.h' line='68' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-173' is-artificial='yes'/>
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
         <function-decl name='addQuilt' mangled-name='_ZN10Subdivider8addQuiltEP5Quilt' filepath='libnurbs/internals/subdivider.h' line='69' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-173' is-artificial='yes'/>
           <parameter type-id='type-id-139'/>
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
         <function-decl name='endQuilts' mangled-name='_ZN10Subdivider9endQuiltsEv' filepath='libnurbs/internals/subdivider.h' line='70' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-173' is-artificial='yes'/>
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
         <function-decl name='drawCurves' mangled-name='_ZN10Subdivider10drawCurvesEv' filepath='libnurbs/internals/subdivider.h' line='72' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-173' is-artificial='yes'/>
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
         <function-decl name='drawSurfaces' mangled-name='_ZN10Subdivider12drawSurfacesEl' filepath='libnurbs/internals/subdivider.h' line='73' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-173' is-artificial='yes'/>
-          <parameter type-id='type-id-12'/>
-          <return type-id='type-id-11'/>
+          <parameter type-id='type-id-15'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -4111,7 +4111,7 @@
           <parameter type-id='type-id-173' is-artificial='yes'/>
           <parameter type-id='type-id-113'/>
           <parameter type-id='type-id-113'/>
-          <return type-id='type-id-10'/>
+          <return type-id='type-id-11'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -4119,7 +4119,7 @@
           <parameter type-id='type-id-173' is-artificial='yes'/>
           <parameter type-id='type-id-113'/>
           <parameter type-id='type-id-113'/>
-          <return type-id='type-id-10'/>
+          <return type-id='type-id-11'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -4127,7 +4127,7 @@
           <parameter type-id='type-id-173' is-artificial='yes'/>
           <parameter type-id='type-id-113'/>
           <parameter type-id='type-id-113'/>
-          <return type-id='type-id-10'/>
+          <return type-id='type-id-11'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -4135,35 +4135,35 @@
           <parameter type-id='type-id-173' is-artificial='yes'/>
           <parameter type-id='type-id-113'/>
           <parameter type-id='type-id-113'/>
-          <return type-id='type-id-10'/>
+          <return type-id='type-id-11'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
         <function-decl name='setJumpbuffer' mangled-name='_ZN10Subdivider13setJumpbufferEP10JumpBuffer' filepath='libnurbs/internals/subdivider.h' line='80' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-173' is-artificial='yes'/>
           <parameter type-id='type-id-67'/>
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
         <function-decl name='set_domain_distance_u_rate' mangled-name='_ZN10Subdivider26set_domain_distance_u_rateEf' filepath='libnurbs/internals/subdivider.h' line='82' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-173' is-artificial='yes'/>
           <parameter type-id='type-id-1'/>
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
         <function-decl name='set_domain_distance_v_rate' mangled-name='_ZN10Subdivider26set_domain_distance_v_rateEf' filepath='libnurbs/internals/subdivider.h' line='86' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-173' is-artificial='yes'/>
           <parameter type-id='type-id-1'/>
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
         <function-decl name='set_is_domain_distance_sampling' mangled-name='_ZN10Subdivider31set_is_domain_distance_samplingEi' filepath='libnurbs/internals/subdivider.h' line='90' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-173' is-artificial='yes'/>
-          <parameter type-id='type-id-10' is-artificial='yes'/>
-          <return type-id='type-id-11'/>
+          <parameter type-id='type-id-11' is-artificial='yes'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -4173,7 +4173,7 @@
           <parameter type-id='type-id-175'/>
           <parameter type-id='type-id-175'/>
           <parameter type-id='type-id-1'/>
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -4183,7 +4183,7 @@
           <parameter type-id='type-id-175'/>
           <parameter type-id='type-id-175'/>
           <parameter type-id='type-id-1'/>
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -4193,7 +4193,7 @@
           <parameter type-id='type-id-175'/>
           <parameter type-id='type-id-175'/>
           <parameter type-id='type-id-1'/>
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -4203,7 +4203,7 @@
           <parameter type-id='type-id-175'/>
           <parameter type-id='type-id-175'/>
           <parameter type-id='type-id-1'/>
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -4213,7 +4213,7 @@
           <parameter type-id='type-id-175'/>
           <parameter type-id='type-id-175'/>
           <parameter type-id='type-id-1'/>
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -4223,7 +4223,7 @@
           <parameter type-id='type-id-175'/>
           <parameter type-id='type-id-175'/>
           <parameter type-id='type-id-1'/>
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -4233,7 +4233,7 @@
           <parameter type-id='type-id-175'/>
           <parameter type-id='type-id-175'/>
           <parameter type-id='type-id-1'/>
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -4243,7 +4243,7 @@
           <parameter type-id='type-id-175'/>
           <parameter type-id='type-id-175'/>
           <parameter type-id='type-id-1'/>
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -4251,7 +4251,7 @@
           <parameter type-id='type-id-173' is-artificial='yes'/>
           <parameter type-id='type-id-113'/>
           <parameter type-id='type-id-1'/>
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -4259,14 +4259,14 @@
           <parameter type-id='type-id-173' is-artificial='yes'/>
           <parameter type-id='type-id-113'/>
           <parameter type-id='type-id-175'/>
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
         <function-decl name='isMonotone' mangled-name='_ZN10Subdivider10isMonotoneEP3Arc' filepath='libnurbs/internals/subdivider.h' line='108' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-173' is-artificial='yes'/>
           <parameter type-id='type-id-113'/>
-          <return type-id='type-id-10'/>
+          <return type-id='type-id-11'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -4274,40 +4274,40 @@
           <parameter type-id='type-id-173' is-artificial='yes'/>
           <parameter type-id='type-id-175'/>
           <parameter type-id='type-id-1'/>
-          <return type-id='type-id-10'/>
+          <return type-id='type-id-11'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
         <function-decl name='samplingSplit' mangled-name='_ZN10Subdivider13samplingSplitER9Curvelisti' filepath='libnurbs/internals/subdivider.h' line='136' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-173' is-artificial='yes'/>
           <parameter type-id='type-id-140'/>
-          <parameter type-id='type-id-10'/>
-          <return type-id='type-id-11'/>
+          <parameter type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
         <function-decl name='subdivideInS' mangled-name='_ZN10Subdivider12subdivideInSER3Bin' filepath='libnurbs/internals/subdivider.h' line='138' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-173' is-artificial='yes'/>
           <parameter type-id='type-id-175'/>
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
         <function-decl name='splitInS' mangled-name='_ZN10Subdivider8splitInSER3Binii' filepath='libnurbs/internals/subdivider.h' line='139' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-173' is-artificial='yes'/>
           <parameter type-id='type-id-175'/>
-          <parameter type-id='type-id-10'/>
-          <parameter type-id='type-id-10'/>
-          <return type-id='type-id-11'/>
+          <parameter type-id='type-id-11'/>
+          <parameter type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
         <function-decl name='splitInT' mangled-name='_ZN10Subdivider8splitInTER3Binii' filepath='libnurbs/internals/subdivider.h' line='140' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-173' is-artificial='yes'/>
           <parameter type-id='type-id-175'/>
-          <parameter type-id='type-id-10'/>
-          <parameter type-id='type-id-10'/>
-          <return type-id='type-id-11'/>
+          <parameter type-id='type-id-11'/>
+          <parameter type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -4315,9 +4315,9 @@
           <parameter type-id='type-id-173' is-artificial='yes'/>
           <parameter type-id='type-id-175'/>
           <parameter type-id='type-id-176'/>
-          <parameter type-id='type-id-10'/>
-          <parameter type-id='type-id-10'/>
-          <return type-id='type-id-11'/>
+          <parameter type-id='type-id-11'/>
+          <parameter type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -4325,9 +4325,9 @@
           <parameter type-id='type-id-173' is-artificial='yes'/>
           <parameter type-id='type-id-175'/>
           <parameter type-id='type-id-176'/>
-          <parameter type-id='type-id-10'/>
-          <parameter type-id='type-id-10'/>
-          <return type-id='type-id-11'/>
+          <parameter type-id='type-id-11'/>
+          <parameter type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -4335,46 +4335,46 @@
           <parameter type-id='type-id-173' is-artificial='yes'/>
           <parameter type-id='type-id-175'/>
           <parameter type-id='type-id-176'/>
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
         <function-decl name='monosplitInS' mangled-name='_ZN10Subdivider12monosplitInSER3Binii' filepath='libnurbs/internals/subdivider.h' line='144' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-173' is-artificial='yes'/>
           <parameter type-id='type-id-175'/>
-          <parameter type-id='type-id-10'/>
-          <parameter type-id='type-id-10'/>
-          <return type-id='type-id-11'/>
+          <parameter type-id='type-id-11'/>
+          <parameter type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
         <function-decl name='monosplitInT' mangled-name='_ZN10Subdivider12monosplitInTER3Binii' filepath='libnurbs/internals/subdivider.h' line='145' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-173' is-artificial='yes'/>
           <parameter type-id='type-id-175'/>
-          <parameter type-id='type-id-10'/>
-          <parameter type-id='type-id-10'/>
-          <return type-id='type-id-11'/>
+          <parameter type-id='type-id-11'/>
+          <parameter type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
         <function-decl name='outline' mangled-name='_ZN10Subdivider7outlineER3Bin' filepath='libnurbs/internals/subdivider.h' line='147' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-173' is-artificial='yes'/>
           <parameter type-id='type-id-175'/>
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
         <function-decl name='freejarcs' mangled-name='_ZN10Subdivider9freejarcsER3Bin' filepath='libnurbs/internals/subdivider.h' line='148' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-173' is-artificial='yes'/>
           <parameter type-id='type-id-175'/>
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
         <function-decl name='render' mangled-name='_ZN10Subdivider6renderER3Bin' filepath='libnurbs/internals/subdivider.h' line='149' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-173' is-artificial='yes'/>
           <parameter type-id='type-id-175'/>
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -4383,9 +4383,9 @@
           <parameter type-id='type-id-175'/>
           <parameter type-id='type-id-175'/>
           <parameter type-id='type-id-175'/>
-          <parameter type-id='type-id-10'/>
+          <parameter type-id='type-id-11'/>
           <parameter type-id='type-id-1'/>
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -4396,43 +4396,43 @@
           <parameter type-id='type-id-1'/>
           <parameter type-id='type-id-1'/>
           <parameter type-id='type-id-1'/>
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
         <function-decl name='setDegenerate' mangled-name='_ZN10Subdivider13setDegenerateEv' filepath='libnurbs/internals/subdivider.h' line='153' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-173' is-artificial='yes'/>
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
         <function-decl name='setNonDegenerate' mangled-name='_ZN10Subdivider16setNonDegenerateEv' filepath='libnurbs/internals/subdivider.h' line='154' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-173' is-artificial='yes'/>
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
         <function-decl name='showingDegenerate' mangled-name='_ZN10Subdivider17showingDegenerateEv' filepath='libnurbs/internals/subdivider.h' line='155' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-173' is-artificial='yes'/>
-          <return type-id='type-id-10'/>
+          <return type-id='type-id-11'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
         <function-decl name='setArcTypeBezier' mangled-name='_ZN10Subdivider16setArcTypeBezierEv' filepath='libnurbs/internals/subdivider.h' line='156' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-173' is-artificial='yes'/>
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
         <function-decl name='setArcTypePwl' mangled-name='_ZN10Subdivider13setArcTypePwlEv' filepath='libnurbs/internals/subdivider.h' line='157' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-173' is-artificial='yes'/>
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
         <function-decl name='isBezierArcType' mangled-name='_ZN10Subdivider15isBezierArcTypeEv' filepath='libnurbs/internals/subdivider.h' line='158' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-173' is-artificial='yes'/>
-          <return type-id='type-id-10'/>
+          <return type-id='type-id-11'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -4440,18 +4440,18 @@
           <parameter type-id='type-id-173' is-artificial='yes'/>
           <parameter type-id='type-id-177'/>
           <parameter type-id='type-id-177'/>
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
         <function-decl name='split' mangled-name='_ZN10Subdivider5splitER3BiniPKfii' filepath='libnurbs/internals/subdivider.h' line='161' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-173' is-artificial='yes'/>
           <parameter type-id='type-id-175'/>
-          <parameter type-id='type-id-10'/>
+          <parameter type-id='type-id-11'/>
           <parameter type-id='type-id-177'/>
-          <parameter type-id='type-id-10'/>
-          <parameter type-id='type-id-10'/>
-          <return type-id='type-id-11'/>
+          <parameter type-id='type-id-11'/>
+          <parameter type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -4462,23 +4462,23 @@
           <parameter type-id='type-id-175'/>
           <parameter type-id='type-id-175'/>
           <parameter type-id='type-id-175'/>
-          <parameter type-id='type-id-10'/>
+          <parameter type-id='type-id-11'/>
           <parameter type-id='type-id-1'/>
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
         <function-decl name='findIrregularS' mangled-name='_ZN10Subdivider14findIrregularSER3Bin' filepath='libnurbs/internals/subdivider.h' line='163' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-173' is-artificial='yes'/>
           <parameter type-id='type-id-175'/>
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
         <function-decl name='findIrregularT' mangled-name='_ZN10Subdivider14findIrregularTER3Bin' filepath='libnurbs/internals/subdivider.h' line='164' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-173' is-artificial='yes'/>
           <parameter type-id='type-id-175'/>
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -4487,8 +4487,8 @@
           <parameter type-id='type-id-119'/>
           <parameter type-id='type-id-119'/>
           <parameter type-id='type-id-119'/>
-          <parameter type-id='type-id-10'/>
-          <return type-id='type-id-10'/>
+          <parameter type-id='type-id-11'/>
+          <return type-id='type-id-11'/>
         </function-decl>
       </member-function>
       <member-function access='private' static='yes'>
@@ -4499,7 +4499,7 @@
           <parameter type-id='type-id-1'/>
           <parameter type-id='type-id-1'/>
           <parameter type-id='type-id-1'/>
-          <return type-id='type-id-10'/>
+          <return type-id='type-id-11'/>
         </function-decl>
       </member-function>
       <member-function access='private' static='yes'>
@@ -4507,7 +4507,7 @@
           <parameter type-id='type-id-119'/>
           <parameter type-id='type-id-119'/>
           <parameter type-id='type-id-119'/>
-          <return type-id='type-id-10'/>
+          <return type-id='type-id-11'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -4517,7 +4517,7 @@
           <parameter type-id='type-id-175'/>
           <parameter type-id='type-id-113'/>
           <parameter type-id='type-id-113'/>
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -4527,17 +4527,17 @@
           <parameter type-id='type-id-175'/>
           <parameter type-id='type-id-113'/>
           <parameter type-id='type-id-113'/>
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
         <function-decl name='arc_split' mangled-name='_ZN10Subdivider9arc_splitEP3Arcifi' filepath='libnurbs/internals/subdivider.h' line='172' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-173' is-artificial='yes'/>
           <parameter type-id='type-id-113'/>
-          <parameter type-id='type-id-10'/>
+          <parameter type-id='type-id-11'/>
           <parameter type-id='type-id-1'/>
-          <parameter type-id='type-id-10'/>
-          <return type-id='type-id-10'/>
+          <parameter type-id='type-id-11'/>
+          <return type-id='type-id-11'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -4545,7 +4545,7 @@
           <parameter type-id='type-id-173' is-artificial='yes'/>
           <parameter type-id='type-id-113'/>
           <parameter type-id='type-id-113'/>
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -4553,7 +4553,7 @@
           <parameter type-id='type-id-173' is-artificial='yes'/>
           <parameter type-id='type-id-113'/>
           <parameter type-id='type-id-113'/>
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -4563,7 +4563,7 @@
           <parameter type-id='type-id-113'/>
           <parameter type-id='type-id-113'/>
           <parameter type-id='type-id-113'/>
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -4571,7 +4571,7 @@
           <parameter type-id='type-id-173' is-artificial='yes'/>
           <parameter type-id='type-id-113'/>
           <parameter type-id='type-id-113'/>
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -4588,10 +4588,10 @@
         <var-decl name='patch' type-id='type-id-179' visibility='default' filepath='libnurbs/internals/patchlist.h' line='63' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='64'>
-        <var-decl name='notInBbox' type-id='type-id-10' visibility='default' filepath='libnurbs/internals/patchlist.h' line='64' column='1'/>
+        <var-decl name='notInBbox' type-id='type-id-11' visibility='default' filepath='libnurbs/internals/patchlist.h' line='64' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='96'>
-        <var-decl name='needsSampling' type-id='type-id-10' visibility='default' filepath='libnurbs/internals/patchlist.h' line='65' column='1'/>
+        <var-decl name='needsSampling' type-id='type-id-11' visibility='default' filepath='libnurbs/internals/patchlist.h' line='65' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='128'>
         <var-decl name='pspec' type-id='type-id-180' visibility='default' filepath='libnurbs/internals/patchlist.h' line='66' column='1'/>
@@ -4600,88 +4600,88 @@
         <function-decl name='Patchlist' filepath='libnurbs/internals/patchlist.h' line='48' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-181' is-artificial='yes'/>
           <parameter type-id='type-id-139'/>
-          <parameter type-id='type-id-13'/>
-          <parameter type-id='type-id-13'/>
-          <return type-id='type-id-11'/>
+          <parameter type-id='type-id-16'/>
+          <parameter type-id='type-id-16'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public' constructor='yes'>
         <function-decl name='Patchlist' filepath='libnurbs/internals/patchlist.h' line='49' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-181' is-artificial='yes'/>
           <parameter type-id='type-id-176'/>
-          <parameter type-id='type-id-10'/>
+          <parameter type-id='type-id-11'/>
           <parameter type-id='type-id-1'/>
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public' destructor='yes'>
         <function-decl name='~Patchlist' filepath='libnurbs/internals/patchlist.h' line='50' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-181' is-artificial='yes'/>
-          <parameter type-id='type-id-10' is-artificial='yes'/>
-          <return type-id='type-id-11'/>
+          <parameter type-id='type-id-11' is-artificial='yes'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
         <function-decl name='bbox' mangled-name='_ZN9Patchlist4bboxEv' filepath='libnurbs/internals/patchlist.h' line='51' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-181' is-artificial='yes'/>
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
         <function-decl name='cullCheck' mangled-name='_ZN9Patchlist9cullCheckEv' filepath='libnurbs/internals/patchlist.h' line='52' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-181' is-artificial='yes'/>
-          <return type-id='type-id-10'/>
+          <return type-id='type-id-11'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
         <function-decl name='getstepsize' mangled-name='_ZN9Patchlist11getstepsizeEv' filepath='libnurbs/internals/patchlist.h' line='53' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-181' is-artificial='yes'/>
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
         <function-decl name='needsNonSamplingSubdivision' mangled-name='_ZN9Patchlist27needsNonSamplingSubdivisionEv' filepath='libnurbs/internals/patchlist.h' line='54' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-181' is-artificial='yes'/>
-          <return type-id='type-id-10'/>
+          <return type-id='type-id-11'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
         <function-decl name='needsSamplingSubdivision' mangled-name='_ZN9Patchlist24needsSamplingSubdivisionEv' filepath='libnurbs/internals/patchlist.h' line='55' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-181' is-artificial='yes'/>
-          <return type-id='type-id-10'/>
+          <return type-id='type-id-11'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
         <function-decl name='needsSubdivision' mangled-name='_ZN9Patchlist16needsSubdivisionEi' filepath='libnurbs/internals/patchlist.h' line='56' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-181' is-artificial='yes'/>
-          <parameter type-id='type-id-10'/>
-          <return type-id='type-id-10'/>
+          <parameter type-id='type-id-11'/>
+          <return type-id='type-id-11'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
         <function-decl name='getStepsize' mangled-name='_ZN9Patchlist11getStepsizeEi' filepath='libnurbs/internals/patchlist.h' line='57' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-181' is-artificial='yes'/>
-          <parameter type-id='type-id-10'/>
+          <parameter type-id='type-id-11'/>
           <return type-id='type-id-1'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
         <function-decl name='getRanges' mangled-name='_ZN9Patchlist9getRangesEPf' filepath='libnurbs/internals/patchlist.h' line='58' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-181' is-artificial='yes'/>
-          <parameter type-id='type-id-13'/>
-          <return type-id='type-id-11'/>
+          <parameter type-id='type-id-16'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
         <function-decl name='get_uorder' mangled-name='_ZN9Patchlist10get_uorderEv' filepath='libnurbs/internals/patchlist.h' line='60' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-181' is-artificial='yes'/>
-          <return type-id='type-id-10'/>
+          <return type-id='type-id-11'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
         <function-decl name='get_vorder' mangled-name='_ZN9Patchlist10get_vorderEv' filepath='libnurbs/internals/patchlist.h' line='61' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-181' is-artificial='yes'/>
-          <return type-id='type-id-10'/>
+          <return type-id='type-id-11'/>
         </function-decl>
       </member-function>
     </class-decl>
@@ -4701,57 +4701,57 @@
         <var-decl name='dv' type-id='type-id-1' visibility='default' filepath='libnurbs/internals/slicer.h' line='74' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='5408'>
-        <var-decl name='isolines' type-id='type-id-10' visibility='default' filepath='libnurbs/internals/slicer.h' line='75' column='1'/>
+        <var-decl name='isolines' type-id='type-id-11' visibility='default' filepath='libnurbs/internals/slicer.h' line='75' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='5440'>
-        <var-decl name='ulinear' type-id='type-id-10' visibility='default' filepath='libnurbs/internals/slicer.h' line='81' column='1'/>
+        <var-decl name='ulinear' type-id='type-id-11' visibility='default' filepath='libnurbs/internals/slicer.h' line='81' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='5472'>
-        <var-decl name='vlinear' type-id='type-id-10' visibility='default' filepath='libnurbs/internals/slicer.h' line='82' column='1'/>
+        <var-decl name='vlinear' type-id='type-id-11' visibility='default' filepath='libnurbs/internals/slicer.h' line='82' column='1'/>
       </data-member>
       <member-function access='private' constructor='yes'>
         <function-decl name='Slicer' filepath='libnurbs/internals/slicer.cc' line='1181' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-184' is-artificial='yes'/>
-          <parameter type-id='type-id-10' is-artificial='yes'/>
+          <parameter type-id='type-id-11' is-artificial='yes'/>
           <parameter type-id='type-id-185' is-artificial='yes'/>
           <parameter type-id='type-id-167'/>
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private' destructor='yes'>
         <function-decl name='~Slicer' filepath='libnurbs/internals/slicer.cc' line='1192' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-184' is-artificial='yes'/>
-          <parameter type-id='type-id-10' is-artificial='yes'/>
+          <parameter type-id='type-id-11' is-artificial='yes'/>
           <parameter type-id='type-id-185' is-artificial='yes'/>
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
         <function-decl name='slice' mangled-name='_ZN6Slicer5sliceEP3Arc' filepath='libnurbs/internals/slicer.cc' line='1165' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-184' is-artificial='yes'/>
           <parameter type-id='type-id-113'/>
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
         <function-decl name='slice_old' mangled-name='_ZN6Slicer9slice_oldEP3Arc' filepath='libnurbs/internals/slicer.cc' line='1212' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-184' is-artificial='yes'/>
           <parameter type-id='type-id-113'/>
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
         <function-decl name='slice_new' mangled-name='_ZN6Slicer9slice_newEP3Arc' filepath='libnurbs/internals/slicer.cc' line='1068' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-184' is-artificial='yes'/>
           <parameter type-id='type-id-113'/>
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
         <function-decl name='evalStream' mangled-name='_ZN6Slicer10evalStreamEP10primStream' filepath='libnurbs/internals/slicer.cc' line='1027' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-184' is-artificial='yes'/>
           <parameter type-id='type-id-186'/>
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -4759,14 +4759,14 @@
           <parameter type-id='type-id-184' is-artificial='yes'/>
           <parameter type-id='type-id-187'/>
           <parameter type-id='type-id-188'/>
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
         <function-decl name='outline' mangled-name='_ZN6Slicer7outlineEP3Arc' filepath='libnurbs/internals/slicer.cc' line='1292' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-184' is-artificial='yes'/>
           <parameter type-id='type-id-113'/>
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -4774,47 +4774,47 @@
           <parameter type-id='type-id-184' is-artificial='yes'/>
           <parameter type-id='type-id-1'/>
           <parameter type-id='type-id-1'/>
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
         <function-decl name='setisolines' mangled-name='_ZN6Slicer11setisolinesEi' filepath='libnurbs/internals/slicer.cc' line='1197' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-184' is-artificial='yes'/>
-          <parameter type-id='type-id-10'/>
-          <return type-id='type-id-11'/>
+          <parameter type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
         <function-decl name='set_ulinear' mangled-name='_ZN6Slicer11set_ulinearEi' filepath='libnurbs/internals/slicer.h' line='63' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-184' is-artificial='yes'/>
-          <parameter type-id='type-id-10'/>
-          <return type-id='type-id-11'/>
+          <parameter type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
         <function-decl name='set_vlinear' mangled-name='_ZN6Slicer11set_vlinearEi' filepath='libnurbs/internals/slicer.h' line='67' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-184' is-artificial='yes'/>
-          <parameter type-id='type-id-10'/>
-          <return type-id='type-id-11'/>
+          <parameter type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
         <function-decl name='outline' mangled-name='_ZN6Slicer7outlineEv' filepath='libnurbs/internals/slicer.cc' line='1266' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-184' is-artificial='yes'/>
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
         <function-decl name='initGridlines' mangled-name='_ZN6Slicer13initGridlinesEv' filepath='libnurbs/internals/slicer.h' line='78' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-184' is-artificial='yes'/>
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
         <function-decl name='advanceGridlines' mangled-name='_ZN6Slicer16advanceGridlinesEl' filepath='libnurbs/internals/slicer.h' line='79' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-184' is-artificial='yes'/>
-          <parameter type-id='type-id-12'/>
-          <return type-id='type-id-11'/>
+          <parameter type-id='type-id-15'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
     </class-decl>
@@ -4826,35 +4826,35 @@
         <var-decl name='surfaceEvaluator' type-id='type-id-190' visibility='default' filepath='libnurbs/internals/backend.h' line='49' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='128'>
-        <var-decl name='wireframetris' type-id='type-id-10' visibility='default' filepath='libnurbs/internals/backend.h' line='105' column='1'/>
+        <var-decl name='wireframetris' type-id='type-id-11' visibility='default' filepath='libnurbs/internals/backend.h' line='105' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='160'>
-        <var-decl name='wireframequads' type-id='type-id-10' visibility='default' filepath='libnurbs/internals/backend.h' line='106' column='1'/>
+        <var-decl name='wireframequads' type-id='type-id-11' visibility='default' filepath='libnurbs/internals/backend.h' line='106' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='192'>
-        <var-decl name='npts' type-id='type-id-10' visibility='default' filepath='libnurbs/internals/backend.h' line='107' column='1'/>
+        <var-decl name='npts' type-id='type-id-11' visibility='default' filepath='libnurbs/internals/backend.h' line='107' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='224'>
         <var-decl name='mesh' type-id='type-id-191' visibility='default' filepath='libnurbs/internals/backend.h' line='108' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='608'>
-        <var-decl name='meshindex' type-id='type-id-10' visibility='default' filepath='libnurbs/internals/backend.h' line='109' column='1'/>
+        <var-decl name='meshindex' type-id='type-id-11' visibility='default' filepath='libnurbs/internals/backend.h' line='109' column='1'/>
       </data-member>
       <member-function access='public' constructor='yes'>
         <function-decl name='Backend' filepath='libnurbs/internals/backend.h' line='51' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-192' is-artificial='yes'/>
           <parameter type-id='type-id-80'/>
           <parameter type-id='type-id-81'/>
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
         <function-decl name='bgnsurf' mangled-name='_ZN7Backend7bgnsurfEiil' filepath='libnurbs/internals/backend.h' line='55' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-192' is-artificial='yes'/>
-          <parameter type-id='type-id-10'/>
-          <parameter type-id='type-id-10'/>
-          <parameter type-id='type-id-12'/>
-          <return type-id='type-id-11'/>
+          <parameter type-id='type-id-11'/>
+          <parameter type-id='type-id-11'/>
+          <parameter type-id='type-id-15'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
@@ -4864,32 +4864,32 @@
           <parameter type-id='type-id-1'/>
           <parameter type-id='type-id-1'/>
           <parameter type-id='type-id-1'/>
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
         <function-decl name='surfpts' mangled-name='_ZN7Backend7surfptsElPflliiffff' filepath='libnurbs/internals/backend.h' line='57' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-192' is-artificial='yes'/>
-          <parameter type-id='type-id-12'/>
-          <parameter type-id='type-id-13'/>
-          <parameter type-id='type-id-12'/>
-          <parameter type-id='type-id-12'/>
-          <parameter type-id='type-id-10'/>
-          <parameter type-id='type-id-10'/>
+          <parameter type-id='type-id-15'/>
+          <parameter type-id='type-id-16'/>
+          <parameter type-id='type-id-15'/>
+          <parameter type-id='type-id-15'/>
+          <parameter type-id='type-id-11'/>
+          <parameter type-id='type-id-11'/>
           <parameter type-id='type-id-1'/>
           <parameter type-id='type-id-1'/>
           <parameter type-id='type-id-1'/>
           <parameter type-id='type-id-1'/>
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
         <function-decl name='surfbbox' mangled-name='_ZN7Backend8surfbboxElPfS0_' filepath='libnurbs/internals/backend.h' line='59' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-192' is-artificial='yes'/>
-          <parameter type-id='type-id-12'/>
-          <parameter type-id='type-id-13'/>
-          <parameter type-id='type-id-13'/>
-          <return type-id='type-id-11'/>
+          <parameter type-id='type-id-15'/>
+          <parameter type-id='type-id-16'/>
+          <parameter type-id='type-id-16'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
@@ -4897,61 +4897,61 @@
           <parameter type-id='type-id-192' is-artificial='yes'/>
           <parameter type-id='type-id-1'/>
           <parameter type-id='type-id-1'/>
-          <parameter type-id='type-id-12'/>
+          <parameter type-id='type-id-15'/>
           <parameter type-id='type-id-1'/>
           <parameter type-id='type-id-1'/>
-          <parameter type-id='type-id-12'/>
-          <return type-id='type-id-11'/>
+          <parameter type-id='type-id-15'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
         <function-decl name='surfmesh' mangled-name='_ZN7Backend8surfmeshEllll' filepath='libnurbs/internals/backend.h' line='61' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-192' is-artificial='yes'/>
-          <parameter type-id='type-id-12'/>
-          <parameter type-id='type-id-12'/>
-          <parameter type-id='type-id-12'/>
-          <parameter type-id='type-id-12'/>
-          <return type-id='type-id-11'/>
+          <parameter type-id='type-id-15'/>
+          <parameter type-id='type-id-15'/>
+          <parameter type-id='type-id-15'/>
+          <parameter type-id='type-id-15'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
         <function-decl name='bgntmesh' mangled-name='_ZN7Backend8bgntmeshEPKc' filepath='libnurbs/internals/backend.h' line='62' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-192' is-artificial='yes'/>
           <parameter type-id='type-id-83'/>
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
         <function-decl name='endtmesh' mangled-name='_ZN7Backend8endtmeshEv' filepath='libnurbs/internals/backend.h' line='63' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-192' is-artificial='yes'/>
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
         <function-decl name='swaptmesh' mangled-name='_ZN7Backend9swaptmeshEv' filepath='libnurbs/internals/backend.h' line='64' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-192' is-artificial='yes'/>
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
         <function-decl name='tmeshvert' mangled-name='_ZN7Backend9tmeshvertEP14GridTrimVertex' filepath='libnurbs/internals/backend.h' line='65' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-192' is-artificial='yes'/>
           <parameter type-id='type-id-193'/>
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
         <function-decl name='tmeshvert' mangled-name='_ZN7Backend9tmeshvertEP10TrimVertex' filepath='libnurbs/internals/backend.h' line='66' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-192' is-artificial='yes'/>
           <parameter type-id='type-id-119'/>
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
         <function-decl name='tmeshvert' mangled-name='_ZN7Backend9tmeshvertEP10GridVertex' filepath='libnurbs/internals/backend.h' line='67' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-192' is-artificial='yes'/>
           <parameter type-id='type-id-194'/>
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
@@ -4959,39 +4959,39 @@
           <parameter type-id='type-id-192' is-artificial='yes'/>
           <parameter type-id='type-id-1'/>
           <parameter type-id='type-id-1'/>
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
         <function-decl name='linevert' mangled-name='_ZN7Backend8linevertEP10TrimVertex' filepath='libnurbs/internals/backend.h' line='69' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-192' is-artificial='yes'/>
           <parameter type-id='type-id-119'/>
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
         <function-decl name='linevert' mangled-name='_ZN7Backend8linevertEP10GridVertex' filepath='libnurbs/internals/backend.h' line='70' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-192' is-artificial='yes'/>
           <parameter type-id='type-id-194'/>
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
         <function-decl name='bgnoutline' mangled-name='_ZN7Backend10bgnoutlineEv' filepath='libnurbs/internals/backend.h' line='71' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-192' is-artificial='yes'/>
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
         <function-decl name='endoutline' mangled-name='_ZN7Backend10endoutlineEv' filepath='libnurbs/internals/backend.h' line='72' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-192' is-artificial='yes'/>
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
         <function-decl name='endsurf' mangled-name='_ZN7Backend7endsurfEv' filepath='libnurbs/internals/backend.h' line='73' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-192' is-artificial='yes'/>
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
@@ -5000,96 +5000,96 @@
           <parameter type-id='type-id-119'/>
           <parameter type-id='type-id-119'/>
           <parameter type-id='type-id-119'/>
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
         <function-decl name='bgntfan' mangled-name='_ZN7Backend7bgntfanEv' filepath='libnurbs/internals/backend.h' line='76' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-192' is-artificial='yes'/>
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
         <function-decl name='endtfan' mangled-name='_ZN7Backend7endtfanEv' filepath='libnurbs/internals/backend.h' line='77' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-192' is-artificial='yes'/>
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
         <function-decl name='bgnqstrip' mangled-name='_ZN7Backend9bgnqstripEv' filepath='libnurbs/internals/backend.h' line='78' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-192' is-artificial='yes'/>
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
         <function-decl name='endqstrip' mangled-name='_ZN7Backend9endqstripEv' filepath='libnurbs/internals/backend.h' line='79' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-192' is-artificial='yes'/>
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
         <function-decl name='evalUStrip' mangled-name='_ZN7Backend10evalUStripEifPfifS0_' filepath='libnurbs/internals/backend.h' line='80' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-192' is-artificial='yes'/>
-          <parameter type-id='type-id-10'/>
+          <parameter type-id='type-id-11'/>
           <parameter type-id='type-id-1'/>
-          <parameter type-id='type-id-13'/>
-          <parameter type-id='type-id-10'/>
+          <parameter type-id='type-id-16'/>
+          <parameter type-id='type-id-11'/>
           <parameter type-id='type-id-1'/>
-          <parameter type-id='type-id-13'/>
-          <return type-id='type-id-11'/>
+          <parameter type-id='type-id-16'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
         <function-decl name='evalVStrip' mangled-name='_ZN7Backend10evalVStripEifPfifS0_' filepath='libnurbs/internals/backend.h' line='83' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-192' is-artificial='yes'/>
-          <parameter type-id='type-id-10'/>
+          <parameter type-id='type-id-11'/>
           <parameter type-id='type-id-1'/>
-          <parameter type-id='type-id-13'/>
-          <parameter type-id='type-id-10'/>
+          <parameter type-id='type-id-16'/>
+          <parameter type-id='type-id-11'/>
           <parameter type-id='type-id-1'/>
-          <parameter type-id='type-id-13'/>
-          <return type-id='type-id-11'/>
+          <parameter type-id='type-id-16'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
         <function-decl name='tmeshvertNOGE' mangled-name='_ZN7Backend13tmeshvertNOGEEP10TrimVertex' filepath='libnurbs/internals/backend.h' line='86' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-192' is-artificial='yes'/>
           <parameter type-id='type-id-119'/>
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
         <function-decl name='tmeshvertNOGE_BU' mangled-name='_ZN7Backend16tmeshvertNOGE_BUEP10TrimVertex' filepath='libnurbs/internals/backend.h' line='87' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-192' is-artificial='yes'/>
           <parameter type-id='type-id-119'/>
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
         <function-decl name='tmeshvertNOGE_BV' mangled-name='_ZN7Backend16tmeshvertNOGE_BVEP10TrimVertex' filepath='libnurbs/internals/backend.h' line='88' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-192' is-artificial='yes'/>
           <parameter type-id='type-id-119'/>
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
         <function-decl name='preEvaluateBU' mangled-name='_ZN7Backend13preEvaluateBUEf' filepath='libnurbs/internals/backend.h' line='89' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-192' is-artificial='yes'/>
           <parameter type-id='type-id-1'/>
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
         <function-decl name='preEvaluateBV' mangled-name='_ZN7Backend13preEvaluateBVEf' filepath='libnurbs/internals/backend.h' line='90' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-192' is-artificial='yes'/>
           <parameter type-id='type-id-1'/>
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
         <function-decl name='bgncurv' mangled-name='_ZN7Backend7bgncurvEv' filepath='libnurbs/internals/backend.h' line='94' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-192' is-artificial='yes'/>
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
@@ -5097,19 +5097,19 @@
           <parameter type-id='type-id-192' is-artificial='yes'/>
           <parameter type-id='type-id-1'/>
           <parameter type-id='type-id-1'/>
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
         <function-decl name='curvpts' mangled-name='_ZN7Backend7curvptsElPfliff' filepath='libnurbs/internals/backend.h' line='96' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-192' is-artificial='yes'/>
-          <parameter type-id='type-id-12'/>
-          <parameter type-id='type-id-13'/>
-          <parameter type-id='type-id-12'/>
-          <parameter type-id='type-id-10'/>
+          <parameter type-id='type-id-15'/>
+          <parameter type-id='type-id-16'/>
+          <parameter type-id='type-id-15'/>
+          <parameter type-id='type-id-11'/>
           <parameter type-id='type-id-1'/>
           <parameter type-id='type-id-1'/>
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
@@ -5117,41 +5117,41 @@
           <parameter type-id='type-id-192' is-artificial='yes'/>
           <parameter type-id='type-id-1'/>
           <parameter type-id='type-id-1'/>
-          <parameter type-id='type-id-12'/>
-          <return type-id='type-id-11'/>
+          <parameter type-id='type-id-15'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
         <function-decl name='curvmesh' mangled-name='_ZN7Backend8curvmeshEll' filepath='libnurbs/internals/backend.h' line='98' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-192' is-artificial='yes'/>
-          <parameter type-id='type-id-12'/>
-          <parameter type-id='type-id-12'/>
-          <return type-id='type-id-11'/>
+          <parameter type-id='type-id-15'/>
+          <parameter type-id='type-id-15'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
         <function-decl name='curvpt' mangled-name='_ZN7Backend6curvptEf' filepath='libnurbs/internals/backend.h' line='99' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-192' is-artificial='yes'/>
           <parameter type-id='type-id-1'/>
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
         <function-decl name='bgnline' mangled-name='_ZN7Backend7bgnlineEv' filepath='libnurbs/internals/backend.h' line='100' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-192' is-artificial='yes'/>
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
         <function-decl name='endline' mangled-name='_ZN7Backend7endlineEv' filepath='libnurbs/internals/backend.h' line='101' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-192' is-artificial='yes'/>
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
         <function-decl name='endcurv' mangled-name='_ZN7Backend7endcurvEv' filepath='libnurbs/internals/backend.h' line='102' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-192' is-artificial='yes'/>
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
     </class-decl>
@@ -5161,7 +5161,7 @@
         <function-decl name='ArcSdirSorter' filepath='libnurbs/internals/arcsorter.cc' line='88' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-196' is-artificial='yes'/>
           <parameter type-id='type-id-147'/>
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private' vtable-offset='2'>
@@ -5169,7 +5169,7 @@
           <parameter type-id='type-id-196' is-artificial='yes'/>
           <parameter type-id='type-id-107'/>
           <parameter type-id='type-id-107'/>
-          <return type-id='type-id-10'/>
+          <return type-id='type-id-11'/>
         </function-decl>
       </member-function>
     </class-decl>
@@ -5179,7 +5179,7 @@
         <function-decl name='ArcTdirSorter' filepath='libnurbs/internals/arcsorter.cc' line='125' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-198' is-artificial='yes'/>
           <parameter type-id='type-id-147'/>
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private' vtable-offset='2'>
@@ -5187,7 +5187,7 @@
           <parameter type-id='type-id-198' is-artificial='yes'/>
           <parameter type-id='type-id-107'/>
           <parameter type-id='type-id-107'/>
-          <return type-id='type-id-10'/>
+          <return type-id='type-id-11'/>
         </function-decl>
       </member-function>
     </class-decl>
@@ -5238,35 +5238,35 @@
       <member-function access='public' constructor='yes'>
         <function-decl name='GridVertex' filepath='libnurbs/internals/gridvertex.h' line='41' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-194' is-artificial='yes'/>
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public' constructor='yes'>
         <function-decl name='GridVertex' filepath='libnurbs/internals/gridvertex.h' line='42' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-194' is-artificial='yes'/>
-          <parameter type-id='type-id-12'/>
-          <parameter type-id='type-id-12'/>
-          <return type-id='type-id-11'/>
+          <parameter type-id='type-id-15'/>
+          <parameter type-id='type-id-15'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
         <function-decl name='set' mangled-name='_ZN10GridVertex3setEll' filepath='libnurbs/internals/gridvertex.h' line='43' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-194' is-artificial='yes'/>
-          <parameter type-id='type-id-12'/>
-          <parameter type-id='type-id-12'/>
-          <return type-id='type-id-11'/>
+          <parameter type-id='type-id-15'/>
+          <parameter type-id='type-id-15'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
         <function-decl name='nextu' mangled-name='_ZN10GridVertex5nextuEv' filepath='libnurbs/internals/gridvertex.h' line='44' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-194' is-artificial='yes'/>
-          <return type-id='type-id-12'/>
+          <return type-id='type-id-15'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
         <function-decl name='prevu' mangled-name='_ZN10GridVertex5prevuEv' filepath='libnurbs/internals/gridvertex.h' line='45' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-194' is-artificial='yes'/>
-          <return type-id='type-id-12'/>
+          <return type-id='type-id-15'/>
         </function-decl>
       </member-function>
     </class-decl>
@@ -5287,15 +5287,15 @@
       <member-function access='private' constructor='yes'>
         <function-decl name='GridTrimVertex' filepath='libnurbs/internals/gridtrimvertex.h' line='50' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-193' is-artificial='yes'/>
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
         <function-decl name='set' mangled-name='_ZN14GridTrimVertex3setEll' filepath='libnurbs/internals/gridtrimvertex.h' line='54' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-193' is-artificial='yes'/>
-          <parameter type-id='type-id-12'/>
-          <parameter type-id='type-id-12'/>
-          <return type-id='type-id-11'/>
+          <parameter type-id='type-id-15'/>
+          <parameter type-id='type-id-15'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -5303,44 +5303,44 @@
           <parameter type-id='type-id-193' is-artificial='yes'/>
           <parameter type-id='type-id-1'/>
           <parameter type-id='type-id-1'/>
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
         <function-decl name='set' mangled-name='_ZN14GridTrimVertex3setEP10TrimVertex' filepath='libnurbs/internals/gridtrimvertex.h' line='56' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-193' is-artificial='yes'/>
           <parameter type-id='type-id-119'/>
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
         <function-decl name='clear' mangled-name='_ZN14GridTrimVertex5clearEv' filepath='libnurbs/internals/gridtrimvertex.h' line='57' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-193' is-artificial='yes'/>
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
         <function-decl name='isGridVert' mangled-name='_ZN14GridTrimVertex10isGridVertEv' filepath='libnurbs/internals/gridtrimvertex.h' line='58' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-193' is-artificial='yes'/>
-          <return type-id='type-id-10'/>
+          <return type-id='type-id-11'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
         <function-decl name='isTrimVert' mangled-name='_ZN14GridTrimVertex10isTrimVertEv' filepath='libnurbs/internals/gridtrimvertex.h' line='59' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-193' is-artificial='yes'/>
-          <return type-id='type-id-10'/>
+          <return type-id='type-id-11'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
         <function-decl name='output' mangled-name='_ZN14GridTrimVertex6outputEv' filepath='libnurbs/internals/gridtrimvertex.h' line='60' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-193' is-artificial='yes'/>
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
     </class-decl>
     <pointer-type-def type-id='type-id-65' size-in-bits='64' id='type-id-192'/>
     <qualified-type-def type-id='type-id-80' id='type-id-189'/>
-    <reference-type-def kind='lvalue' type-id='type-id-7' size-in-bits='64' id='type-id-80'/>
+    <reference-type-def kind='lvalue' type-id='type-id-13' size-in-bits='64' id='type-id-80'/>
     <qualified-type-def type-id='type-id-81' id='type-id-190'/>
     <reference-type-def kind='lvalue' type-id='type-id-48' size-in-bits='64' id='type-id-81'/>
     <pointer-type-def type-id='type-id-203' size-in-bits='64' id='type-id-193'/>
@@ -5363,9 +5363,9 @@
         <function-decl name='init' mangled-name='_ZN7Jarcloc4initEP3Arcll' filepath='libnurbs/internals/jarcloc.h' line='47' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-205' is-artificial='yes'/>
           <parameter type-id='type-id-113'/>
-          <parameter type-id='type-id-12'/>
-          <parameter type-id='type-id-12'/>
-          <return type-id='type-id-11'/>
+          <parameter type-id='type-id-15'/>
+          <parameter type-id='type-id-15'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -5383,7 +5383,7 @@
       <member-function access='private'>
         <function-decl name='reverse' mangled-name='_ZN7Jarcloc7reverseEv' filepath='libnurbs/internals/jarcloc.h' line='50' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-205' is-artificial='yes'/>
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
     </class-decl>
@@ -5392,13 +5392,13 @@
         <var-decl name='pts' type-id='type-id-153' visibility='default' filepath='libnurbs/internals/trimline.h' line='48' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='64'>
-        <var-decl name='numverts' type-id='type-id-12' visibility='default' filepath='libnurbs/internals/trimline.h' line='49' column='1'/>
+        <var-decl name='numverts' type-id='type-id-15' visibility='default' filepath='libnurbs/internals/trimline.h' line='49' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='128'>
-        <var-decl name='i' type-id='type-id-12' visibility='default' filepath='libnurbs/internals/trimline.h' line='50' column='1'/>
+        <var-decl name='i' type-id='type-id-15' visibility='default' filepath='libnurbs/internals/trimline.h' line='50' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='192'>
-        <var-decl name='size' type-id='type-id-12' visibility='default' filepath='libnurbs/internals/trimline.h' line='51' column='1'/>
+        <var-decl name='size' type-id='type-id-15' visibility='default' filepath='libnurbs/internals/trimline.h' line='51' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='256'>
         <var-decl name='jarcl' type-id='type-id-204' visibility='default' filepath='libnurbs/internals/trimline.h' line='52' column='1'/>
@@ -5418,27 +5418,27 @@
       <member-function access='private'>
         <function-decl name='reset' mangled-name='_ZN8Trimline5resetEv' filepath='libnurbs/internals/trimline.h' line='55' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-207' is-artificial='yes'/>
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
         <function-decl name='grow' mangled-name='_ZN8Trimline4growEl' filepath='libnurbs/internals/trimline.h' line='56' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-207' is-artificial='yes'/>
-          <parameter type-id='type-id-12'/>
-          <return type-id='type-id-11'/>
+          <parameter type-id='type-id-15'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
         <function-decl name='swap' mangled-name='_ZN8Trimline4swapEv' filepath='libnurbs/internals/trimline.h' line='57' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-207' is-artificial='yes'/>
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
         <function-decl name='append' mangled-name='_ZN8Trimline6appendEP10TrimVertex' filepath='libnurbs/internals/trimline.h' line='58' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-207' is-artificial='yes'/>
           <parameter type-id='type-id-119'/>
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private' static='yes'>
@@ -5447,48 +5447,48 @@
           <parameter type-id='type-id-119'/>
           <parameter type-id='type-id-119'/>
           <parameter type-id='type-id-1'/>
-          <return type-id='type-id-12'/>
+          <return type-id='type-id-15'/>
         </function-decl>
       </member-function>
       <member-function access='private' constructor='yes'>
         <function-decl name='Trimline' filepath='libnurbs/internals/trimline.h' line='64' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-207' is-artificial='yes'/>
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private' destructor='yes'>
         <function-decl name='~Trimline' filepath='libnurbs/internals/trimline.h' line='65' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-207' is-artificial='yes'/>
-          <parameter type-id='type-id-10' is-artificial='yes'/>
-          <return type-id='type-id-11'/>
+          <parameter type-id='type-id-11' is-artificial='yes'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
         <function-decl name='init' mangled-name='_ZN8Trimline4initEP10TrimVertex' filepath='libnurbs/internals/trimline.h' line='66' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-207' is-artificial='yes'/>
           <parameter type-id='type-id-119'/>
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
         <function-decl name='init' mangled-name='_ZN8Trimline4initElP3Arcl' filepath='libnurbs/internals/trimline.h' line='67' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-207' is-artificial='yes'/>
-          <parameter type-id='type-id-12'/>
+          <parameter type-id='type-id-15'/>
           <parameter type-id='type-id-113'/>
-          <parameter type-id='type-id-12'/>
-          <return type-id='type-id-11'/>
+          <parameter type-id='type-id-15'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
         <function-decl name='getNextPt' mangled-name='_ZN8Trimline9getNextPtEv' filepath='libnurbs/internals/trimline.h' line='68' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-207' is-artificial='yes'/>
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
         <function-decl name='getPrevPt' mangled-name='_ZN8Trimline9getPrevPtEv' filepath='libnurbs/internals/trimline.h' line='69' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-207' is-artificial='yes'/>
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -5496,7 +5496,7 @@
           <parameter type-id='type-id-207' is-artificial='yes'/>
           <parameter type-id='type-id-1'/>
           <parameter type-id='type-id-167'/>
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -5504,21 +5504,21 @@
           <parameter type-id='type-id-207' is-artificial='yes'/>
           <parameter type-id='type-id-1'/>
           <parameter type-id='type-id-167'/>
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
         <function-decl name='getNextPts' mangled-name='_ZN8Trimline10getNextPtsEP3Arc' filepath='libnurbs/internals/trimline.h' line='72' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-207' is-artificial='yes'/>
           <parameter type-id='type-id-113'/>
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
         <function-decl name='getPrevPts' mangled-name='_ZN8Trimline10getPrevPtsEP3Arc' filepath='libnurbs/internals/trimline.h' line='73' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-207' is-artificial='yes'/>
           <parameter type-id='type-id-113'/>
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -5548,25 +5548,25 @@
     </class-decl>
     <class-decl name='Uarray' size-in-bits='192' visibility='default' filepath='libnurbs/internals/uarray.h' line='44' column='1' id='type-id-208'>
       <data-member access='private' layout-offset-in-bits='0'>
-        <var-decl name='size' type-id='type-id-12' visibility='default' filepath='libnurbs/internals/uarray.h' line='46' column='1'/>
+        <var-decl name='size' type-id='type-id-15' visibility='default' filepath='libnurbs/internals/uarray.h' line='46' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='64'>
-        <var-decl name='ulines' type-id='type-id-12' visibility='default' filepath='libnurbs/internals/uarray.h' line='47' column='1'/>
+        <var-decl name='ulines' type-id='type-id-15' visibility='default' filepath='libnurbs/internals/uarray.h' line='47' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='128'>
-        <var-decl name='uarray' type-id='type-id-13' visibility='default' filepath='libnurbs/internals/uarray.h' line='52' column='1'/>
+        <var-decl name='uarray' type-id='type-id-16' visibility='default' filepath='libnurbs/internals/uarray.h' line='52' column='1'/>
       </data-member>
       <member-function access='private' constructor='yes'>
         <function-decl name='Uarray' filepath='libnurbs/internals/uarray.h' line='49' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-209' is-artificial='yes'/>
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private' destructor='yes'>
         <function-decl name='~Uarray' filepath='libnurbs/internals/uarray.h' line='50' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-209' is-artificial='yes'/>
-          <parameter type-id='type-id-10' is-artificial='yes'/>
-          <return type-id='type-id-11'/>
+          <parameter type-id='type-id-11' is-artificial='yes'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -5575,7 +5575,7 @@
           <parameter type-id='type-id-1'/>
           <parameter type-id='type-id-113'/>
           <parameter type-id='type-id-113'/>
-          <return type-id='type-id-12'/>
+          <return type-id='type-id-15'/>
         </function-decl>
       </member-function>
     </class-decl>
@@ -5601,14 +5601,14 @@
       <member-function access='private' constructor='yes'>
         <function-decl name='TrimRegion' filepath='libnurbs/internals/trimregion.h' line='48' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-212' is-artificial='yes'/>
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
         <function-decl name='init' mangled-name='_ZN10TrimRegion4initEf' filepath='libnurbs/internals/trimregion.h' line='55' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-212' is-artificial='yes'/>
           <parameter type-id='type-id-1'/>
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -5617,36 +5617,36 @@
           <parameter type-id='type-id-1'/>
           <parameter type-id='type-id-1'/>
           <parameter type-id='type-id-1'/>
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
         <function-decl name='setDu' mangled-name='_ZN10TrimRegion5setDuEf' filepath='libnurbs/internals/trimregion.h' line='57' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-212' is-artificial='yes'/>
           <parameter type-id='type-id-1'/>
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
         <function-decl name='init' mangled-name='_ZN10TrimRegion4initElP3Arc' filepath='libnurbs/internals/trimregion.h' line='58' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-212' is-artificial='yes'/>
-          <parameter type-id='type-id-12'/>
+          <parameter type-id='type-id-15'/>
           <parameter type-id='type-id-113'/>
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
         <function-decl name='getPts' mangled-name='_ZN10TrimRegion6getPtsEP3Arc' filepath='libnurbs/internals/trimregion.h' line='59' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-212' is-artificial='yes'/>
           <parameter type-id='type-id-113'/>
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
         <function-decl name='getPts' mangled-name='_ZN10TrimRegion6getPtsER7Backend' filepath='libnurbs/internals/trimregion.h' line='60' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-212' is-artificial='yes'/>
           <parameter type-id='type-id-167'/>
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -5654,37 +5654,37 @@
           <parameter type-id='type-id-212' is-artificial='yes'/>
           <parameter type-id='type-id-119'/>
           <parameter type-id='type-id-119'/>
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
         <function-decl name='getGridExtent' mangled-name='_ZN10TrimRegion13getGridExtentEv' filepath='libnurbs/internals/trimregion.h' line='62' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-212' is-artificial='yes'/>
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
         <function-decl name='canTile' mangled-name='_ZN10TrimRegion7canTileEv' filepath='libnurbs/internals/trimregion.h' line='63' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-212' is-artificial='yes'/>
-          <return type-id='type-id-10'/>
+          <return type-id='type-id-11'/>
         </function-decl>
       </member-function>
     </class-decl>
     <class-decl name='Gridline' size-in-bits='320' is-struct='yes' visibility='default' filepath='libnurbs/internals/gridline.h' line='39' column='1' id='type-id-211'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='v' type-id='type-id-12' visibility='default' filepath='libnurbs/internals/gridline.h' line='40' column='1'/>
+        <var-decl name='v' type-id='type-id-15' visibility='default' filepath='libnurbs/internals/gridline.h' line='40' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
         <var-decl name='vval' type-id='type-id-1' visibility='default' filepath='libnurbs/internals/gridline.h' line='41' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
-        <var-decl name='vindex' type-id='type-id-12' visibility='default' filepath='libnurbs/internals/gridline.h' line='42' column='1'/>
+        <var-decl name='vindex' type-id='type-id-15' visibility='default' filepath='libnurbs/internals/gridline.h' line='42' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='192'>
-        <var-decl name='ustart' type-id='type-id-12' visibility='default' filepath='libnurbs/internals/gridline.h' line='43' column='1'/>
+        <var-decl name='ustart' type-id='type-id-15' visibility='default' filepath='libnurbs/internals/gridline.h' line='43' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='256'>
-        <var-decl name='uend' type-id='type-id-12' visibility='default' filepath='libnurbs/internals/gridline.h' line='44' column='1'/>
+        <var-decl name='uend' type-id='type-id-15' visibility='default' filepath='libnurbs/internals/gridline.h' line='44' column='1'/>
       </data-member>
     </class-decl>
     <class-decl name='CoveAndTiler' size-in-bits='2688' visibility='default' filepath='libnurbs/internals/coveandtiler.h' line='46' column='1' id='type-id-182'>
@@ -5698,130 +5698,130 @@
       <member-function access='private' constructor='yes'>
         <function-decl name='CoveAndTiler' filepath='libnurbs/internals/coveandtiler.cc' line='52' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-213' is-artificial='yes'/>
-          <parameter type-id='type-id-10' is-artificial='yes'/>
+          <parameter type-id='type-id-11' is-artificial='yes'/>
           <parameter type-id='type-id-185' is-artificial='yes'/>
           <parameter type-id='type-id-167'/>
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private' destructor='yes'>
         <function-decl name='~CoveAndTiler' filepath='libnurbs/internals/coveandtiler.cc' line='56' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-213' is-artificial='yes'/>
-          <parameter type-id='type-id-10' is-artificial='yes'/>
+          <parameter type-id='type-id-11' is-artificial='yes'/>
           <parameter type-id='type-id-185' is-artificial='yes'/>
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
         <function-decl name='coveAndTile' mangled-name='_ZN12CoveAndTiler11coveAndTileEv' filepath='libnurbs/internals/coveandtiler.cc' line='78' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-213' is-artificial='yes'/>
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
         <function-decl name='tile' mangled-name='_ZN12CoveAndTiler4tileElll' filepath='libnurbs/internals/coveandtiler.cc' line='181' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-213' is-artificial='yes'/>
-          <parameter type-id='type-id-12'/>
-          <parameter type-id='type-id-12'/>
-          <parameter type-id='type-id-12'/>
-          <return type-id='type-id-11'/>
+          <parameter type-id='type-id-15'/>
+          <parameter type-id='type-id-15'/>
+          <parameter type-id='type-id-15'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
         <function-decl name='coveLowerLeft' mangled-name='_ZN12CoveAndTiler13coveLowerLeftEv' filepath='libnurbs/internals/coveandtiler.cc' line='320' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-213' is-artificial='yes'/>
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
         <function-decl name='coveLowerRight' mangled-name='_ZN12CoveAndTiler14coveLowerRightEv' filepath='libnurbs/internals/coveandtiler.cc' line='381' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-213' is-artificial='yes'/>
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
         <function-decl name='coveUpperLeft' mangled-name='_ZN12CoveAndTiler13coveUpperLeftEv' filepath='libnurbs/internals/coveandtiler.cc' line='259' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-213' is-artificial='yes'/>
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
         <function-decl name='coveUpperRight' mangled-name='_ZN12CoveAndTiler14coveUpperRightEv' filepath='libnurbs/internals/coveandtiler.cc' line='197' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-213' is-artificial='yes'/>
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
         <function-decl name='coveUpperLeftNoGrid' mangled-name='_ZN12CoveAndTiler19coveUpperLeftNoGridEP10TrimVertex' filepath='libnurbs/internals/coveandtiler.cc' line='275' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-213' is-artificial='yes'/>
           <parameter type-id='type-id-119'/>
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
         <function-decl name='coveUpperRightNoGrid' mangled-name='_ZN12CoveAndTiler20coveUpperRightNoGridEP10TrimVertex' filepath='libnurbs/internals/coveandtiler.cc' line='213' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-213' is-artificial='yes'/>
           <parameter type-id='type-id-119'/>
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
         <function-decl name='coveLowerLeftNoGrid' mangled-name='_ZN12CoveAndTiler19coveLowerLeftNoGridEP10TrimVertex' filepath='libnurbs/internals/coveandtiler.cc' line='336' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-213' is-artificial='yes'/>
           <parameter type-id='type-id-119'/>
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
         <function-decl name='coveLowerRightNoGrid' mangled-name='_ZN12CoveAndTiler20coveLowerRightNoGridEP10TrimVertex' filepath='libnurbs/internals/coveandtiler.cc' line='397' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-213' is-artificial='yes'/>
           <parameter type-id='type-id-119'/>
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
         <function-decl name='coveLL' mangled-name='_ZN12CoveAndTiler6coveLLEv' filepath='libnurbs/internals/coveandtiler.cc' line='348' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-213' is-artificial='yes'/>
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
         <function-decl name='coveLR' mangled-name='_ZN12CoveAndTiler6coveLREv' filepath='libnurbs/internals/coveandtiler.cc' line='409' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-213' is-artificial='yes'/>
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
         <function-decl name='coveUL' mangled-name='_ZN12CoveAndTiler6coveULEv' filepath='libnurbs/internals/coveandtiler.cc' line='287' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-213' is-artificial='yes'/>
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
         <function-decl name='coveUR' mangled-name='_ZN12CoveAndTiler6coveUREv' filepath='libnurbs/internals/coveandtiler.cc' line='225' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-213' is-artificial='yes'/>
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
         <function-decl name='output' mangled-name='_ZN12CoveAndTiler6outputER14GridTrimVertex' filepath='libnurbs/internals/coveandtiler.cc' line='72' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-213' is-artificial='yes'/>
           <parameter type-id='type-id-214'/>
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
         <function-decl name='output' mangled-name='_ZN12CoveAndTiler6outputER10GridVertex' filepath='libnurbs/internals/coveandtiler.cc' line='60' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-213' is-artificial='yes'/>
           <parameter type-id='type-id-215'/>
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
         <function-decl name='output' mangled-name='_ZN12CoveAndTiler6outputEP10TrimVertex' filepath='libnurbs/internals/coveandtiler.cc' line='66' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-213' is-artificial='yes'/>
           <parameter type-id='type-id-119'/>
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
     </class-decl>
@@ -5847,10 +5847,10 @@
       <subrange length='5' type-id='type-id-3' id='type-id-220'/>
       <subrange length='5' type-id='type-id-3' id='type-id-220'/>
     </array-type-def>
-    <array-type-def dimensions='1' type-id='type-id-30' size-in-bits='128' id='type-id-222'>
+    <array-type-def dimensions='1' type-id='type-id-33' size-in-bits='128' id='type-id-222'>
       <subrange length='4' type-id='type-id-3' id='type-id-62'/>
     </array-type-def>
-    <array-type-def dimensions='1' type-id='type-id-10' size-in-bits='64' id='type-id-223'>
+    <array-type-def dimensions='1' type-id='type-id-11' size-in-bits='64' id='type-id-223'>
       <subrange length='2' type-id='type-id-3' id='type-id-88'/>
     </array-type-def>
     <class-decl name='Curve' size-in-bits='8128' visibility='default' filepath='libnurbs/internals/curve.h' line='46' column='1' id='type-id-224'>
@@ -5861,16 +5861,16 @@
         <var-decl name='mapdesc' type-id='type-id-163' visibility='default' filepath='libnurbs/internals/curve.h' line='53' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='128'>
-        <var-decl name='stride' type-id='type-id-10' visibility='default' filepath='libnurbs/internals/curve.h' line='54' column='1'/>
+        <var-decl name='stride' type-id='type-id-11' visibility='default' filepath='libnurbs/internals/curve.h' line='54' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='160'>
-        <var-decl name='order' type-id='type-id-10' visibility='default' filepath='libnurbs/internals/curve.h' line='55' column='1'/>
+        <var-decl name='order' type-id='type-id-11' visibility='default' filepath='libnurbs/internals/curve.h' line='55' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='192'>
-        <var-decl name='cullval' type-id='type-id-10' visibility='default' filepath='libnurbs/internals/curve.h' line='56' column='1'/>
+        <var-decl name='cullval' type-id='type-id-11' visibility='default' filepath='libnurbs/internals/curve.h' line='56' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='224'>
-        <var-decl name='needsSampling' type-id='type-id-10' visibility='default' filepath='libnurbs/internals/curve.h' line='57' column='1'/>
+        <var-decl name='needsSampling' type-id='type-id-11' visibility='default' filepath='libnurbs/internals/curve.h' line='57' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='256'>
         <var-decl name='cpts' type-id='type-id-217' visibility='default' filepath='libnurbs/internals/curve.h' line='58' column='1'/>
@@ -5894,7 +5894,7 @@
           <parameter type-id='type-id-1'/>
           <parameter type-id='type-id-1'/>
           <parameter type-id='type-id-136'/>
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private' constructor='yes'>
@@ -5903,38 +5903,38 @@
           <parameter type-id='type-id-225'/>
           <parameter type-id='type-id-1'/>
           <parameter type-id='type-id-136'/>
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
         <function-decl name='clamp' mangled-name='_ZN5Curve5clampEv' filepath='libnurbs/internals/curve.h' line='64' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-136' is-artificial='yes'/>
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
         <function-decl name='setstepsize' mangled-name='_ZN5Curve11setstepsizeEf' filepath='libnurbs/internals/curve.h' line='65' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-136' is-artificial='yes'/>
           <parameter type-id='type-id-1'/>
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
         <function-decl name='getstepsize' mangled-name='_ZN5Curve11getstepsizeEv' filepath='libnurbs/internals/curve.h' line='66' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-136' is-artificial='yes'/>
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
         <function-decl name='cullCheck' mangled-name='_ZN5Curve9cullCheckEv' filepath='libnurbs/internals/curve.h' line='67' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-136' is-artificial='yes'/>
-          <return type-id='type-id-10'/>
+          <return type-id='type-id-11'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
         <function-decl name='needsSamplingSubdivision' mangled-name='_ZN5Curve24needsSamplingSubdivisionEv' filepath='libnurbs/internals/curve.h' line='68' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-136' is-artificial='yes'/>
-          <return type-id='type-id-10'/>
+          <return type-id='type-id-11'/>
         </function-decl>
       </member-function>
     </class-decl>
@@ -5969,22 +5969,22 @@
         <var-decl name='bboxsize' type-id='type-id-219' visibility='default' filepath='libnurbs/internals/mapdesc.h' line='112' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='448'>
-        <var-decl name='type' type-id='type-id-12' visibility='default' filepath='libnurbs/internals/mapdesc.h' line='115' column='1'/>
+        <var-decl name='type' type-id='type-id-15' visibility='default' filepath='libnurbs/internals/mapdesc.h' line='115' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='512'>
-        <var-decl name='isrational' type-id='type-id-10' visibility='default' filepath='libnurbs/internals/mapdesc.h' line='116' column='1'/>
+        <var-decl name='isrational' type-id='type-id-11' visibility='default' filepath='libnurbs/internals/mapdesc.h' line='116' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='544'>
-        <var-decl name='ncoords' type-id='type-id-10' visibility='default' filepath='libnurbs/internals/mapdesc.h' line='117' column='1'/>
+        <var-decl name='ncoords' type-id='type-id-11' visibility='default' filepath='libnurbs/internals/mapdesc.h' line='117' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='576'>
-        <var-decl name='hcoords' type-id='type-id-10' visibility='default' filepath='libnurbs/internals/mapdesc.h' line='118' column='1'/>
+        <var-decl name='hcoords' type-id='type-id-11' visibility='default' filepath='libnurbs/internals/mapdesc.h' line='118' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='608'>
-        <var-decl name='inhcoords' type-id='type-id-10' visibility='default' filepath='libnurbs/internals/mapdesc.h' line='119' column='1'/>
+        <var-decl name='inhcoords' type-id='type-id-11' visibility='default' filepath='libnurbs/internals/mapdesc.h' line='119' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='640'>
-        <var-decl name='mask' type-id='type-id-10' visibility='default' filepath='libnurbs/internals/mapdesc.h' line='120' column='1'/>
+        <var-decl name='mask' type-id='type-id-11' visibility='default' filepath='libnurbs/internals/mapdesc.h' line='120' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='672'>
         <var-decl name='bmat' type-id='type-id-226' visibility='default' filepath='libnurbs/internals/mapdesc.h' line='121' column='1'/>
@@ -6019,179 +6019,179 @@
       <member-function access='public' constructor='yes'>
         <function-decl name='Mapdesc' filepath='libnurbs/internals/mapdesc.h' line='53' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-163' is-artificial='yes'/>
-          <parameter type-id='type-id-12'/>
-          <parameter type-id='type-id-10'/>
-          <parameter type-id='type-id-10'/>
+          <parameter type-id='type-id-15'/>
+          <parameter type-id='type-id-11'/>
+          <parameter type-id='type-id-11'/>
           <parameter type-id='type-id-167'/>
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
         <function-decl name='isProperty' mangled-name='_ZN7Mapdesc10isPropertyEl' filepath='libnurbs/internals/mapdesc.h' line='54' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-163' is-artificial='yes'/>
-          <parameter type-id='type-id-12'/>
-          <return type-id='type-id-10'/>
+          <parameter type-id='type-id-15'/>
+          <return type-id='type-id-11'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
         <function-decl name='getProperty' mangled-name='_ZN7Mapdesc11getPropertyEl' filepath='libnurbs/internals/mapdesc.h' line='55' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-163' is-artificial='yes'/>
-          <parameter type-id='type-id-12'/>
+          <parameter type-id='type-id-15'/>
           <return type-id='type-id-1'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
         <function-decl name='setProperty' mangled-name='_ZN7Mapdesc11setPropertyElf' filepath='libnurbs/internals/mapdesc.h' line='56' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-163' is-artificial='yes'/>
-          <parameter type-id='type-id-12'/>
+          <parameter type-id='type-id-15'/>
           <parameter type-id='type-id-1'/>
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
         <function-decl name='isConstantSampling' mangled-name='_ZN7Mapdesc18isConstantSamplingEv' filepath='libnurbs/internals/mapdesc.h' line='57' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-163' is-artificial='yes'/>
-          <return type-id='type-id-10'/>
+          <return type-id='type-id-11'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
         <function-decl name='isDomainSampling' mangled-name='_ZN7Mapdesc16isDomainSamplingEv' filepath='libnurbs/internals/mapdesc.h' line='58' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-163' is-artificial='yes'/>
-          <return type-id='type-id-10'/>
+          <return type-id='type-id-11'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
         <function-decl name='isRangeSampling' mangled-name='_ZN7Mapdesc15isRangeSamplingEv' filepath='libnurbs/internals/mapdesc.h' line='59' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-163' is-artificial='yes'/>
-          <return type-id='type-id-10'/>
+          <return type-id='type-id-11'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
         <function-decl name='isSampling' mangled-name='_ZN7Mapdesc10isSamplingEv' filepath='libnurbs/internals/mapdesc.h' line='60' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-163' is-artificial='yes'/>
-          <return type-id='type-id-10'/>
+          <return type-id='type-id-11'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
         <function-decl name='isParametricDistanceSampling' mangled-name='_ZN7Mapdesc28isParametricDistanceSamplingEv' filepath='libnurbs/internals/mapdesc.h' line='61' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-163' is-artificial='yes'/>
-          <return type-id='type-id-10'/>
+          <return type-id='type-id-11'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
         <function-decl name='isObjectSpaceParaSampling' mangled-name='_ZN7Mapdesc25isObjectSpaceParaSamplingEv' filepath='libnurbs/internals/mapdesc.h' line='62' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-163' is-artificial='yes'/>
-          <return type-id='type-id-10'/>
+          <return type-id='type-id-11'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
         <function-decl name='isObjectSpacePathSampling' mangled-name='_ZN7Mapdesc25isObjectSpacePathSamplingEv' filepath='libnurbs/internals/mapdesc.h' line='63' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-163' is-artificial='yes'/>
-          <return type-id='type-id-10'/>
+          <return type-id='type-id-11'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
         <function-decl name='isSurfaceAreaSampling' mangled-name='_ZN7Mapdesc21isSurfaceAreaSamplingEv' filepath='libnurbs/internals/mapdesc.h' line='64' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-163' is-artificial='yes'/>
-          <return type-id='type-id-10'/>
+          <return type-id='type-id-11'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
         <function-decl name='isPathLengthSampling' mangled-name='_ZN7Mapdesc20isPathLengthSamplingEv' filepath='libnurbs/internals/mapdesc.h' line='65' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-163' is-artificial='yes'/>
-          <return type-id='type-id-10'/>
+          <return type-id='type-id-11'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
         <function-decl name='isCulling' mangled-name='_ZN7Mapdesc9isCullingEv' filepath='libnurbs/internals/mapdesc.h' line='66' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-163' is-artificial='yes'/>
-          <return type-id='type-id-10'/>
+          <return type-id='type-id-11'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
         <function-decl name='isBboxSubdividing' mangled-name='_ZN7Mapdesc17isBboxSubdividingEv' filepath='libnurbs/internals/mapdesc.h' line='67' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-163' is-artificial='yes'/>
-          <return type-id='type-id-10'/>
+          <return type-id='type-id-11'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
         <function-decl name='getType' mangled-name='_ZN7Mapdesc7getTypeEv' filepath='libnurbs/internals/mapdesc.h' line='68' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-163' is-artificial='yes'/>
-          <return type-id='type-id-12'/>
+          <return type-id='type-id-15'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
         <function-decl name='subdivide' mangled-name='_ZN7Mapdesc9subdivideEPfS0_fii' filepath='libnurbs/internals/mapdesc.h' line='71' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-163' is-artificial='yes'/>
-          <parameter type-id='type-id-13'/>
-          <parameter type-id='type-id-13'/>
+          <parameter type-id='type-id-16'/>
+          <parameter type-id='type-id-16'/>
           <parameter type-id='type-id-1'/>
-          <parameter type-id='type-id-10'/>
-          <parameter type-id='type-id-10'/>
-          <return type-id='type-id-11'/>
+          <parameter type-id='type-id-11'/>
+          <parameter type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
         <function-decl name='cullCheck' mangled-name='_ZN7Mapdesc9cullCheckEPfii' filepath='libnurbs/internals/mapdesc.h' line='72' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-163' is-artificial='yes'/>
-          <parameter type-id='type-id-13'/>
-          <parameter type-id='type-id-10'/>
-          <parameter type-id='type-id-10'/>
-          <return type-id='type-id-10'/>
+          <parameter type-id='type-id-16'/>
+          <parameter type-id='type-id-11'/>
+          <parameter type-id='type-id-11'/>
+          <return type-id='type-id-11'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
         <function-decl name='xformBounding' mangled-name='_ZN7Mapdesc13xformBoundingEPfiiS0_i' filepath='libnurbs/internals/mapdesc.h' line='73' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-163' is-artificial='yes'/>
-          <parameter type-id='type-id-13'/>
-          <parameter type-id='type-id-10'/>
-          <parameter type-id='type-id-10'/>
-          <parameter type-id='type-id-13'/>
-          <parameter type-id='type-id-10'/>
-          <return type-id='type-id-11'/>
+          <parameter type-id='type-id-16'/>
+          <parameter type-id='type-id-11'/>
+          <parameter type-id='type-id-11'/>
+          <parameter type-id='type-id-16'/>
+          <parameter type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
         <function-decl name='xformCulling' mangled-name='_ZN7Mapdesc12xformCullingEPfiiS0_i' filepath='libnurbs/internals/mapdesc.h' line='74' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-163' is-artificial='yes'/>
-          <parameter type-id='type-id-13'/>
-          <parameter type-id='type-id-10'/>
-          <parameter type-id='type-id-10'/>
-          <parameter type-id='type-id-13'/>
-          <parameter type-id='type-id-10'/>
-          <return type-id='type-id-11'/>
+          <parameter type-id='type-id-16'/>
+          <parameter type-id='type-id-11'/>
+          <parameter type-id='type-id-11'/>
+          <parameter type-id='type-id-16'/>
+          <parameter type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
         <function-decl name='xformSampling' mangled-name='_ZN7Mapdesc13xformSamplingEPfiiS0_i' filepath='libnurbs/internals/mapdesc.h' line='75' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-163' is-artificial='yes'/>
-          <parameter type-id='type-id-13'/>
-          <parameter type-id='type-id-10'/>
-          <parameter type-id='type-id-10'/>
-          <parameter type-id='type-id-13'/>
-          <parameter type-id='type-id-10'/>
-          <return type-id='type-id-11'/>
+          <parameter type-id='type-id-16'/>
+          <parameter type-id='type-id-11'/>
+          <parameter type-id='type-id-11'/>
+          <parameter type-id='type-id-16'/>
+          <parameter type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
         <function-decl name='xformMat' mangled-name='_ZN7Mapdesc8xformMatEPA5_fPfiiS2_i' filepath='libnurbs/internals/mapdesc.h' line='76' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-163' is-artificial='yes'/>
           <parameter type-id='type-id-228'/>
-          <parameter type-id='type-id-13'/>
-          <parameter type-id='type-id-10'/>
-          <parameter type-id='type-id-10'/>
-          <parameter type-id='type-id-13'/>
-          <parameter type-id='type-id-10'/>
-          <return type-id='type-id-11'/>
+          <parameter type-id='type-id-16'/>
+          <parameter type-id='type-id-11'/>
+          <parameter type-id='type-id-11'/>
+          <parameter type-id='type-id-16'/>
+          <parameter type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
         <function-decl name='calcPartialVelocity' mangled-name='_ZN7Mapdesc19calcPartialVelocityEPfiiif' filepath='libnurbs/internals/mapdesc.h' line='77' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-163' is-artificial='yes'/>
-          <parameter type-id='type-id-13'/>
-          <parameter type-id='type-id-10'/>
-          <parameter type-id='type-id-10'/>
-          <parameter type-id='type-id-10'/>
+          <parameter type-id='type-id-16'/>
+          <parameter type-id='type-id-11'/>
+          <parameter type-id='type-id-11'/>
+          <parameter type-id='type-id-11'/>
           <parameter type-id='type-id-1'/>
           <return type-id='type-id-1'/>
         </function-decl>
@@ -6199,256 +6199,256 @@
       <member-function access='public'>
         <function-decl name='project' mangled-name='_ZN7Mapdesc7projectEPfiS0_ii' filepath='libnurbs/internals/mapdesc.h' line='78' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-163' is-artificial='yes'/>
-          <parameter type-id='type-id-13'/>
-          <parameter type-id='type-id-10'/>
-          <parameter type-id='type-id-13'/>
-          <parameter type-id='type-id-10'/>
-          <parameter type-id='type-id-10'/>
-          <return type-id='type-id-10'/>
+          <parameter type-id='type-id-16'/>
+          <parameter type-id='type-id-11'/>
+          <parameter type-id='type-id-16'/>
+          <parameter type-id='type-id-11'/>
+          <parameter type-id='type-id-11'/>
+          <return type-id='type-id-11'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
         <function-decl name='calcVelocityRational' mangled-name='_ZN7Mapdesc20calcVelocityRationalEPfii' filepath='libnurbs/internals/mapdesc.h' line='79' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-163' is-artificial='yes'/>
-          <parameter type-id='type-id-13'/>
-          <parameter type-id='type-id-10'/>
-          <parameter type-id='type-id-10'/>
+          <parameter type-id='type-id-16'/>
+          <parameter type-id='type-id-11'/>
+          <parameter type-id='type-id-11'/>
           <return type-id='type-id-1'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
         <function-decl name='calcVelocityNonrational' mangled-name='_ZN7Mapdesc23calcVelocityNonrationalEPfii' filepath='libnurbs/internals/mapdesc.h' line='80' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-163' is-artificial='yes'/>
-          <parameter type-id='type-id-13'/>
-          <parameter type-id='type-id-10'/>
-          <parameter type-id='type-id-10'/>
+          <parameter type-id='type-id-16'/>
+          <parameter type-id='type-id-11'/>
+          <parameter type-id='type-id-11'/>
           <return type-id='type-id-1'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
         <function-decl name='subdivide' mangled-name='_ZN7Mapdesc9subdivideEPfS0_fiiii' filepath='libnurbs/internals/mapdesc.h' line='83' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-163' is-artificial='yes'/>
-          <parameter type-id='type-id-13'/>
-          <parameter type-id='type-id-13'/>
+          <parameter type-id='type-id-16'/>
+          <parameter type-id='type-id-16'/>
           <parameter type-id='type-id-1'/>
-          <parameter type-id='type-id-10'/>
-          <parameter type-id='type-id-10'/>
-          <parameter type-id='type-id-10'/>
-          <parameter type-id='type-id-10'/>
-          <return type-id='type-id-11'/>
+          <parameter type-id='type-id-11'/>
+          <parameter type-id='type-id-11'/>
+          <parameter type-id='type-id-11'/>
+          <parameter type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
         <function-decl name='cullCheck' mangled-name='_ZN7Mapdesc9cullCheckEPfiiii' filepath='libnurbs/internals/mapdesc.h' line='84' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-163' is-artificial='yes'/>
-          <parameter type-id='type-id-13'/>
-          <parameter type-id='type-id-10'/>
-          <parameter type-id='type-id-10'/>
-          <parameter type-id='type-id-10'/>
-          <parameter type-id='type-id-10'/>
-          <return type-id='type-id-10'/>
+          <parameter type-id='type-id-16'/>
+          <parameter type-id='type-id-11'/>
+          <parameter type-id='type-id-11'/>
+          <parameter type-id='type-id-11'/>
+          <parameter type-id='type-id-11'/>
+          <return type-id='type-id-11'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
         <function-decl name='xformBounding' mangled-name='_ZN7Mapdesc13xformBoundingEPfiiiiS0_ii' filepath='libnurbs/internals/mapdesc.h' line='85' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-163' is-artificial='yes'/>
-          <parameter type-id='type-id-13'/>
-          <parameter type-id='type-id-10'/>
-          <parameter type-id='type-id-10'/>
-          <parameter type-id='type-id-10'/>
-          <parameter type-id='type-id-10'/>
-          <parameter type-id='type-id-13'/>
-          <parameter type-id='type-id-10'/>
-          <parameter type-id='type-id-10'/>
-          <return type-id='type-id-11'/>
+          <parameter type-id='type-id-16'/>
+          <parameter type-id='type-id-11'/>
+          <parameter type-id='type-id-11'/>
+          <parameter type-id='type-id-11'/>
+          <parameter type-id='type-id-11'/>
+          <parameter type-id='type-id-16'/>
+          <parameter type-id='type-id-11'/>
+          <parameter type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
         <function-decl name='xformCulling' mangled-name='_ZN7Mapdesc12xformCullingEPfiiiiS0_ii' filepath='libnurbs/internals/mapdesc.h' line='86' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-163' is-artificial='yes'/>
-          <parameter type-id='type-id-13'/>
-          <parameter type-id='type-id-10'/>
-          <parameter type-id='type-id-10'/>
-          <parameter type-id='type-id-10'/>
-          <parameter type-id='type-id-10'/>
-          <parameter type-id='type-id-13'/>
-          <parameter type-id='type-id-10'/>
-          <parameter type-id='type-id-10'/>
-          <return type-id='type-id-11'/>
+          <parameter type-id='type-id-16'/>
+          <parameter type-id='type-id-11'/>
+          <parameter type-id='type-id-11'/>
+          <parameter type-id='type-id-11'/>
+          <parameter type-id='type-id-11'/>
+          <parameter type-id='type-id-16'/>
+          <parameter type-id='type-id-11'/>
+          <parameter type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
         <function-decl name='xformSampling' mangled-name='_ZN7Mapdesc13xformSamplingEPfiiiiS0_ii' filepath='libnurbs/internals/mapdesc.h' line='87' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-163' is-artificial='yes'/>
-          <parameter type-id='type-id-13'/>
-          <parameter type-id='type-id-10'/>
-          <parameter type-id='type-id-10'/>
-          <parameter type-id='type-id-10'/>
-          <parameter type-id='type-id-10'/>
-          <parameter type-id='type-id-13'/>
-          <parameter type-id='type-id-10'/>
-          <parameter type-id='type-id-10'/>
-          <return type-id='type-id-11'/>
+          <parameter type-id='type-id-16'/>
+          <parameter type-id='type-id-11'/>
+          <parameter type-id='type-id-11'/>
+          <parameter type-id='type-id-11'/>
+          <parameter type-id='type-id-11'/>
+          <parameter type-id='type-id-16'/>
+          <parameter type-id='type-id-11'/>
+          <parameter type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
         <function-decl name='xformMat' mangled-name='_ZN7Mapdesc8xformMatEPA5_fPfiiiiS2_ii' filepath='libnurbs/internals/mapdesc.h' line='88' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-163' is-artificial='yes'/>
           <parameter type-id='type-id-228'/>
-          <parameter type-id='type-id-13'/>
-          <parameter type-id='type-id-10'/>
-          <parameter type-id='type-id-10'/>
-          <parameter type-id='type-id-10'/>
-          <parameter type-id='type-id-10'/>
-          <parameter type-id='type-id-13'/>
-          <parameter type-id='type-id-10'/>
-          <parameter type-id='type-id-10'/>
-          <return type-id='type-id-11'/>
+          <parameter type-id='type-id-16'/>
+          <parameter type-id='type-id-11'/>
+          <parameter type-id='type-id-11'/>
+          <parameter type-id='type-id-11'/>
+          <parameter type-id='type-id-11'/>
+          <parameter type-id='type-id-16'/>
+          <parameter type-id='type-id-11'/>
+          <parameter type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
         <function-decl name='calcPartialVelocity' mangled-name='_ZN7Mapdesc19calcPartialVelocityEPfS0_iiiiiiffi' filepath='libnurbs/internals/mapdesc.h' line='89' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-163' is-artificial='yes'/>
-          <parameter type-id='type-id-13'/>
-          <parameter type-id='type-id-13'/>
-          <parameter type-id='type-id-10'/>
-          <parameter type-id='type-id-10'/>
-          <parameter type-id='type-id-10'/>
-          <parameter type-id='type-id-10'/>
-          <parameter type-id='type-id-10'/>
-          <parameter type-id='type-id-10'/>
+          <parameter type-id='type-id-16'/>
+          <parameter type-id='type-id-16'/>
+          <parameter type-id='type-id-11'/>
+          <parameter type-id='type-id-11'/>
+          <parameter type-id='type-id-11'/>
+          <parameter type-id='type-id-11'/>
+          <parameter type-id='type-id-11'/>
+          <parameter type-id='type-id-11'/>
           <parameter type-id='type-id-1'/>
           <parameter type-id='type-id-1'/>
-          <parameter type-id='type-id-10'/>
+          <parameter type-id='type-id-11'/>
           <return type-id='type-id-1'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
         <function-decl name='project' mangled-name='_ZN7Mapdesc7projectEPfiiS0_iiii' filepath='libnurbs/internals/mapdesc.h' line='90' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-163' is-artificial='yes'/>
-          <parameter type-id='type-id-13'/>
-          <parameter type-id='type-id-10'/>
-          <parameter type-id='type-id-10'/>
-          <parameter type-id='type-id-13'/>
-          <parameter type-id='type-id-10'/>
-          <parameter type-id='type-id-10'/>
-          <parameter type-id='type-id-10'/>
-          <parameter type-id='type-id-10'/>
-          <return type-id='type-id-10'/>
+          <parameter type-id='type-id-16'/>
+          <parameter type-id='type-id-11'/>
+          <parameter type-id='type-id-11'/>
+          <parameter type-id='type-id-16'/>
+          <parameter type-id='type-id-11'/>
+          <parameter type-id='type-id-11'/>
+          <parameter type-id='type-id-11'/>
+          <parameter type-id='type-id-11'/>
+          <return type-id='type-id-11'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
         <function-decl name='surfbbox' mangled-name='_ZN7Mapdesc8surfbboxEPA5_f' filepath='libnurbs/internals/mapdesc.h' line='91' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-163' is-artificial='yes'/>
           <parameter type-id='type-id-228'/>
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
         <function-decl name='bboxTooBig' mangled-name='_ZN7Mapdesc10bboxTooBigEPfiiiiPA5_f' filepath='libnurbs/internals/mapdesc.h' line='93' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-163' is-artificial='yes'/>
-          <parameter type-id='type-id-13'/>
-          <parameter type-id='type-id-10'/>
-          <parameter type-id='type-id-10'/>
-          <parameter type-id='type-id-10'/>
-          <parameter type-id='type-id-10'/>
+          <parameter type-id='type-id-16'/>
+          <parameter type-id='type-id-11'/>
+          <parameter type-id='type-id-11'/>
+          <parameter type-id='type-id-11'/>
+          <parameter type-id='type-id-11'/>
           <parameter type-id='type-id-228'/>
-          <return type-id='type-id-10'/>
+          <return type-id='type-id-11'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
         <function-decl name='xformAndCullCheck' mangled-name='_ZN7Mapdesc17xformAndCullCheckEPfiiii' filepath='libnurbs/internals/mapdesc.h' line='94' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-163' is-artificial='yes'/>
-          <parameter type-id='type-id-13'/>
-          <parameter type-id='type-id-10'/>
-          <parameter type-id='type-id-10'/>
-          <parameter type-id='type-id-10'/>
-          <parameter type-id='type-id-10'/>
-          <return type-id='type-id-10'/>
+          <parameter type-id='type-id-16'/>
+          <parameter type-id='type-id-11'/>
+          <parameter type-id='type-id-11'/>
+          <parameter type-id='type-id-11'/>
+          <parameter type-id='type-id-11'/>
+          <return type-id='type-id-11'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
         <function-decl name='identify' mangled-name='_ZN7Mapdesc8identifyEPA5_f' filepath='libnurbs/internals/mapdesc.h' line='96' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-163' is-artificial='yes'/>
           <parameter type-id='type-id-228'/>
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
         <function-decl name='setBboxsize' mangled-name='_ZN7Mapdesc11setBboxsizeEPf' filepath='libnurbs/internals/mapdesc.h' line='97' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-163' is-artificial='yes'/>
           <parameter type-id='type-id-59'/>
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
         <function-decl name='setBmat' mangled-name='_ZN7Mapdesc7setBmatEPfll' filepath='libnurbs/internals/mapdesc.h' line='98' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-163' is-artificial='yes'/>
           <parameter type-id='type-id-59'/>
-          <parameter type-id='type-id-12'/>
-          <parameter type-id='type-id-12'/>
-          <return type-id='type-id-11'/>
+          <parameter type-id='type-id-15'/>
+          <parameter type-id='type-id-15'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
         <function-decl name='setCmat' mangled-name='_ZN7Mapdesc7setCmatEPfll' filepath='libnurbs/internals/mapdesc.h' line='99' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-163' is-artificial='yes'/>
           <parameter type-id='type-id-59'/>
-          <parameter type-id='type-id-12'/>
-          <parameter type-id='type-id-12'/>
-          <return type-id='type-id-11'/>
+          <parameter type-id='type-id-15'/>
+          <parameter type-id='type-id-15'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
         <function-decl name='setSmat' mangled-name='_ZN7Mapdesc7setSmatEPfll' filepath='libnurbs/internals/mapdesc.h' line='100' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-163' is-artificial='yes'/>
           <parameter type-id='type-id-59'/>
-          <parameter type-id='type-id-12'/>
-          <parameter type-id='type-id-12'/>
-          <return type-id='type-id-11'/>
+          <parameter type-id='type-id-15'/>
+          <parameter type-id='type-id-15'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
         <function-decl name='isRational' mangled-name='_ZN7Mapdesc10isRationalEv' filepath='libnurbs/internals/mapdesc.h' line='101' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-163' is-artificial='yes'/>
-          <return type-id='type-id-10'/>
+          <return type-id='type-id-11'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
         <function-decl name='getNcoords' mangled-name='_ZN7Mapdesc10getNcoordsEv' filepath='libnurbs/internals/mapdesc.h' line='102' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-163' is-artificial='yes'/>
-          <return type-id='type-id-10'/>
+          <return type-id='type-id-11'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
         <function-decl name='bbox' mangled-name='_ZN7Mapdesc4bboxEPA5_fPfiiii' filepath='libnurbs/internals/mapdesc.h' line='132' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-163' is-artificial='yes'/>
           <parameter type-id='type-id-228'/>
-          <parameter type-id='type-id-13'/>
-          <parameter type-id='type-id-10'/>
-          <parameter type-id='type-id-10'/>
-          <parameter type-id='type-id-10'/>
-          <parameter type-id='type-id-10'/>
-          <return type-id='type-id-11'/>
+          <parameter type-id='type-id-16'/>
+          <parameter type-id='type-id-11'/>
+          <parameter type-id='type-id-11'/>
+          <parameter type-id='type-id-11'/>
+          <parameter type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
         <function-decl name='maxDifference' mangled-name='_ZN7Mapdesc13maxDifferenceEiPfi' filepath='libnurbs/internals/mapdesc.h' line='133' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-163' is-artificial='yes'/>
-          <parameter type-id='type-id-10'/>
-          <parameter type-id='type-id-13'/>
-          <parameter type-id='type-id-10'/>
+          <parameter type-id='type-id-11'/>
+          <parameter type-id='type-id-16'/>
+          <parameter type-id='type-id-11'/>
           <return type-id='type-id-1'/>
         </function-decl>
       </member-function>
       <member-function access='private' static='yes'>
         <function-decl name='copy' mangled-name='_ZN7Mapdesc4copyEPA5_flPfll' filepath='libnurbs/internals/mapdesc.h' line='134' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-228'/>
-          <parameter type-id='type-id-12'/>
+          <parameter type-id='type-id-15'/>
           <parameter type-id='type-id-59'/>
-          <parameter type-id='type-id-12'/>
-          <parameter type-id='type-id-12'/>
-          <return type-id='type-id-11'/>
+          <parameter type-id='type-id-15'/>
+          <parameter type-id='type-id-15'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private' static='yes'>
@@ -6456,7 +6456,7 @@
           <parameter type-id='type-id-59'/>
           <parameter type-id='type-id-59'/>
           <parameter type-id='type-id-229'/>
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private' static='yes'>
@@ -6464,79 +6464,79 @@
           <parameter type-id='type-id-229'/>
           <parameter type-id='type-id-229'/>
           <parameter type-id='type-id-229'/>
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
         <function-decl name='copyPt' mangled-name='_ZN7Mapdesc6copyPtEPfS0_' filepath='libnurbs/internals/mapdesc.h' line='140' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-163' is-artificial='yes'/>
-          <parameter type-id='type-id-13'/>
-          <parameter type-id='type-id-13'/>
-          <return type-id='type-id-11'/>
+          <parameter type-id='type-id-16'/>
+          <parameter type-id='type-id-16'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
         <function-decl name='sumPt' mangled-name='_ZN7Mapdesc5sumPtEPfS0_S0_ff' filepath='libnurbs/internals/mapdesc.h' line='141' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-163' is-artificial='yes'/>
-          <parameter type-id='type-id-13'/>
-          <parameter type-id='type-id-13'/>
-          <parameter type-id='type-id-13'/>
+          <parameter type-id='type-id-16'/>
+          <parameter type-id='type-id-16'/>
+          <parameter type-id='type-id-16'/>
           <parameter type-id='type-id-1'/>
           <parameter type-id='type-id-1'/>
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
         <function-decl name='xformSampling' mangled-name='_ZN7Mapdesc13xformSamplingEPfS0_' filepath='libnurbs/internals/mapdesc.h' line='142' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-163' is-artificial='yes'/>
-          <parameter type-id='type-id-13'/>
-          <parameter type-id='type-id-13'/>
-          <return type-id='type-id-11'/>
+          <parameter type-id='type-id-16'/>
+          <parameter type-id='type-id-16'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
         <function-decl name='xformCulling' mangled-name='_ZN7Mapdesc12xformCullingEPfS0_' filepath='libnurbs/internals/mapdesc.h' line='143' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-163' is-artificial='yes'/>
-          <parameter type-id='type-id-13'/>
-          <parameter type-id='type-id-13'/>
-          <return type-id='type-id-11'/>
+          <parameter type-id='type-id-16'/>
+          <parameter type-id='type-id-16'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
         <function-decl name='xformRational' mangled-name='_ZN7Mapdesc13xformRationalEPA5_fPfS2_' filepath='libnurbs/internals/mapdesc.h' line='144' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-163' is-artificial='yes'/>
           <parameter type-id='type-id-228'/>
-          <parameter type-id='type-id-13'/>
-          <parameter type-id='type-id-13'/>
-          <return type-id='type-id-11'/>
+          <parameter type-id='type-id-16'/>
+          <parameter type-id='type-id-16'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
         <function-decl name='xformNonrational' mangled-name='_ZN7Mapdesc16xformNonrationalEPA5_fPfS2_' filepath='libnurbs/internals/mapdesc.h' line='145' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-163' is-artificial='yes'/>
           <parameter type-id='type-id-228'/>
-          <parameter type-id='type-id-13'/>
-          <parameter type-id='type-id-13'/>
-          <return type-id='type-id-11'/>
+          <parameter type-id='type-id-16'/>
+          <parameter type-id='type-id-16'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
         <function-decl name='clipbits' mangled-name='_ZN7Mapdesc8clipbitsEPf' filepath='libnurbs/internals/mapdesc.h' line='146' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-163' is-artificial='yes'/>
-          <parameter type-id='type-id-13'/>
+          <parameter type-id='type-id-16'/>
           <return type-id='type-id-230'/>
         </function-decl>
       </member-function>
     </class-decl>
     <class-decl name='Knotvector' size-in-bits='256' is-struct='yes' visibility='default' filepath='libnurbs/internals/knotvector.h' line='41' column='1' id='type-id-231'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='order' type-id='type-id-12' visibility='default' filepath='libnurbs/internals/knotvector.h' line='48' column='1'/>
+        <var-decl name='order' type-id='type-id-15' visibility='default' filepath='libnurbs/internals/knotvector.h' line='48' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
-        <var-decl name='knotcount' type-id='type-id-12' visibility='default' filepath='libnurbs/internals/knotvector.h' line='49' column='1'/>
+        <var-decl name='knotcount' type-id='type-id-15' visibility='default' filepath='libnurbs/internals/knotvector.h' line='49' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
-        <var-decl name='stride' type-id='type-id-12' visibility='default' filepath='libnurbs/internals/knotvector.h' line='50' column='1'/>
+        <var-decl name='stride' type-id='type-id-15' visibility='default' filepath='libnurbs/internals/knotvector.h' line='50' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='192'>
         <var-decl name='knotlist' type-id='type-id-232' visibility='default' filepath='libnurbs/internals/knotvector.h' line='51' column='1'/>
@@ -6544,55 +6544,55 @@
       <member-function access='public' constructor='yes'>
         <function-decl name='Knotvector' filepath='libnurbs/internals/knotvector.h' line='42' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-82' is-artificial='yes'/>
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public' destructor='yes'>
         <function-decl name='~Knotvector' filepath='libnurbs/internals/knotvector.h' line='43' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-82' is-artificial='yes'/>
-          <parameter type-id='type-id-10' is-artificial='yes'/>
-          <return type-id='type-id-11'/>
+          <parameter type-id='type-id-11' is-artificial='yes'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
         <function-decl name='init' mangled-name='_ZN10Knotvector4initElllPf' filepath='libnurbs/internals/knotvector.h' line='44' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-82' is-artificial='yes'/>
-          <parameter type-id='type-id-12'/>
-          <parameter type-id='type-id-12'/>
-          <parameter type-id='type-id-12'/>
+          <parameter type-id='type-id-15'/>
+          <parameter type-id='type-id-15'/>
+          <parameter type-id='type-id-15'/>
           <parameter type-id='type-id-59'/>
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
         <function-decl name='validate' mangled-name='_ZN10Knotvector8validateEv' filepath='libnurbs/internals/knotvector.h' line='45' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-82' is-artificial='yes'/>
-          <return type-id='type-id-10'/>
+          <return type-id='type-id-11'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
         <function-decl name='show' mangled-name='_ZN10Knotvector4showEPKc' filepath='libnurbs/internals/knotvector.h' line='46' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-82' is-artificial='yes'/>
           <parameter type-id='type-id-83'/>
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
     </class-decl>
     <class-decl name='Quiltspec' size-in-bits='320' is-struct='yes' visibility='default' filepath='libnurbs/internals/quilt.h' line='51' column='1' id='type-id-216'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='stride' type-id='type-id-10' visibility='default' filepath='libnurbs/internals/quilt.h' line='52' column='1'/>
+        <var-decl name='stride' type-id='type-id-11' visibility='default' filepath='libnurbs/internals/quilt.h' line='52' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='32'>
-        <var-decl name='width' type-id='type-id-10' visibility='default' filepath='libnurbs/internals/quilt.h' line='53' column='1'/>
+        <var-decl name='width' type-id='type-id-11' visibility='default' filepath='libnurbs/internals/quilt.h' line='53' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
-        <var-decl name='offset' type-id='type-id-10' visibility='default' filepath='libnurbs/internals/quilt.h' line='54' column='1'/>
+        <var-decl name='offset' type-id='type-id-11' visibility='default' filepath='libnurbs/internals/quilt.h' line='54' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='96'>
-        <var-decl name='order' type-id='type-id-10' visibility='default' filepath='libnurbs/internals/quilt.h' line='55' column='1'/>
+        <var-decl name='order' type-id='type-id-11' visibility='default' filepath='libnurbs/internals/quilt.h' line='55' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
-        <var-decl name='index' type-id='type-id-10' visibility='default' filepath='libnurbs/internals/quilt.h' line='56' column='1'/>
+        <var-decl name='index' type-id='type-id-11' visibility='default' filepath='libnurbs/internals/quilt.h' line='56' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='160'>
         <var-decl name='bdry' type-id='type-id-223' visibility='default' filepath='libnurbs/internals/quilt.h' line='57' column='1'/>
@@ -6617,7 +6617,7 @@
     <pointer-type-def type-id='type-id-222' size-in-bits='64' id='type-id-229'/>
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='libnurbs/internals/curvelist.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-T0fsxk/Mesa-8.0.5/src/glu/sgi' language='LANG_C_plus_plus'>
-    <array-type-def dimensions='1' type-id='type-id-30' size-in-bits='96' id='type-id-137'>
+    <array-type-def dimensions='1' type-id='type-id-33' size-in-bits='96' id='type-id-137'>
       <subrange length='3' type-id='type-id-3' id='type-id-91'/>
     </array-type-def>
     <pointer-type-def type-id='type-id-135' size-in-bits='64' id='type-id-138'/>
@@ -6629,7 +6629,7 @@
         <var-decl name='work' type-id='type-id-236' visibility='default' filepath='libnurbs/internals/displaylist.h' line='50' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
-        <var-decl name='arg' type-id='type-id-22' visibility='default' filepath='libnurbs/internals/displaylist.h' line='51' column='1'/>
+        <var-decl name='arg' type-id='type-id-25' visibility='default' filepath='libnurbs/internals/displaylist.h' line='51' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='192'>
         <var-decl name='cleanup' type-id='type-id-236' visibility='default' filepath='libnurbs/internals/displaylist.h' line='52' column='1'/>
@@ -6641,9 +6641,9 @@
         <function-decl name='Dlnode' filepath='libnurbs/internals/displaylist.h' line='49' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-237' is-artificial='yes'/>
           <parameter type-id='type-id-236'/>
-          <parameter type-id='type-id-22'/>
+          <parameter type-id='type-id-25'/>
           <parameter type-id='type-id-236'/>
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
     </class-decl>
@@ -6653,7 +6653,7 @@
         <var-decl name='__pfn' type-id='type-id-239' visibility='default' filepath='libnurbs/internals/displaylist.h' line='46' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
-        <var-decl name='__delta' type-id='type-id-12' visibility='default' filepath='libnurbs/internals/displaylist.h' line='46' column='1'/>
+        <var-decl name='__delta' type-id='type-id-15' visibility='default' filepath='libnurbs/internals/displaylist.h' line='46' column='1'/>
       </data-member>
     </class-decl>
     <class-decl name='DisplayList' size-in-bits='2688' visibility='default' filepath='libnurbs/internals/displaylist.h' line='65' column='1' id='type-id-240'>
@@ -6673,35 +6673,35 @@
         <function-decl name='DisplayList' filepath='libnurbs/internals/displaylist.h' line='67' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-78' is-artificial='yes'/>
           <parameter type-id='type-id-79'/>
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private' destructor='yes'>
         <function-decl name='~DisplayList' filepath='libnurbs/internals/displaylist.h' line='68' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-78' is-artificial='yes'/>
-          <parameter type-id='type-id-10' is-artificial='yes'/>
-          <return type-id='type-id-11'/>
+          <parameter type-id='type-id-11' is-artificial='yes'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
         <function-decl name='play' mangled-name='_ZN11DisplayList4playEv' filepath='libnurbs/internals/displaylist.h' line='69' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-78' is-artificial='yes'/>
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
         <function-decl name='append' mangled-name='_ZN11DisplayList6appendEM16NurbsTessellatorFvPvES1_S3_' filepath='libnurbs/internals/displaylist.h' line='70' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-78' is-artificial='yes'/>
           <parameter type-id='type-id-236'/>
-          <parameter type-id='type-id-22'/>
+          <parameter type-id='type-id-25'/>
           <parameter type-id='type-id-236'/>
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
         <function-decl name='endList' mangled-name='_ZN11DisplayList7endListEv' filepath='libnurbs/internals/displaylist.h' line='71' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-78' is-artificial='yes'/>
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
     </class-decl>
@@ -6712,8 +6712,8 @@
     <pointer-type-def type-id='type-id-242' size-in-bits='64' id='type-id-239'/>
     <function-type size-in-bits='64' id='type-id-242'>
       <parameter type-id='type-id-79' is-artificial='yes'/>
-      <parameter type-id='type-id-22'/>
-      <return type-id='type-id-11'/>
+      <parameter type-id='type-id-25'/>
+      <return type-id='type-id-12'/>
     </function-type>
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='libnurbs/internals/flist.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-T0fsxk/Mesa-8.0.5/src/glu/sgi' language='LANG_C_plus_plus'>
@@ -6734,7 +6734,7 @@
             <var-decl name='right' type-id='type-id-207' visibility='default' filepath='libnurbs/internals/hull.h' line='58' column='1'/>
           </data-member>
           <data-member access='public' layout-offset-in-bits='192'>
-            <var-decl name='index' type-id='type-id-12' visibility='default' filepath='libnurbs/internals/hull.h' line='59' column='1'/>
+            <var-decl name='index' type-id='type-id-15' visibility='default' filepath='libnurbs/internals/hull.h' line='59' column='1'/>
           </data-member>
         </class-decl>
       </member-type>
@@ -6753,23 +6753,23 @@
       <member-function access='private' constructor='yes'>
         <function-decl name='Hull' filepath='libnurbs/internals/hull.cc' line='51' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-246' is-artificial='yes'/>
-          <parameter type-id='type-id-10' is-artificial='yes'/>
+          <parameter type-id='type-id-11' is-artificial='yes'/>
           <parameter type-id='type-id-185' is-artificial='yes'/>
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private' destructor='yes'>
         <function-decl name='~Hull' filepath='libnurbs/internals/hull.cc' line='54' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-246' is-artificial='yes'/>
-          <parameter type-id='type-id-10' is-artificial='yes'/>
+          <parameter type-id='type-id-11' is-artificial='yes'/>
           <parameter type-id='type-id-185' is-artificial='yes'/>
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
         <function-decl name='init' mangled-name='_ZN4Hull4initEv' filepath='libnurbs/internals/hull.cc' line='63' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-246' is-artificial='yes'/>
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -6815,72 +6815,72 @@
         <function-decl name='Maplist' filepath='libnurbs/internals/maplist.h' line='48' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-248' is-artificial='yes'/>
           <parameter type-id='type-id-167'/>
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
         <function-decl name='define' mangled-name='_ZN7Maplist6defineElii' filepath='libnurbs/internals/maplist.h' line='49' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-248' is-artificial='yes'/>
-          <parameter type-id='type-id-12'/>
-          <parameter type-id='type-id-10'/>
-          <parameter type-id='type-id-10'/>
-          <return type-id='type-id-11'/>
+          <parameter type-id='type-id-15'/>
+          <parameter type-id='type-id-11'/>
+          <parameter type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
         <function-decl name='undefine' mangled-name='_ZN7Maplist8undefineEl' filepath='libnurbs/internals/maplist.h' line='50' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-248' is-artificial='yes'/>
-          <parameter type-id='type-id-12'/>
-          <return type-id='type-id-11'/>
+          <parameter type-id='type-id-15'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
         <function-decl name='isMap' mangled-name='_ZN7Maplist5isMapEl' filepath='libnurbs/internals/maplist.h' line='51' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-248' is-artificial='yes'/>
-          <parameter type-id='type-id-12'/>
-          <return type-id='type-id-10'/>
+          <parameter type-id='type-id-15'/>
+          <return type-id='type-id-11'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
         <function-decl name='initialize' mangled-name='_ZN7Maplist10initializeEv' filepath='libnurbs/internals/maplist.h' line='53' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-248' is-artificial='yes'/>
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
         <function-decl name='find' mangled-name='_ZN7Maplist4findEl' filepath='libnurbs/internals/maplist.h' line='54' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-248' is-artificial='yes'/>
-          <parameter type-id='type-id-12'/>
+          <parameter type-id='type-id-15'/>
           <return type-id='type-id-163'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
         <function-decl name='locate' mangled-name='_ZN7Maplist6locateEl' filepath='libnurbs/internals/maplist.h' line='55' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-248' is-artificial='yes'/>
-          <parameter type-id='type-id-12'/>
+          <parameter type-id='type-id-15'/>
           <return type-id='type-id-163'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
         <function-decl name='add' mangled-name='_ZN7Maplist3addElii' filepath='libnurbs/internals/maplist.h' line='63' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-248' is-artificial='yes'/>
-          <parameter type-id='type-id-12'/>
-          <parameter type-id='type-id-10'/>
-          <parameter type-id='type-id-10'/>
-          <return type-id='type-id-11'/>
+          <parameter type-id='type-id-15'/>
+          <parameter type-id='type-id-11'/>
+          <parameter type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
         <function-decl name='remove' mangled-name='_ZN7Maplist6removeEP7Mapdesc' filepath='libnurbs/internals/maplist.h' line='64' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-248' is-artificial='yes'/>
           <parameter type-id='type-id-163'/>
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
         <function-decl name='freeMaps' mangled-name='_ZN7Maplist8freeMapsEv' filepath='libnurbs/internals/maplist.h' line='65' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-248' is-artificial='yes'/>
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
     </class-decl>
@@ -6913,167 +6913,167 @@
         <var-decl name='last' type-id='type-id-249' visibility='default' filepath='libnurbs/internals/mesher.h' line='61' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='5056'>
-        <var-decl name='itop' type-id='type-id-10' visibility='default' filepath='libnurbs/internals/mesher.h' line='62' column='1'/>
+        <var-decl name='itop' type-id='type-id-11' visibility='default' filepath='libnurbs/internals/mesher.h' line='62' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='5088'>
-        <var-decl name='lastedge' type-id='type-id-10' visibility='default' filepath='libnurbs/internals/mesher.h' line='63' column='1'/>
+        <var-decl name='lastedge' type-id='type-id-11' visibility='default' filepath='libnurbs/internals/mesher.h' line='63' column='1'/>
       </data-member>
       <member-function access='private' constructor='yes'>
         <function-decl name='Mesher' filepath='libnurbs/internals/mesher.cc' line='55' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-252' is-artificial='yes'/>
-          <parameter type-id='type-id-10' is-artificial='yes'/>
+          <parameter type-id='type-id-11' is-artificial='yes'/>
           <parameter type-id='type-id-185' is-artificial='yes'/>
           <parameter type-id='type-id-167'/>
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private' destructor='yes'>
         <function-decl name='~Mesher' filepath='libnurbs/internals/mesher.cc' line='67' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-252' is-artificial='yes'/>
-          <parameter type-id='type-id-10' is-artificial='yes'/>
+          <parameter type-id='type-id-11' is-artificial='yes'/>
           <parameter type-id='type-id-185' is-artificial='yes'/>
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
         <function-decl name='init' mangled-name='_ZN6Mesher4initEj' filepath='libnurbs/internals/mesher.cc' line='73' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-252' is-artificial='yes'/>
           <parameter type-id='type-id-230'/>
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
         <function-decl name='mesh' mangled-name='_ZN6Mesher4meshEv' filepath='libnurbs/internals/mesher.cc' line='141' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-252' is-artificial='yes'/>
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
         <function-decl name='openMesh' mangled-name='_ZN6Mesher8openMeshEv' filepath='libnurbs/internals/mesher.cc' line='96' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-252' is-artificial='yes'/>
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
         <function-decl name='swapMesh' mangled-name='_ZN6Mesher8swapMeshEv' filepath='libnurbs/internals/mesher.cc' line='108' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-252' is-artificial='yes'/>
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
         <function-decl name='closeMesh' mangled-name='_ZN6Mesher9closeMeshEv' filepath='libnurbs/internals/mesher.cc' line='102' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-252' is-artificial='yes'/>
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
         <function-decl name='isCcw' mangled-name='_ZN6Mesher5isCcwEi' filepath='libnurbs/internals/mesher.cc' line='226' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-252' is-artificial='yes'/>
-          <parameter type-id='type-id-10'/>
-          <return type-id='type-id-10'/>
+          <parameter type-id='type-id-11'/>
+          <return type-id='type-id-11'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
         <function-decl name='isCw' mangled-name='_ZN6Mesher4isCwEi' filepath='libnurbs/internals/mesher.cc' line='233' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-252' is-artificial='yes'/>
-          <parameter type-id='type-id-10'/>
-          <return type-id='type-id-10'/>
+          <parameter type-id='type-id-11'/>
+          <return type-id='type-id-11'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
         <function-decl name='clearStack' mangled-name='_ZN6Mesher10clearStackEv' filepath='libnurbs/internals/mesher.cc' line='114' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-252' is-artificial='yes'/>
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
         <function-decl name='push' mangled-name='_ZN6Mesher4pushEP14GridTrimVertex' filepath='libnurbs/internals/mesher.cc' line='84' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-252' is-artificial='yes'/>
           <parameter type-id='type-id-193'/>
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
         <function-decl name='pop' mangled-name='_ZN6Mesher3popEl' filepath='libnurbs/internals/mesher.cc' line='91' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-252' is-artificial='yes'/>
-          <parameter type-id='type-id-12'/>
-          <return type-id='type-id-11'/>
+          <parameter type-id='type-id-15'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
         <function-decl name='move' mangled-name='_ZN6Mesher4moveEii' filepath='libnurbs/internals/mesher.cc' line='252' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-252' is-artificial='yes'/>
-          <parameter type-id='type-id-10'/>
-          <parameter type-id='type-id-10'/>
-          <return type-id='type-id-11'/>
+          <parameter type-id='type-id-11'/>
+          <parameter type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
         <function-decl name='equal' mangled-name='_ZN6Mesher5equalEii' filepath='libnurbs/internals/mesher.cc' line='240' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-252' is-artificial='yes'/>
-          <parameter type-id='type-id-10'/>
-          <parameter type-id='type-id-10'/>
-          <return type-id='type-id-10'/>
+          <parameter type-id='type-id-11'/>
+          <parameter type-id='type-id-11'/>
+          <return type-id='type-id-11'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
         <function-decl name='copy' mangled-name='_ZN6Mesher4copyEii' filepath='libnurbs/internals/mesher.cc' line='246' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-252' is-artificial='yes'/>
-          <parameter type-id='type-id-10'/>
-          <parameter type-id='type-id-10'/>
-          <return type-id='type-id-11'/>
+          <parameter type-id='type-id-11'/>
+          <parameter type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
         <function-decl name='output' mangled-name='_ZN6Mesher6outputEi' filepath='libnurbs/internals/mesher.cc' line='258' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-252' is-artificial='yes'/>
-          <parameter type-id='type-id-10'/>
-          <return type-id='type-id-11'/>
+          <parameter type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
         <function-decl name='addUpper' mangled-name='_ZN6Mesher8addUpperEv' filepath='libnurbs/internals/mesher.cc' line='341' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-252' is-artificial='yes'/>
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
         <function-decl name='addLower' mangled-name='_ZN6Mesher8addLowerEv' filepath='libnurbs/internals/mesher.cc' line='415' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-252' is-artificial='yes'/>
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
         <function-decl name='addLast' mangled-name='_ZN6Mesher7addLastEv' filepath='libnurbs/internals/mesher.cc' line='277' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-252' is-artificial='yes'/>
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
         <function-decl name='finishUpper' mangled-name='_ZN6Mesher11finishUpperEP14GridTrimVertex' filepath='libnurbs/internals/mesher.cc' line='131' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-252' is-artificial='yes'/>
           <parameter type-id='type-id-193'/>
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
         <function-decl name='finishLower' mangled-name='_ZN6Mesher11finishLowerEP14GridTrimVertex' filepath='libnurbs/internals/mesher.cc' line='121' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-252' is-artificial='yes'/>
           <parameter type-id='type-id-193'/>
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
     </class-decl>
     <pointer-type-def type-id='type-id-193' size-in-bits='64' id='type-id-251'/>
     <pointer-type-def type-id='type-id-183' size-in-bits='64' id='type-id-252'/>
-    <qualified-type-def type-id='type-id-30' const='yes' id='type-id-250'/>
+    <qualified-type-def type-id='type-id-33' const='yes' id='type-id-250'/>
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='libnurbs/internals/monoTriangulationBackend.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-T0fsxk/Mesa-8.0.5/src/glu/sgi' language='LANG_C_plus_plus'>
     <array-type-def dimensions='1' type-id='type-id-253' size-in-bits='64' id='type-id-254'>
       <subrange length='2' type-id='type-id-3' id='type-id-88'/>
     </array-type-def>
-    <typedef-decl name='Real' type-id='type-id-30' filepath='libnurbs/nurbtess/definitions.h' line='36' column='1' id='type-id-253'/>
-    <typedef-decl name='Int' type-id='type-id-10' filepath='libnurbs/nurbtess/definitions.h' line='37' column='1' id='type-id-255'/>
+    <typedef-decl name='Real' type-id='type-id-33' filepath='libnurbs/nurbtess/definitions.h' line='36' column='1' id='type-id-253'/>
+    <typedef-decl name='Int' type-id='type-id-11' filepath='libnurbs/nurbtess/definitions.h' line='37' column='1' id='type-id-255'/>
     <class-decl name='vertexArray' size-in-bits='128' visibility='default' filepath='libnurbs/nurbtess/monoTriangulation.h' line='77' column='1' id='type-id-256'>
       <data-member access='private' layout-offset-in-bits='0'>
         <var-decl name='array' type-id='type-id-257' visibility='default' filepath='libnurbs/nurbtess/monoTriangulation.h' line='78' column='1'/>
@@ -7088,7 +7088,7 @@
         <function-decl name='vertexArray' filepath='libnurbs/nurbtess/monoTriangulation.h' line='82' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-258' is-artificial='yes'/>
           <parameter type-id='type-id-255'/>
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private' constructor='yes'>
@@ -7096,21 +7096,21 @@
           <parameter type-id='type-id-258' is-artificial='yes'/>
           <parameter type-id='type-id-259'/>
           <parameter type-id='type-id-255'/>
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private' destructor='yes'>
         <function-decl name='~vertexArray' filepath='libnurbs/nurbtess/monoTriangulation.h' line='84' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-258' is-artificial='yes'/>
-          <parameter type-id='type-id-10' is-artificial='yes'/>
-          <return type-id='type-id-11'/>
+          <parameter type-id='type-id-11' is-artificial='yes'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
         <function-decl name='appendVertex' mangled-name='_ZN11vertexArray12appendVertexEPf' filepath='libnurbs/nurbtess/monoTriangulation.h' line='85' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-258' is-artificial='yes'/>
           <parameter type-id='type-id-260'/>
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -7195,7 +7195,7 @@
       <member-function access='private'>
         <function-decl name='print' mangled-name='_ZN11vertexArray5printEv' filepath='libnurbs/nurbtess/monoTriangulation.h' line='97' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-258' is-artificial='yes'/>
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
     </class-decl>
@@ -7217,14 +7217,14 @@
           <parameter type-id='type-id-263' is-artificial='yes'/>
           <parameter type-id='type-id-255'/>
           <parameter type-id='type-id-255'/>
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private' destructor='yes'>
         <function-decl name='~reflexChain' filepath='libnurbs/nurbtess/monoTriangulation.h' line='56' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-263' is-artificial='yes'/>
-          <parameter type-id='type-id-10' is-artificial='yes'/>
-          <return type-id='type-id-11'/>
+          <parameter type-id='type-id-11' is-artificial='yes'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -7232,14 +7232,14 @@
           <parameter type-id='type-id-263' is-artificial='yes'/>
           <parameter type-id='type-id-253'/>
           <parameter type-id='type-id-253'/>
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
         <function-decl name='insert' mangled-name='_ZN11reflexChain6insertEPf' filepath='libnurbs/nurbtess/monoTriangulation.h' line='59' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-263' is-artificial='yes'/>
           <parameter type-id='type-id-260'/>
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -7247,7 +7247,7 @@
           <parameter type-id='type-id-263' is-artificial='yes'/>
           <parameter type-id='type-id-260'/>
           <parameter type-id='type-id-186'/>
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -7255,7 +7255,7 @@
           <parameter type-id='type-id-263' is-artificial='yes'/>
           <parameter type-id='type-id-260'/>
           <parameter type-id='type-id-186'/>
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -7263,7 +7263,7 @@
           <parameter type-id='type-id-263' is-artificial='yes'/>
           <parameter type-id='type-id-260'/>
           <parameter type-id='type-id-192'/>
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -7271,13 +7271,13 @@
           <parameter type-id='type-id-263' is-artificial='yes'/>
           <parameter type-id='type-id-260'/>
           <parameter type-id='type-id-192'/>
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
         <function-decl name='print' mangled-name='_ZN11reflexChain5printEv' filepath='libnurbs/nurbtess/monoTriangulation.h' line='67' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-263' is-artificial='yes'/>
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
     </class-decl>
@@ -7312,14 +7312,14 @@
           <parameter type-id='type-id-186' is-artificial='yes'/>
           <parameter type-id='type-id-255'/>
           <parameter type-id='type-id-255'/>
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private' destructor='yes'>
         <function-decl name='~primStream' filepath='libnurbs/nurbtess/primitiveStream.h' line='63' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-186' is-artificial='yes'/>
-          <parameter type-id='type-id-10' is-artificial='yes'/>
-          <return type-id='type-id-11'/>
+          <parameter type-id='type-id-11' is-artificial='yes'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -7351,7 +7351,7 @@
       <member-function access='private'>
         <function-decl name='begin' mangled-name='_ZN10primStream5beginEv' filepath='libnurbs/nurbtess/primitiveStream.h' line='82' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-186' is-artificial='yes'/>
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -7359,21 +7359,21 @@
           <parameter type-id='type-id-186' is-artificial='yes'/>
           <parameter type-id='type-id-253'/>
           <parameter type-id='type-id-253'/>
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
         <function-decl name='insert' mangled-name='_ZN10primStream6insertEPf' filepath='libnurbs/nurbtess/primitiveStream.h' line='84' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-186' is-artificial='yes'/>
           <parameter type-id='type-id-260'/>
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
         <function-decl name='end' mangled-name='_ZN10primStream3endEi' filepath='libnurbs/nurbtess/primitiveStream.h' line='85' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-186' is-artificial='yes'/>
           <parameter type-id='type-id-255'/>
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -7388,19 +7388,19 @@
           <parameter type-id='type-id-260'/>
           <parameter type-id='type-id-260'/>
           <parameter type-id='type-id-260'/>
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
         <function-decl name='print' mangled-name='_ZN10primStream5printEv' filepath='libnurbs/nurbtess/primitiveStream.h' line='97' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-186' is-artificial='yes'/>
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
         <function-decl name='draw' mangled-name='_ZN10primStream4drawEv' filepath='libnurbs/nurbtess/primitiveStream.h' line='98' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-186' is-artificial='yes'/>
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
     </class-decl>
@@ -7422,16 +7422,16 @@
         <var-decl name='pts' type-id='type-id-119' visibility='default' filepath='libnurbs/internals/reader.h' line='85' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
-        <var-decl name='npts' type-id='type-id-10' visibility='default' filepath='libnurbs/internals/reader.h' line='86' column='1'/>
+        <var-decl name='npts' type-id='type-id-11' visibility='default' filepath='libnurbs/internals/reader.h' line='86' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
         <var-decl name='next' type-id='type-id-84' visibility='default' filepath='libnurbs/internals/reader.h' line='87' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='192'>
-        <var-decl name='used' type-id='type-id-10' visibility='default' filepath='libnurbs/internals/reader.h' line='88' column='1'/>
+        <var-decl name='used' type-id='type-id-11' visibility='default' filepath='libnurbs/internals/reader.h' line='88' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='224'>
-        <var-decl name='save' type-id='type-id-10' visibility='default' filepath='libnurbs/internals/reader.h' line='89' column='1'/>
+        <var-decl name='save' type-id='type-id-11' visibility='default' filepath='libnurbs/internals/reader.h' line='89' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='256'>
         <var-decl name='owner' type-id='type-id-77' visibility='default' filepath='libnurbs/internals/reader.h' line='90' column='1'/>
@@ -7439,44 +7439,44 @@
       <member-function access='public' constructor='yes'>
         <function-decl name='O_pwlcurve' filepath='libnurbs/internals/reader.h' line='91' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-84' is-artificial='yes'/>
-          <parameter type-id='type-id-12'/>
-          <parameter type-id='type-id-12'/>
+          <parameter type-id='type-id-15'/>
+          <parameter type-id='type-id-15'/>
           <parameter type-id='type-id-59'/>
-          <parameter type-id='type-id-12'/>
+          <parameter type-id='type-id-15'/>
           <parameter type-id='type-id-119'/>
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
     </class-decl>
     <class-decl name='Property' size-in-bits='192' is-struct='yes' visibility='default' filepath='libnurbs/internals/reader.h' line='120' column='1' id='type-id-268'>
       <base-class access='public' layout-offset-in-bits='0' type-id='type-id-111'/>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='type' type-id='type-id-12' visibility='default' filepath='libnurbs/internals/reader.h' line='121' column='1'/>
+        <var-decl name='type' type-id='type-id-15' visibility='default' filepath='libnurbs/internals/reader.h' line='121' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
-        <var-decl name='tag' type-id='type-id-12' visibility='default' filepath='libnurbs/internals/reader.h' line='122' column='1'/>
+        <var-decl name='tag' type-id='type-id-15' visibility='default' filepath='libnurbs/internals/reader.h' line='122' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
         <var-decl name='value' type-id='type-id-1' visibility='default' filepath='libnurbs/internals/reader.h' line='123' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='160'>
-        <var-decl name='save' type-id='type-id-10' visibility='default' filepath='libnurbs/internals/reader.h' line='124' column='1'/>
+        <var-decl name='save' type-id='type-id-11' visibility='default' filepath='libnurbs/internals/reader.h' line='124' column='1'/>
       </data-member>
       <member-function access='public' constructor='yes'>
         <function-decl name='Property' filepath='libnurbs/internals/reader.h' line='125' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-87' is-artificial='yes'/>
-          <parameter type-id='type-id-12'/>
-          <parameter type-id='type-id-12'/>
-          <parameter type-id='type-id-30'/>
-          <return type-id='type-id-11'/>
+          <parameter type-id='type-id-15'/>
+          <parameter type-id='type-id-15'/>
+          <parameter type-id='type-id-33'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public' constructor='yes'>
         <function-decl name='Property' filepath='libnurbs/internals/reader.h' line='127' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-87' is-artificial='yes'/>
-          <parameter type-id='type-id-12'/>
-          <parameter type-id='type-id-30'/>
-          <return type-id='type-id-11'/>
+          <parameter type-id='type-id-15'/>
+          <parameter type-id='type-id-33'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
     </class-decl>
@@ -7486,7 +7486,7 @@
         <var-decl name='bezier_patches' type-id='type-id-139' visibility='default' filepath='libnurbs/internals/reader.h' line='102' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
-        <var-decl name='type' type-id='type-id-12' visibility='default' filepath='libnurbs/internals/reader.h' line='103' column='1'/>
+        <var-decl name='type' type-id='type-id-15' visibility='default' filepath='libnurbs/internals/reader.h' line='103' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
         <var-decl name='owner' type-id='type-id-75' visibility='default' filepath='libnurbs/internals/reader.h' line='104' column='1'/>
@@ -7495,16 +7495,16 @@
         <var-decl name='next' type-id='type-id-86' visibility='default' filepath='libnurbs/internals/reader.h' line='105' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='256'>
-        <var-decl name='save' type-id='type-id-10' visibility='default' filepath='libnurbs/internals/reader.h' line='106' column='1'/>
+        <var-decl name='save' type-id='type-id-11' visibility='default' filepath='libnurbs/internals/reader.h' line='106' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='288'>
-        <var-decl name='used' type-id='type-id-10' visibility='default' filepath='libnurbs/internals/reader.h' line='107' column='1'/>
+        <var-decl name='used' type-id='type-id-11' visibility='default' filepath='libnurbs/internals/reader.h' line='107' column='1'/>
       </data-member>
       <member-function access='public' constructor='yes'>
         <function-decl name='O_nurbssurface' filepath='libnurbs/internals/reader.h' line='108' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-86' is-artificial='yes'/>
-          <parameter type-id='type-id-12'/>
-          <return type-id='type-id-11'/>
+          <parameter type-id='type-id-15'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
     </class-decl>
@@ -7517,15 +7517,15 @@
         <var-decl name='o_trim' type-id='type-id-76' visibility='default' filepath='libnurbs/internals/reader.h' line='114' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
-        <var-decl name='save' type-id='type-id-10' visibility='default' filepath='libnurbs/internals/reader.h' line='115' column='1'/>
+        <var-decl name='save' type-id='type-id-11' visibility='default' filepath='libnurbs/internals/reader.h' line='115' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='192'>
-        <var-decl name='nuid' type-id='type-id-12' visibility='default' filepath='libnurbs/internals/reader.h' line='116' column='1'/>
+        <var-decl name='nuid' type-id='type-id-15' visibility='default' filepath='libnurbs/internals/reader.h' line='116' column='1'/>
       </data-member>
       <member-function access='public' constructor='yes'>
         <function-decl name='O_surface' filepath='libnurbs/internals/reader.h' line='117' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-75' is-artificial='yes'/>
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
     </class-decl>
@@ -7538,12 +7538,12 @@
         <var-decl name='next' type-id='type-id-76' visibility='default' filepath='libnurbs/internals/reader.h' line='96' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
-        <var-decl name='save' type-id='type-id-10' visibility='default' filepath='libnurbs/internals/reader.h' line='97' column='1'/>
+        <var-decl name='save' type-id='type-id-11' visibility='default' filepath='libnurbs/internals/reader.h' line='97' column='1'/>
       </data-member>
       <member-function access='public' constructor='yes'>
         <function-decl name='O_trim' filepath='libnurbs/internals/reader.h' line='98' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-76' is-artificial='yes'/>
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
     </class-decl>
@@ -7572,18 +7572,18 @@
         <var-decl name='owner' type-id='type-id-75' visibility='default' filepath='libnurbs/internals/reader.h' line='62' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='256'>
-        <var-decl name='used' type-id='type-id-10' visibility='default' filepath='libnurbs/internals/reader.h' line='63' column='1'/>
+        <var-decl name='used' type-id='type-id-11' visibility='default' filepath='libnurbs/internals/reader.h' line='63' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='288'>
-        <var-decl name='save' type-id='type-id-10' visibility='default' filepath='libnurbs/internals/reader.h' line='64' column='1'/>
+        <var-decl name='save' type-id='type-id-11' visibility='default' filepath='libnurbs/internals/reader.h' line='64' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='320'>
-        <var-decl name='nuid' type-id='type-id-12' visibility='default' filepath='libnurbs/internals/reader.h' line='65' column='1'/>
+        <var-decl name='nuid' type-id='type-id-15' visibility='default' filepath='libnurbs/internals/reader.h' line='65' column='1'/>
       </data-member>
       <member-function access='public' constructor='yes'>
         <function-decl name='O_curve' filepath='libnurbs/internals/reader.h' line='66' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-77' is-artificial='yes'/>
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
     </class-decl>
@@ -7593,22 +7593,22 @@
         <var-decl name='bezier_curves' type-id='type-id-139' visibility='default' filepath='libnurbs/internals/reader.h' line='71' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
-        <var-decl name='type' type-id='type-id-12' visibility='default' filepath='libnurbs/internals/reader.h' line='72' column='1'/>
+        <var-decl name='type' type-id='type-id-15' visibility='default' filepath='libnurbs/internals/reader.h' line='72' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
         <var-decl name='tesselation' type-id='type-id-1' visibility='default' filepath='libnurbs/internals/reader.h' line='73' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='160'>
-        <var-decl name='method' type-id='type-id-10' visibility='default' filepath='libnurbs/internals/reader.h' line='74' column='1'/>
+        <var-decl name='method' type-id='type-id-11' visibility='default' filepath='libnurbs/internals/reader.h' line='74' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='192'>
         <var-decl name='next' type-id='type-id-85' visibility='default' filepath='libnurbs/internals/reader.h' line='75' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='256'>
-        <var-decl name='used' type-id='type-id-10' visibility='default' filepath='libnurbs/internals/reader.h' line='76' column='1'/>
+        <var-decl name='used' type-id='type-id-11' visibility='default' filepath='libnurbs/internals/reader.h' line='76' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='288'>
-        <var-decl name='save' type-id='type-id-10' visibility='default' filepath='libnurbs/internals/reader.h' line='77' column='1'/>
+        <var-decl name='save' type-id='type-id-11' visibility='default' filepath='libnurbs/internals/reader.h' line='77' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='320'>
         <var-decl name='owner' type-id='type-id-77' visibility='default' filepath='libnurbs/internals/reader.h' line='78' column='1'/>
@@ -7616,13 +7616,13 @@
       <member-function access='public' constructor='yes'>
         <function-decl name='O_nurbscurve' filepath='libnurbs/internals/reader.h' line='79' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-85' is-artificial='yes'/>
-          <parameter type-id='type-id-12'/>
-          <return type-id='type-id-11'/>
+          <parameter type-id='type-id-15'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
     </class-decl>
     <enum-decl name='Curvetype' filepath='libnurbs/internals/reader.h' line='42' column='1' id='type-id-274'>
-      <underlying-type type-id='type-id-38'/>
+      <underlying-type type-id='type-id-9'/>
       <enumerator name='ct_nurbscurve' value='0'/>
       <enumerator name='ct_pwlcurve' value='1'/>
       <enumerator name='ct_none' value='2'/>
@@ -7666,7 +7666,7 @@
         <var-decl name='minstepsize' type-id='type-id-1' visibility='default' filepath='libnurbs/internals/patch.h' line='50' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='224'>
-        <var-decl name='needsSubdivision' type-id='type-id-10' visibility='default' filepath='libnurbs/internals/patch.h' line='51' column='1'/>
+        <var-decl name='needsSubdivision' type-id='type-id-11' visibility='default' filepath='libnurbs/internals/patch.h' line='51' column='1'/>
       </data-member>
     </class-decl>
     <class-decl name='Patch' size-in-bits='277696' visibility='default' filepath='libnurbs/internals/patch.h' line='62' column='1' id='type-id-282'>
@@ -7677,13 +7677,13 @@
         <var-decl name='next' type-id='type-id-179' visibility='default' filepath='libnurbs/internals/patch.h' line='83' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='128'>
-        <var-decl name='cullval' type-id='type-id-10' visibility='default' filepath='libnurbs/internals/patch.h' line='84' column='1'/>
+        <var-decl name='cullval' type-id='type-id-11' visibility='default' filepath='libnurbs/internals/patch.h' line='84' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='160'>
-        <var-decl name='notInBbox' type-id='type-id-10' visibility='default' filepath='libnurbs/internals/patch.h' line='85' column='1'/>
+        <var-decl name='notInBbox' type-id='type-id-11' visibility='default' filepath='libnurbs/internals/patch.h' line='85' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='192'>
-        <var-decl name='needsSampling' type-id='type-id-10' visibility='default' filepath='libnurbs/internals/patch.h' line='86' column='1'/>
+        <var-decl name='needsSampling' type-id='type-id-11' visibility='default' filepath='libnurbs/internals/patch.h' line='86' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='224'>
         <var-decl name='cpts' type-id='type-id-278' visibility='default' filepath='libnurbs/internals/patch.h' line='87' column='1'/>
@@ -7704,110 +7704,110 @@
         <function-decl name='Patch' filepath='libnurbs/internals/patch.h' line='67' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-179' is-artificial='yes'/>
           <parameter type-id='type-id-139'/>
-          <parameter type-id='type-id-13'/>
-          <parameter type-id='type-id-13'/>
+          <parameter type-id='type-id-16'/>
+          <parameter type-id='type-id-16'/>
           <parameter type-id='type-id-179'/>
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private' constructor='yes'>
         <function-decl name='Patch' filepath='libnurbs/internals/patch.h' line='68' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-179' is-artificial='yes'/>
           <parameter type-id='type-id-283'/>
-          <parameter type-id='type-id-10'/>
+          <parameter type-id='type-id-11'/>
           <parameter type-id='type-id-1'/>
           <parameter type-id='type-id-179'/>
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
         <function-decl name='bbox' mangled-name='_ZN5Patch4bboxEv' filepath='libnurbs/internals/patch.h' line='69' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-179' is-artificial='yes'/>
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
         <function-decl name='clamp' mangled-name='_ZN5Patch5clampEv' filepath='libnurbs/internals/patch.h' line='70' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-179' is-artificial='yes'/>
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
         <function-decl name='getstepsize' mangled-name='_ZN5Patch11getstepsizeEv' filepath='libnurbs/internals/patch.h' line='71' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-179' is-artificial='yes'/>
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
         <function-decl name='cullCheck' mangled-name='_ZN5Patch9cullCheckEv' filepath='libnurbs/internals/patch.h' line='72' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-179' is-artificial='yes'/>
-          <return type-id='type-id-10'/>
+          <return type-id='type-id-11'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
         <function-decl name='needsSubdivision' mangled-name='_ZN5Patch16needsSubdivisionEi' filepath='libnurbs/internals/patch.h' line='73' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-179' is-artificial='yes'/>
-          <parameter type-id='type-id-10'/>
-          <return type-id='type-id-10'/>
+          <parameter type-id='type-id-11'/>
+          <return type-id='type-id-11'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
         <function-decl name='needsSamplingSubdivision' mangled-name='_ZN5Patch24needsSamplingSubdivisionEv' filepath='libnurbs/internals/patch.h' line='74' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-179' is-artificial='yes'/>
-          <return type-id='type-id-10'/>
+          <return type-id='type-id-11'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
         <function-decl name='needsNonSamplingSubdivision' mangled-name='_ZN5Patch27needsNonSamplingSubdivisionEv' filepath='libnurbs/internals/patch.h' line='75' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-179' is-artificial='yes'/>
-          <return type-id='type-id-10'/>
+          <return type-id='type-id-11'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
         <function-decl name='get_uorder' mangled-name='_ZN5Patch10get_uorderEv' filepath='libnurbs/internals/patch.h' line='77' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-179' is-artificial='yes'/>
-          <return type-id='type-id-10'/>
+          <return type-id='type-id-11'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
         <function-decl name='get_vorder' mangled-name='_ZN5Patch10get_vorderEv' filepath='libnurbs/internals/patch.h' line='78' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-179' is-artificial='yes'/>
-          <return type-id='type-id-10'/>
+          <return type-id='type-id-11'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
         <function-decl name='checkBboxConstraint' mangled-name='_ZN5Patch19checkBboxConstraintEv' filepath='libnurbs/internals/patch.h' line='91' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-179' is-artificial='yes'/>
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
     </class-decl>
     <class-decl name='Patchspec' size-in-bits='320' is-struct='yes' visibility='default' filepath='libnurbs/internals/patch.h' line='54' column='1' id='type-id-276'>
       <base-class access='public' layout-offset-in-bits='0' type-id='type-id-281'/>
       <data-member access='public' layout-offset-in-bits='256'>
-        <var-decl name='order' type-id='type-id-10' visibility='default' filepath='libnurbs/internals/patch.h' line='55' column='1'/>
+        <var-decl name='order' type-id='type-id-11' visibility='default' filepath='libnurbs/internals/patch.h' line='55' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='288'>
-        <var-decl name='stride' type-id='type-id-10' visibility='default' filepath='libnurbs/internals/patch.h' line='56' column='1'/>
+        <var-decl name='stride' type-id='type-id-11' visibility='default' filepath='libnurbs/internals/patch.h' line='56' column='1'/>
       </data-member>
       <member-function access='public'>
         <function-decl name='clamp' mangled-name='_ZN9Patchspec5clampEf' filepath='libnurbs/internals/patch.h' line='57' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-284' is-artificial='yes'/>
           <parameter type-id='type-id-1'/>
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
         <function-decl name='getstepsize' mangled-name='_ZN9Patchspec11getstepsizeEf' filepath='libnurbs/internals/patch.h' line='58' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-284' is-artificial='yes'/>
           <parameter type-id='type-id-1'/>
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
         <function-decl name='singleStep' mangled-name='_ZN9Patchspec10singleStepEv' filepath='libnurbs/internals/patch.h' line='59' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-284' is-artificial='yes'/>
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
     </class-decl>
@@ -7844,14 +7844,14 @@
           <parameter type-id='type-id-287'/>
           <parameter type-id='type-id-255'/>
           <parameter type-id='type-id-255'/>
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private' destructor='yes'>
         <function-decl name='~rectBlock' filepath='libnurbs/nurbtess/rectBlock.h' line='47' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-286' is-artificial='yes'/>
-          <parameter type-id='type-id-10' is-artificial='yes'/>
-          <return type-id='type-id-11'/>
+          <parameter type-id='type-id-11' is-artificial='yes'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -7887,7 +7887,7 @@
       <member-function access='private'>
         <function-decl name='print' mangled-name='_ZN9rectBlock5printEv' filepath='libnurbs/nurbtess/rectBlock.h' line='56' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-286' is-artificial='yes'/>
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -7895,7 +7895,7 @@
           <parameter type-id='type-id-286' is-artificial='yes'/>
           <parameter type-id='type-id-260'/>
           <parameter type-id='type-id-260'/>
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
     </class-decl>
@@ -7936,7 +7936,7 @@
           <parameter type-id='type-id-253'/>
           <parameter type-id='type-id-253'/>
           <parameter type-id='type-id-253'/>
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private' constructor='yes'>
@@ -7946,20 +7946,20 @@
           <parameter type-id='type-id-260'/>
           <parameter type-id='type-id-255'/>
           <parameter type-id='type-id-260'/>
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private' destructor='yes'>
         <function-decl name='~gridWrap' filepath='libnurbs/nurbtess/gridWrap.h' line='68' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-188' is-artificial='yes'/>
-          <parameter type-id='type-id-10' is-artificial='yes'/>
-          <return type-id='type-id-11'/>
+          <parameter type-id='type-id-11' is-artificial='yes'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
         <function-decl name='print' mangled-name='_ZN8gridWrap5printEv' filepath='libnurbs/nurbtess/gridWrap.h' line='70' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-188' is-artificial='yes'/>
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -8032,13 +8032,13 @@
           <parameter type-id='type-id-255'/>
           <parameter type-id='type-id-260'/>
           <parameter type-id='type-id-186'/>
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
         <function-decl name='draw' mangled-name='_ZN8gridWrap4drawEv' filepath='libnurbs/nurbtess/gridWrap.h' line='91' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-188' is-artificial='yes'/>
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -8062,14 +8062,14 @@
         <function-decl name='rectBlockArray' filepath='libnurbs/nurbtess/rectBlock.h' line='66' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-187' is-artificial='yes'/>
           <parameter type-id='type-id-255'/>
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private' destructor='yes'>
         <function-decl name='~rectBlockArray' filepath='libnurbs/nurbtess/rectBlock.h' line='67' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-187' is-artificial='yes'/>
-          <parameter type-id='type-id-10' is-artificial='yes'/>
-          <return type-id='type-id-11'/>
+          <parameter type-id='type-id-11' is-artificial='yes'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -8089,7 +8089,7 @@
         <function-decl name='insert' mangled-name='_ZN14rectBlockArray6insertEP9rectBlock' filepath='libnurbs/nurbtess/rectBlock.h' line='71' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-187' is-artificial='yes'/>
           <parameter type-id='type-id-286'/>
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -8101,7 +8101,7 @@
       <member-function access='private'>
         <function-decl name='print' mangled-name='_ZN14rectBlockArray5printEv' filepath='libnurbs/nurbtess/rectBlock.h' line='75' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-187' is-artificial='yes'/>
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -8109,7 +8109,7 @@
           <parameter type-id='type-id-187' is-artificial='yes'/>
           <parameter type-id='type-id-260'/>
           <parameter type-id='type-id-260'/>
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
     </class-decl>
@@ -8140,14 +8140,14 @@
           <parameter type-id='type-id-255'/>
           <parameter type-id='type-id-266'/>
           <parameter type-id='type-id-266'/>
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private' destructor='yes'>
         <function-decl name='~gridBoundaryChain' filepath='libnurbs/nurbtess/gridWrap.h' line='110' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-287' is-artificial='yes'/>
-          <parameter type-id='type-id-10' is-artificial='yes'/>
-          <return type-id='type-id-11'/>
+          <parameter type-id='type-id-11' is-artificial='yes'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -8216,7 +8216,7 @@
           <parameter type-id='type-id-287' is-artificial='yes'/>
           <parameter type-id='type-id-255'/>
           <parameter type-id='type-id-186'/>
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -8224,7 +8224,7 @@
           <parameter type-id='type-id-287' is-artificial='yes'/>
           <parameter type-id='type-id-255'/>
           <parameter type-id='type-id-186'/>
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -8239,13 +8239,13 @@
       <member-function access='private'>
         <function-decl name='draw' mangled-name='_ZN17gridBoundaryChain4drawEv' filepath='libnurbs/nurbtess/gridWrap.h' line='133' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-287' is-artificial='yes'/>
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
         <function-decl name='drawInner' mangled-name='_ZN17gridBoundaryChain9drawInnerEv' filepath='libnurbs/nurbtess/gridWrap.h' line='134' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-287' is-artificial='yes'/>
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
     </class-decl>
@@ -8259,7 +8259,7 @@
   <abi-instr version='1.0' address-size='64' path='libnurbs/internals/tobezier.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-T0fsxk/Mesa-8.0.5/src/glu/sgi' language='LANG_C_plus_plus'>
     <class-decl name='Knotspec' size-in-bits='1152' is-struct='yes' visibility='default' filepath='libnurbs/internals/tobezier.cc' line='54' column='1' id='type-id-292'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='order' type-id='type-id-12' visibility='default' filepath='libnurbs/internals/tobezier.cc' line='55' column='1'/>
+        <var-decl name='order' type-id='type-id-15' visibility='default' filepath='libnurbs/internals/tobezier.cc' line='55' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
         <var-decl name='inkbegin' type-id='type-id-293' visibility='default' filepath='libnurbs/internals/tobezier.cc' line='56' column='1'/>
@@ -8295,28 +8295,28 @@
         <var-decl name='bend' type-id='type-id-294' visibility='default' filepath='libnurbs/internals/tobezier.cc' line='66' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='768'>
-        <var-decl name='ncoords' type-id='type-id-10' visibility='default' filepath='libnurbs/internals/tobezier.cc' line='67' column='1'/>
+        <var-decl name='ncoords' type-id='type-id-11' visibility='default' filepath='libnurbs/internals/tobezier.cc' line='67' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='800'>
-        <var-decl name='prestride' type-id='type-id-10' visibility='default' filepath='libnurbs/internals/tobezier.cc' line='68' column='1'/>
+        <var-decl name='prestride' type-id='type-id-11' visibility='default' filepath='libnurbs/internals/tobezier.cc' line='68' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='832'>
-        <var-decl name='poststride' type-id='type-id-10' visibility='default' filepath='libnurbs/internals/tobezier.cc' line='69' column='1'/>
+        <var-decl name='poststride' type-id='type-id-11' visibility='default' filepath='libnurbs/internals/tobezier.cc' line='69' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='864'>
-        <var-decl name='preoffset' type-id='type-id-10' visibility='default' filepath='libnurbs/internals/tobezier.cc' line='70' column='1'/>
+        <var-decl name='preoffset' type-id='type-id-11' visibility='default' filepath='libnurbs/internals/tobezier.cc' line='70' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='896'>
-        <var-decl name='postoffset' type-id='type-id-10' visibility='default' filepath='libnurbs/internals/tobezier.cc' line='71' column='1'/>
+        <var-decl name='postoffset' type-id='type-id-11' visibility='default' filepath='libnurbs/internals/tobezier.cc' line='71' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='928'>
-        <var-decl name='prewidth' type-id='type-id-10' visibility='default' filepath='libnurbs/internals/tobezier.cc' line='72' column='1'/>
+        <var-decl name='prewidth' type-id='type-id-11' visibility='default' filepath='libnurbs/internals/tobezier.cc' line='72' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='960'>
-        <var-decl name='postwidth' type-id='type-id-10' visibility='default' filepath='libnurbs/internals/tobezier.cc' line='73' column='1'/>
+        <var-decl name='postwidth' type-id='type-id-11' visibility='default' filepath='libnurbs/internals/tobezier.cc' line='73' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='992'>
-        <var-decl name='istransformed' type-id='type-id-10' visibility='default' filepath='libnurbs/internals/tobezier.cc' line='74' column='1'/>
+        <var-decl name='istransformed' type-id='type-id-11' visibility='default' filepath='libnurbs/internals/tobezier.cc' line='74' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1024'>
         <var-decl name='next' type-id='type-id-295' visibility='default' filepath='libnurbs/internals/tobezier.cc' line='75' column='1'/>
@@ -8327,113 +8327,113 @@
       <member-function access='public' constructor='yes'>
         <function-decl name='Knotspec' filepath='libnurbs/internals/tobezier.cc' line='78' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-295' is-artificial='yes'/>
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public' destructor='yes'>
         <function-decl name='~Knotspec' filepath='libnurbs/internals/tobezier.cc' line='79' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-295' is-artificial='yes'/>
-          <parameter type-id='type-id-10' is-artificial='yes'/>
-          <return type-id='type-id-11'/>
+          <parameter type-id='type-id-11' is-artificial='yes'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
         <function-decl name='factors' mangled-name='_ZN8Knotspec7factorsEv' filepath='libnurbs/internals/tobezier.cc' line='80' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-295' is-artificial='yes'/>
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
         <function-decl name='insert' mangled-name='_ZN8Knotspec6insertEPf' filepath='libnurbs/internals/tobezier.cc' line='81' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-295' is-artificial='yes'/>
-          <parameter type-id='type-id-13'/>
-          <return type-id='type-id-11'/>
+          <parameter type-id='type-id-16'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
         <function-decl name='preselect' mangled-name='_ZN8Knotspec9preselectEv' filepath='libnurbs/internals/tobezier.cc' line='82' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-295' is-artificial='yes'/>
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
         <function-decl name='select' mangled-name='_ZN8Knotspec6selectEv' filepath='libnurbs/internals/tobezier.cc' line='83' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-295' is-artificial='yes'/>
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
         <function-decl name='copy' mangled-name='_ZN8Knotspec4copyEPfS0_' filepath='libnurbs/internals/tobezier.cc' line='84' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-295' is-artificial='yes'/>
           <parameter type-id='type-id-59'/>
-          <parameter type-id='type-id-13'/>
-          <return type-id='type-id-11'/>
+          <parameter type-id='type-id-16'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
         <function-decl name='breakpoints' mangled-name='_ZN8Knotspec11breakpointsEv' filepath='libnurbs/internals/tobezier.cc' line='85' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-295' is-artificial='yes'/>
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
         <function-decl name='knots' mangled-name='_ZN8Knotspec5knotsEv' filepath='libnurbs/internals/tobezier.cc' line='86' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-295' is-artificial='yes'/>
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
         <function-decl name='transform' mangled-name='_ZN8Knotspec9transformEPf' filepath='libnurbs/internals/tobezier.cc' line='87' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-295' is-artificial='yes'/>
-          <parameter type-id='type-id-13'/>
-          <return type-id='type-id-11'/>
+          <parameter type-id='type-id-16'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
         <function-decl name='showpts' mangled-name='_ZN8Knotspec7showptsEPf' filepath='libnurbs/internals/tobezier.cc' line='88' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-295' is-artificial='yes'/>
-          <parameter type-id='type-id-13'/>
-          <return type-id='type-id-11'/>
+          <parameter type-id='type-id-16'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
         <function-decl name='pt_io_copy' mangled-name='_ZN8Knotspec10pt_io_copyEPfS0_' filepath='libnurbs/internals/tobezier.cc' line='90' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-295' is-artificial='yes'/>
-          <parameter type-id='type-id-13'/>
+          <parameter type-id='type-id-16'/>
           <parameter type-id='type-id-59'/>
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
         <function-decl name='pt_oo_copy' mangled-name='_ZN8Knotspec10pt_oo_copyEPfS0_' filepath='libnurbs/internals/tobezier.cc' line='91' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-295' is-artificial='yes'/>
-          <parameter type-id='type-id-13'/>
-          <parameter type-id='type-id-13'/>
-          <return type-id='type-id-11'/>
+          <parameter type-id='type-id-16'/>
+          <parameter type-id='type-id-16'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
         <function-decl name='pt_oo_sum' mangled-name='_ZN8Knotspec9pt_oo_sumEPfS0_S0_ff' filepath='libnurbs/internals/tobezier.cc' line='92' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-295' is-artificial='yes'/>
-          <parameter type-id='type-id-13'/>
-          <parameter type-id='type-id-13'/>
-          <parameter type-id='type-id-13'/>
+          <parameter type-id='type-id-16'/>
+          <parameter type-id='type-id-16'/>
+          <parameter type-id='type-id-16'/>
           <parameter type-id='type-id-233'/>
           <parameter type-id='type-id-233'/>
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
     </class-decl>
-    <typedef-decl name='Knot_ptr' type-id='type-id-13' filepath='libnurbs/internals/types.h' line='45' column='1' id='type-id-293'/>
+    <typedef-decl name='Knot_ptr' type-id='type-id-16' filepath='libnurbs/internals/types.h' line='45' column='1' id='type-id-293'/>
     <class-decl name='Breakpt' size-in-bits='96' is-struct='yes' visibility='default' filepath='libnurbs/internals/tobezier.cc' line='48' column='1' id='type-id-296'>
       <data-member access='public' layout-offset-in-bits='0'>
         <var-decl name='value' type-id='type-id-233' visibility='default' filepath='libnurbs/internals/tobezier.cc' line='49' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='32'>
-        <var-decl name='multi' type-id='type-id-10' visibility='default' filepath='libnurbs/internals/tobezier.cc' line='50' column='1'/>
+        <var-decl name='multi' type-id='type-id-11' visibility='default' filepath='libnurbs/internals/tobezier.cc' line='50' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
-        <var-decl name='def' type-id='type-id-10' visibility='default' filepath='libnurbs/internals/tobezier.cc' line='51' column='1'/>
+        <var-decl name='def' type-id='type-id-11' visibility='default' filepath='libnurbs/internals/tobezier.cc' line='51' column='1'/>
       </data-member>
     </class-decl>
     <class-decl name='Splinespec' size-in-bits='192' is-struct='yes' visibility='default' filepath='libnurbs/internals/tobezier.cc' line='95' column='1' id='type-id-297'>
@@ -8441,30 +8441,30 @@
         <var-decl name='kspec' type-id='type-id-295' visibility='default' filepath='libnurbs/internals/tobezier.cc' line='98' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
-        <var-decl name='dim' type-id='type-id-10' visibility='default' filepath='libnurbs/internals/tobezier.cc' line='99' column='1'/>
+        <var-decl name='dim' type-id='type-id-11' visibility='default' filepath='libnurbs/internals/tobezier.cc' line='99' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
-        <var-decl name='outcpts' type-id='type-id-13' visibility='default' filepath='libnurbs/internals/tobezier.cc' line='100' column='1'/>
+        <var-decl name='outcpts' type-id='type-id-16' visibility='default' filepath='libnurbs/internals/tobezier.cc' line='100' column='1'/>
       </data-member>
       <member-function access='public' constructor='yes'>
         <function-decl name='Splinespec' filepath='libnurbs/internals/tobezier.cc' line='96' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-298' is-artificial='yes'/>
-          <parameter type-id='type-id-10'/>
-          <return type-id='type-id-11'/>
+          <parameter type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public' destructor='yes'>
         <function-decl name='~Splinespec' filepath='libnurbs/internals/tobezier.cc' line='97' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-298' is-artificial='yes'/>
-          <parameter type-id='type-id-10'/>
-          <return type-id='type-id-11'/>
+          <parameter type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
         <function-decl name='kspecinit' mangled-name='_ZN10Splinespec9kspecinitER10Knotvector' filepath='libnurbs/internals/tobezier.cc' line='102' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-298' is-artificial='yes'/>
           <parameter type-id='type-id-166'/>
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
@@ -8472,40 +8472,40 @@
           <parameter type-id='type-id-298' is-artificial='yes'/>
           <parameter type-id='type-id-166'/>
           <parameter type-id='type-id-166'/>
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
         <function-decl name='select' mangled-name='_ZN10Splinespec6selectEv' filepath='libnurbs/internals/tobezier.cc' line='104' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-298' is-artificial='yes'/>
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
         <function-decl name='layout' mangled-name='_ZN10Splinespec6layoutEl' filepath='libnurbs/internals/tobezier.cc' line='105' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-298' is-artificial='yes'/>
-          <parameter type-id='type-id-12'/>
-          <return type-id='type-id-11'/>
+          <parameter type-id='type-id-15'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
         <function-decl name='setupquilt' mangled-name='_ZN10Splinespec10setupquiltEP5Quilt' filepath='libnurbs/internals/tobezier.cc' line='106' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-298' is-artificial='yes'/>
           <parameter type-id='type-id-299'/>
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
         <function-decl name='copy' mangled-name='_ZN10Splinespec4copyEPf' filepath='libnurbs/internals/tobezier.cc' line='107' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-298' is-artificial='yes'/>
           <parameter type-id='type-id-59'/>
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
         <function-decl name='transform' mangled-name='_ZN10Splinespec9transformEv' filepath='libnurbs/internals/tobezier.cc' line='108' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-298' is-artificial='yes'/>
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
     </class-decl>
@@ -8518,12 +8518,12 @@
     <array-type-def dimensions='1' type-id='type-id-1' size-in-bits='32000' id='type-id-300'>
       <subrange length='1000' type-id='type-id-3' id='type-id-301'/>
     </array-type-def>
-    <array-type-def dimensions='1' type-id='type-id-12' size-in-bits='64000' id='type-id-302'>
+    <array-type-def dimensions='1' type-id='type-id-15' size-in-bits='64000' id='type-id-302'>
       <subrange length='1000' type-id='type-id-3' id='type-id-301'/>
     </array-type-def>
     <class-decl name='Varray' size-in-bits='96192' visibility='default' filepath='libnurbs/internals/varray.h' line='43' column='1' id='type-id-303'>
       <data-member access='private' layout-offset-in-bits='0'>
-        <var-decl name='varray' type-id='type-id-13' visibility='default' filepath='libnurbs/internals/varray.h' line='48' column='1'/>
+        <var-decl name='varray' type-id='type-id-16' visibility='default' filepath='libnurbs/internals/varray.h' line='48' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='64'>
         <var-decl name='vval' type-id='type-id-300' visibility='default' filepath='libnurbs/internals/varray.h' line='49' column='1'/>
@@ -8532,22 +8532,22 @@
         <var-decl name='voffset' type-id='type-id-302' visibility='default' filepath='libnurbs/internals/varray.h' line='50' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='96064'>
-        <var-decl name='numquads' type-id='type-id-12' visibility='default' filepath='libnurbs/internals/varray.h' line='51' column='1'/>
+        <var-decl name='numquads' type-id='type-id-15' visibility='default' filepath='libnurbs/internals/varray.h' line='51' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='96128'>
-        <var-decl name='size' type-id='type-id-12' visibility='default' filepath='libnurbs/internals/varray.h' line='54' column='1'/>
+        <var-decl name='size' type-id='type-id-15' visibility='default' filepath='libnurbs/internals/varray.h' line='54' column='1'/>
       </data-member>
       <member-function access='private' constructor='yes'>
         <function-decl name='Varray' filepath='libnurbs/internals/varray.h' line='45' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-304' is-artificial='yes'/>
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private' destructor='yes'>
         <function-decl name='~Varray' filepath='libnurbs/internals/varray.h' line='46' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-304' is-artificial='yes'/>
-          <parameter type-id='type-id-10' is-artificial='yes'/>
-          <return type-id='type-id-11'/>
+          <parameter type-id='type-id-11' is-artificial='yes'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -8556,7 +8556,7 @@
           <parameter type-id='type-id-1'/>
           <parameter type-id='type-id-116'/>
           <parameter type-id='type-id-116'/>
-          <return type-id='type-id-12'/>
+          <return type-id='type-id-15'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -8565,26 +8565,26 @@
           <parameter type-id='type-id-116'/>
           <parameter type-id='type-id-305'/>
           <parameter type-id='type-id-1'/>
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
         <function-decl name='grow' mangled-name='_ZN6Varray4growEl' filepath='libnurbs/internals/varray.h' line='56' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-304' is-artificial='yes'/>
-          <parameter type-id='type-id-12'/>
-          <return type-id='type-id-11'/>
+          <parameter type-id='type-id-15'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
         <function-decl name='append' mangled-name='_ZN6Varray6appendEf' filepath='libnurbs/internals/varray.h' line='57' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-304' is-artificial='yes'/>
           <parameter type-id='type-id-1'/>
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
     </class-decl>
     <pointer-type-def type-id='type-id-303' size-in-bits='64' id='type-id-304'/>
-    <pointer-type-def type-id='type-id-12' size-in-bits='64' id='type-id-305'/>
+    <pointer-type-def type-id='type-id-15' size-in-bits='64' id='type-id-305'/>
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='libnurbs/nurbtess/directedLine.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-T0fsxk/Mesa-8.0.5/src/glu/sgi' language='LANG_C_plus_plus'>
     <type-decl name='short int' size-in-bits='16' id='type-id-306'/>
@@ -8602,7 +8602,7 @@
         <function-decl name='sampledLine' filepath='libnurbs/nurbtess/sampledLine.h' line='43' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-308' is-artificial='yes'/>
           <parameter type-id='type-id-255'/>
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private' constructor='yes'>
@@ -8610,7 +8610,7 @@
           <parameter type-id='type-id-308' is-artificial='yes'/>
           <parameter type-id='type-id-255'/>
           <parameter type-id='type-id-259'/>
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private' constructor='yes'>
@@ -8618,20 +8618,20 @@
           <parameter type-id='type-id-308' is-artificial='yes'/>
           <parameter type-id='type-id-260'/>
           <parameter type-id='type-id-260'/>
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private' constructor='yes'>
         <function-decl name='sampledLine' filepath='libnurbs/nurbtess/sampledLine.h' line='46' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-308' is-artificial='yes'/>
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private' destructor='yes'>
         <function-decl name='~sampledLine' filepath='libnurbs/nurbtess/sampledLine.h' line='47' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-308' is-artificial='yes'/>
-          <parameter type-id='type-id-10' is-artificial='yes'/>
-          <return type-id='type-id-11'/>
+          <parameter type-id='type-id-11' is-artificial='yes'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -8639,7 +8639,7 @@
           <parameter type-id='type-id-308' is-artificial='yes'/>
           <parameter type-id='type-id-255'/>
           <parameter type-id='type-id-262'/>
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -8647,7 +8647,7 @@
           <parameter type-id='type-id-308' is-artificial='yes'/>
           <parameter type-id='type-id-255'/>
           <parameter type-id='type-id-260'/>
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -8660,7 +8660,7 @@
       <member-function access='private'>
         <function-decl name='deleteList' mangled-name='_ZN11sampledLine10deleteListEv' filepath='libnurbs/nurbtess/sampledLine.h' line='54' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-308' is-artificial='yes'/>
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -8680,7 +8680,7 @@
           <parameter type-id='type-id-308' is-artificial='yes'/>
           <parameter type-id='type-id-253'/>
           <parameter type-id='type-id-253'/>
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -8688,13 +8688,13 @@
           <parameter type-id='type-id-308' is-artificial='yes'/>
           <parameter type-id='type-id-253'/>
           <parameter type-id='type-id-253'/>
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
         <function-decl name='print' mangled-name='_ZN11sampledLine5printEv' filepath='libnurbs/nurbtess/sampledLine.h' line='63' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-308' is-artificial='yes'/>
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
     </class-decl>
@@ -8725,20 +8725,20 @@
           <parameter type-id='type-id-310' is-artificial='yes'/>
           <parameter type-id='type-id-306'/>
           <parameter type-id='type-id-308'/>
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private' constructor='yes'>
         <function-decl name='directedLine' filepath='libnurbs/nurbtess/directedLine.h' line='64' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-310' is-artificial='yes'/>
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private' destructor='yes'>
         <function-decl name='~directedLine' filepath='libnurbs/nurbtess/directedLine.h' line='65' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-310' is-artificial='yes'/>
-          <parameter type-id='type-id-10' is-artificial='yes'/>
-          <return type-id='type-id-11'/>
+          <parameter type-id='type-id-11' is-artificial='yes'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -8746,7 +8746,7 @@
           <parameter type-id='type-id-310' is-artificial='yes'/>
           <parameter type-id='type-id-306'/>
           <parameter type-id='type-id-308'/>
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -8808,59 +8808,59 @@
         <function-decl name='putDirection' mangled-name='_ZN12directedLine12putDirectionEs' filepath='libnurbs/nurbtess/directedLine.h' line='79' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-310' is-artificial='yes'/>
           <parameter type-id='type-id-306'/>
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
         <function-decl name='putPrev' mangled-name='_ZN12directedLine7putPrevEPS_' filepath='libnurbs/nurbtess/directedLine.h' line='80' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-310' is-artificial='yes'/>
           <parameter type-id='type-id-310'/>
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
         <function-decl name='putNext' mangled-name='_ZN12directedLine7putNextEPS_' filepath='libnurbs/nurbtess/directedLine.h' line='81' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-310' is-artificial='yes'/>
           <parameter type-id='type-id-310'/>
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
         <function-decl name='insert' mangled-name='_ZN12directedLine6insertEPS_' filepath='libnurbs/nurbtess/directedLine.h' line='84' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-310' is-artificial='yes'/>
           <parameter type-id='type-id-310'/>
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
         <function-decl name='deletePolygonList' mangled-name='_ZN12directedLine17deletePolygonListEv' filepath='libnurbs/nurbtess/directedLine.h' line='90' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-310' is-artificial='yes'/>
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
         <function-decl name='deleteSinglePolygon' mangled-name='_ZN12directedLine19deleteSinglePolygonEv' filepath='libnurbs/nurbtess/directedLine.h' line='91' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-310' is-artificial='yes'/>
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
         <function-decl name='deleteSinglePolygonWithSline' mangled-name='_ZN12directedLine28deleteSinglePolygonWithSlineEv' filepath='libnurbs/nurbtess/directedLine.h' line='93' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-310' is-artificial='yes'/>
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
         <function-decl name='deletePolygonListWithSline' mangled-name='_ZN12directedLine26deletePolygonListWithSlineEv' filepath='libnurbs/nurbtess/directedLine.h' line='94' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-310' is-artificial='yes'/>
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
         <function-decl name='deleteSingleLine' mangled-name='_ZN12directedLine16deleteSingleLineEPS_' filepath='libnurbs/nurbtess/directedLine.h' line='96' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-310' is-artificial='yes'/>
           <parameter type-id='type-id-310'/>
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -8941,26 +8941,26 @@
       <member-function access='private'>
         <function-decl name='printSingle' mangled-name='_ZN12directedLine11printSingleEv' filepath='libnurbs/nurbtess/directedLine.h' line='125' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-310' is-artificial='yes'/>
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
         <function-decl name='printList' mangled-name='_ZN12directedLine9printListEv' filepath='libnurbs/nurbtess/directedLine.h' line='126' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-310' is-artificial='yes'/>
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
         <function-decl name='printAllPolygons' mangled-name='_ZN12directedLine16printAllPolygonsEv' filepath='libnurbs/nurbtess/directedLine.h' line='127' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-310' is-artificial='yes'/>
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
         <function-decl name='writeAllPolygons' mangled-name='_ZN12directedLine16writeAllPolygonsEPc' filepath='libnurbs/nurbtess/directedLine.h' line='128' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-310' is-artificial='yes'/>
           <parameter type-id='type-id-107'/>
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -9001,7 +9001,7 @@
           <parameter type-id='type-id-312'/>
           <parameter type-id='type-id-314'/>
           <parameter type-id='type-id-310'/>
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -9012,7 +9012,7 @@
           <parameter type-id='type-id-312'/>
           <parameter type-id='type-id-312'/>
           <parameter type-id='type-id-310'/>
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -9026,13 +9026,13 @@
       <member-function access='private'>
         <function-decl name='setRootBit' mangled-name='_ZN12directedLine10setRootBitEv' filepath='libnurbs/nurbtess/directedLine.h' line='151' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-310' is-artificial='yes'/>
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
         <function-decl name='resetRootBit' mangled-name='_ZN12directedLine12resetRootBitEv' filepath='libnurbs/nurbtess/directedLine.h' line='152' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-310' is-artificial='yes'/>
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -9045,7 +9045,7 @@
         <function-decl name='rootLinkSet' mangled-name='_ZN12directedLine11rootLinkSetEPS_' filepath='libnurbs/nurbtess/directedLine.h' line='155' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-310' is-artificial='yes'/>
           <parameter type-id='type-id-310'/>
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -9066,7 +9066,7 @@
     <reference-type-def kind='lvalue' type-id='type-id-255' size-in-bits='64' id='type-id-313'/>
     <pointer-type-def type-id='type-id-309' size-in-bits='64' id='type-id-310'/>
     <pointer-type-def type-id='type-id-310' size-in-bits='64' id='type-id-312'/>
-    <reference-type-def kind='lvalue' type-id='type-id-10' size-in-bits='64' id='type-id-311'/>
+    <reference-type-def kind='lvalue' type-id='type-id-11' size-in-bits='64' id='type-id-311'/>
     <pointer-type-def type-id='type-id-307' size-in-bits='64' id='type-id-308'/>
     <pointer-type-def type-id='type-id-308' size-in-bits='64' id='type-id-314'/>
   </abi-instr>
@@ -9116,35 +9116,35 @@
           <parameter type-id='type-id-316' is-artificial='yes'/>
           <parameter type-id='type-id-310'/>
           <parameter type-id='type-id-310'/>
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private' destructor='yes'>
         <function-decl name='~monoChain' filepath='libnurbs/nurbtess/monoChain.h' line='59' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-316' is-artificial='yes'/>
-          <parameter type-id='type-id-10' is-artificial='yes'/>
-          <return type-id='type-id-11'/>
+          <parameter type-id='type-id-11' is-artificial='yes'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
         <function-decl name='setNext' mangled-name='_ZN9monoChain7setNextEPS_' filepath='libnurbs/nurbtess/monoChain.h' line='61' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-316' is-artificial='yes'/>
           <parameter type-id='type-id-316'/>
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
         <function-decl name='setPrev' mangled-name='_ZN9monoChain7setPrevEPS_' filepath='libnurbs/nurbtess/monoChain.h' line='62' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-316' is-artificial='yes'/>
           <parameter type-id='type-id-316'/>
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
         <function-decl name='setNextPolygon' mangled-name='_ZN9monoChain14setNextPolygonEPS_' filepath='libnurbs/nurbtess/monoChain.h' line='63' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-316' is-artificial='yes'/>
           <parameter type-id='type-id-316'/>
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -9174,26 +9174,26 @@
       <member-function access='private'>
         <function-decl name='resetCurrent' mangled-name='_ZN9monoChain12resetCurrentEv' filepath='libnurbs/nurbtess/monoChain.h' line='69' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-316' is-artificial='yes'/>
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
         <function-decl name='deleteLoop' mangled-name='_ZN9monoChain10deleteLoopEv' filepath='libnurbs/nurbtess/monoChain.h' line='71' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-316' is-artificial='yes'/>
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
         <function-decl name='deleteLoopList' mangled-name='_ZN9monoChain14deleteLoopListEv' filepath='libnurbs/nurbtess/monoChain.h' line='72' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-316' is-artificial='yes'/>
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
         <function-decl name='insert' mangled-name='_ZN9monoChain6insertEPS_' filepath='libnurbs/nurbtess/monoChain.h' line='75' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-316' is-artificial='yes'/>
           <parameter type-id='type-id-316'/>
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -9240,19 +9240,19 @@
       <member-function access='private'>
         <function-decl name='printOneChain' mangled-name='_ZN9monoChain13printOneChainEv' filepath='libnurbs/nurbtess/monoChain.h' line='87' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-316' is-artificial='yes'/>
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
         <function-decl name='printChainLoop' mangled-name='_ZN9monoChain14printChainLoopEv' filepath='libnurbs/nurbtess/monoChain.h' line='88' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-316' is-artificial='yes'/>
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
         <function-decl name='printAllLoops' mangled-name='_ZN9monoChain13printAllLoopsEv' filepath='libnurbs/nurbtess/monoChain.h' line='89' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-316' is-artificial='yes'/>
-          <return type-id='type-id-11'/>
+          <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
     </class-decl>
@@ -9285,12 +9285,12 @@
     <array-type-def dimensions='1' type-id='type-id-323' size-in-bits='1600' id='type-id-324'>
       <subrange length='1' type-id='type-id-3' id='type-id-325'/>
     </array-type-def>
-    <type-decl name='float' size-in-bits='32' id='type-id-30'/>
-    <type-decl name='long int' size-in-bits='64' id='type-id-12'/>
-    <array-type-def dimensions='1' type-id='type-id-12' size-in-bits='512' id='type-id-326'>
+    <type-decl name='float' size-in-bits='32' id='type-id-33'/>
+    <type-decl name='long int' size-in-bits='64' id='type-id-15'/>
+    <array-type-def dimensions='1' type-id='type-id-15' size-in-bits='512' id='type-id-326'>
       <subrange length='8' type-id='type-id-3' id='type-id-327'/>
     </array-type-def>
-    <type-decl name='unnamed-enum-underlying-type' is-anonymous='yes' size-in-bits='32' alignment-in-bits='32' id='type-id-38'/>
+    <type-decl name='unnamed-enum-underlying-type' is-anonymous='yes' size-in-bits='32' alignment-in-bits='32' id='type-id-9'/>
     <type-decl name='unsigned long int' size-in-bits='64' id='type-id-3'/>
     <array-type-def dimensions='1' type-id='type-id-3' size-in-bits='1024' id='type-id-328'>
       <subrange length='16' type-id='type-id-3' id='type-id-329'/>
@@ -9307,7 +9307,7 @@
         <var-decl name='mesh' type-id='type-id-334' visibility='default' filepath='libtess/tess.h' line='66' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='192'>
-        <var-decl name='callError' type-id='type-id-16' visibility='default' filepath='libtess/tess.h' line='69' column='1'/>
+        <var-decl name='callError' type-id='type-id-19' visibility='default' filepath='libtess/tess.h' line='69' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='256'>
         <var-decl name='normal' type-id='type-id-322' visibility='default' filepath='libtess/tess.h' line='73' column='1'/>
@@ -9322,7 +9322,7 @@
         <var-decl name='relTolerance' type-id='type-id-321' visibility='default' filepath='libtess/tess.h' line='79' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='896'>
-        <var-decl name='windingRule' type-id='type-id-25' visibility='default' filepath='libtess/tess.h' line='80' column='1'/>
+        <var-decl name='windingRule' type-id='type-id-28' visibility='default' filepath='libtess/tess.h' line='80' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='928'>
         <var-decl name='fatalError' type-id='type-id-42' visibility='default' filepath='libtess/tess.h' line='81' column='1'/>
@@ -9349,16 +9349,16 @@
         <var-decl name='lonelyTriList' type-id='type-id-339' visibility='default' filepath='libtess/tess.h' line='94' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1344'>
-        <var-decl name='callBegin' type-id='type-id-16' visibility='default' filepath='libtess/tess.h' line='97' column='1'/>
+        <var-decl name='callBegin' type-id='type-id-19' visibility='default' filepath='libtess/tess.h' line='97' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1408'>
         <var-decl name='callEdgeFlag' type-id='type-id-340' visibility='default' filepath='libtess/tess.h' line='98' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1472'>
-        <var-decl name='callVertex' type-id='type-id-20' visibility='default' filepath='libtess/tess.h' line='99' column='1'/>
+        <var-decl name='callVertex' type-id='type-id-23' visibility='default' filepath='libtess/tess.h' line='99' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1536'>
-        <var-decl name='callEnd' type-id='type-id-17' visibility='default' filepath='libtess/tess.h' line='100' column='1'/>
+        <var-decl name='callEnd' type-id='type-id-20' visibility='default' filepath='libtess/tess.h' line='100' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1600'>
         <var-decl name='callMesh' type-id='type-id-341' visibility='default' filepath='libtess/tess.h' line='101' column='1'/>
@@ -9367,13 +9367,13 @@
         <var-decl name='emptyCache' type-id='type-id-42' visibility='default' filepath='libtess/tess.h' line='106' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1696'>
-        <var-decl name='cacheCount' type-id='type-id-10' visibility='default' filepath='libtess/tess.h' line='107' column='1'/>
+        <var-decl name='cacheCount' type-id='type-id-11' visibility='default' filepath='libtess/tess.h' line='107' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1728'>
         <var-decl name='cache' type-id='type-id-319' visibility='default' filepath='libtess/tess.h' line='108' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='27328'>
-        <var-decl name='callBeginData' type-id='type-id-19' visibility='default' filepath='libtess/tess.h' line='111' column='1'/>
+        <var-decl name='callBeginData' type-id='type-id-22' visibility='default' filepath='libtess/tess.h' line='111' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='27392'>
         <var-decl name='callEdgeFlagData' type-id='type-id-342' visibility='default' filepath='libtess/tess.h' line='112' column='1'/>
@@ -9382,10 +9382,10 @@
         <var-decl name='callVertexData' type-id='type-id-343' visibility='default' filepath='libtess/tess.h' line='114' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='27520'>
-        <var-decl name='callEndData' type-id='type-id-20' visibility='default' filepath='libtess/tess.h' line='115' column='1'/>
+        <var-decl name='callEndData' type-id='type-id-23' visibility='default' filepath='libtess/tess.h' line='115' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='27584'>
-        <var-decl name='callErrorData' type-id='type-id-19' visibility='default' filepath='libtess/tess.h' line='116' column='1'/>
+        <var-decl name='callErrorData' type-id='type-id-22' visibility='default' filepath='libtess/tess.h' line='116' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='27648'>
         <var-decl name='callCombineData' type-id='type-id-344' visibility='default' filepath='libtess/tess.h' line='117' column='1'/>
@@ -9394,11 +9394,11 @@
         <var-decl name='env' type-id='type-id-200' visibility='default' filepath='libtess/tess.h' line='121' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='29312'>
-        <var-decl name='polygonData' type-id='type-id-22' visibility='default' filepath='libtess/tess.h' line='123' column='1'/>
+        <var-decl name='polygonData' type-id='type-id-25' visibility='default' filepath='libtess/tess.h' line='123' column='1'/>
       </data-member>
     </class-decl>
     <enum-decl name='TessState' filepath='libtess/tess.h' line='47' column='1' id='type-id-332'>
-      <underlying-type type-id='type-id-38'/>
+      <underlying-type type-id='type-id-9'/>
       <enumerator name='T_DORMANT' value='0'/>
       <enumerator name='T_IN_POLYGON' value='1'/>
       <enumerator name='T_IN_CONTOUR' value='2'/>
@@ -9426,7 +9426,7 @@
         <var-decl name='activeRegion' type-id='type-id-346' visibility='default' filepath='libtess/mesh.h' line='147' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='448'>
-        <var-decl name='winding' type-id='type-id-10' visibility='default' filepath='libtess/mesh.h' line='148' column='1'/>
+        <var-decl name='winding' type-id='type-id-11' visibility='default' filepath='libtess/mesh.h' line='148' column='1'/>
       </data-member>
     </class-decl>
     <typedef-decl name='GLUhalfEdge' type-id='type-id-345' filepath='libtess/mesh.h' line='44' column='1' id='type-id-347'/>
@@ -9441,7 +9441,7 @@
         <var-decl name='anEdge' type-id='type-id-333' visibility='default' filepath='libtess/mesh.h' line='117' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='192'>
-        <var-decl name='data' type-id='type-id-22' visibility='default' filepath='libtess/mesh.h' line='118' column='1'/>
+        <var-decl name='data' type-id='type-id-25' visibility='default' filepath='libtess/mesh.h' line='118' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='256'>
         <var-decl name='coords' type-id='type-id-322' visibility='default' filepath='libtess/mesh.h' line='121' column='1'/>
@@ -9453,7 +9453,7 @@
         <var-decl name='t' type-id='type-id-321' visibility='default' filepath='libtess/mesh.h' line='122' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='576'>
-        <var-decl name='pqHandle' type-id='type-id-12' visibility='default' filepath='libtess/mesh.h' line='123' column='1'/>
+        <var-decl name='pqHandle' type-id='type-id-15' visibility='default' filepath='libtess/mesh.h' line='123' column='1'/>
       </data-member>
     </class-decl>
     <typedef-decl name='GLUvertex' type-id='type-id-348' filepath='libtess/mesh.h' line='42' column='1' id='type-id-349'/>
@@ -9468,7 +9468,7 @@
         <var-decl name='anEdge' type-id='type-id-333' visibility='default' filepath='libtess/mesh.h' line='129' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='192'>
-        <var-decl name='data' type-id='type-id-22' visibility='default' filepath='libtess/mesh.h' line='130' column='1'/>
+        <var-decl name='data' type-id='type-id-25' visibility='default' filepath='libtess/mesh.h' line='130' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='256'>
         <var-decl name='trail' type-id='type-id-339' visibility='default' filepath='libtess/mesh.h' line='133' column='1'/>
@@ -9490,7 +9490,7 @@
         <var-decl name='nodeUp' type-id='type-id-354' visibility='default' filepath='libtess/sweep.h' line='61' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
-        <var-decl name='windingNumber' type-id='type-id-10' visibility='default' filepath='libtess/sweep.h' line='62' column='1'/>
+        <var-decl name='windingNumber' type-id='type-id-11' visibility='default' filepath='libtess/sweep.h' line='62' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='160'>
         <var-decl name='inside' type-id='type-id-42' visibility='default' filepath='libtess/sweep.h' line='64' column='1'/>
@@ -9516,7 +9516,7 @@
         <var-decl name='prev' type-id='type-id-354' visibility='default' filepath='libtess/dict.h' line='91' column='1'/>
       </data-member>
     </class-decl>
-    <typedef-decl name='DictListKey' type-id='type-id-22' filepath='libtess/dict.h' line='60' column='1' id='type-id-356'/>
+    <typedef-decl name='DictListKey' type-id='type-id-25' filepath='libtess/dict.h' line='60' column='1' id='type-id-356'/>
     <typedef-decl name='DictListNode' type-id='type-id-355' filepath='libtess/dict.h' line='62' column='1' id='type-id-357'/>
     <typedef-decl name='GLUmesh' type-id='type-id-358' filepath='libtess/mesh.h' line='40' column='1' id='type-id-359'/>
     <class-decl name='GLUmesh' size-in-bits='2048' is-struct='yes' visibility='default' filepath='libtess/mesh.h' line='163' column='1' id='type-id-358'>
@@ -9538,7 +9538,7 @@
         <var-decl name='__jmpbuf' type-id='type-id-360' visibility='default' filepath='/usr/include/setjmp.h' line='41' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='512'>
-        <var-decl name='__mask_was_saved' type-id='type-id-10' visibility='default' filepath='/usr/include/setjmp.h' line='42' column='1'/>
+        <var-decl name='__mask_was_saved' type-id='type-id-11' visibility='default' filepath='/usr/include/setjmp.h' line='42' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='576'>
         <var-decl name='__saved_mask' type-id='type-id-361' visibility='default' filepath='/usr/include/setjmp.h' line='43' column='1'/>
@@ -9550,7 +9550,7 @@
         <var-decl name='head' type-id='type-id-357' visibility='default' filepath='libtess/dict.h' line='95' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='192'>
-        <var-decl name='frame' type-id='type-id-22' visibility='default' filepath='libtess/dict.h' line='96' column='1'/>
+        <var-decl name='frame' type-id='type-id-25' visibility='default' filepath='libtess/dict.h' line='96' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='256'>
         <var-decl name='leq' type-id='type-id-364' visibility='default' filepath='libtess/dict.h' line='97' column='1'/>
@@ -9574,7 +9574,7 @@
         <var-decl name='max' type-id='type-id-370' visibility='default' filepath='libtess/priorityq.h' line='101' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='320'>
-        <var-decl name='initialized' type-id='type-id-10' visibility='default' filepath='libtess/priorityq.h' line='102' column='1'/>
+        <var-decl name='initialized' type-id='type-id-11' visibility='default' filepath='libtess/priorityq.h' line='102' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='384'>
         <var-decl name='leq' type-id='type-id-371' visibility='default' filepath='libtess/priorityq.h' line='103' column='1'/>
@@ -9589,16 +9589,16 @@
         <var-decl name='handles' type-id='type-id-375' visibility='default' filepath='libtess/priorityq-heap.h' line='88' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
-        <var-decl name='size' type-id='type-id-12' visibility='default' filepath='libtess/priorityq-heap.h' line='89' column='1'/>
+        <var-decl name='size' type-id='type-id-15' visibility='default' filepath='libtess/priorityq-heap.h' line='89' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='192'>
-        <var-decl name='max' type-id='type-id-12' visibility='default' filepath='libtess/priorityq-heap.h' line='89' column='1'/>
+        <var-decl name='max' type-id='type-id-15' visibility='default' filepath='libtess/priorityq-heap.h' line='89' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='256'>
         <var-decl name='freeList' type-id='type-id-376' visibility='default' filepath='libtess/priorityq-heap.h' line='90' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='320'>
-        <var-decl name='initialized' type-id='type-id-10' visibility='default' filepath='libtess/priorityq-heap.h' line='91' column='1'/>
+        <var-decl name='initialized' type-id='type-id-11' visibility='default' filepath='libtess/priorityq-heap.h' line='91' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='384'>
         <var-decl name='leq' type-id='type-id-377' visibility='default' filepath='libtess/priorityq-heap.h' line='92' column='1'/>
@@ -9610,7 +9610,7 @@
         <var-decl name='handle' type-id='type-id-376' visibility='default' filepath='libtess/priorityq-heap.h' line='83' column='1'/>
       </data-member>
     </class-decl>
-    <typedef-decl name='PQHeapHandle' type-id='type-id-12' filepath='libtess/priorityq-heap.h' line='80' column='1' id='type-id-376'/>
+    <typedef-decl name='PQHeapHandle' type-id='type-id-15' filepath='libtess/priorityq-heap.h' line='80' column='1' id='type-id-376'/>
     <typedef-decl name='PQhandleElem' type-id='type-id-380' filepath='libtess/priorityq-heap.h' line='84' column='1' id='type-id-381'/>
     <class-decl name='__anonymous_struct__1' size-in-bits='128' is-struct='yes' is-anonymous='yes' naming-typedef-id='type-id-381' visibility='default' filepath='libtess/priorityq-heap.h' line='84' column='1' id='type-id-380'>
       <data-member access='public' layout-offset-in-bits='0'>
@@ -9620,17 +9620,17 @@
         <var-decl name='node' type-id='type-id-376' visibility='default' filepath='libtess/priorityq-heap.h' line='84' column='1'/>
       </data-member>
     </class-decl>
-    <typedef-decl name='PQHeapKey' type-id='type-id-22' filepath='libtess/priorityq-heap.h' line='79' column='1' id='type-id-382'/>
+    <typedef-decl name='PQHeapKey' type-id='type-id-25' filepath='libtess/priorityq-heap.h' line='79' column='1' id='type-id-382'/>
     <typedef-decl name='PQSortKey' type-id='type-id-382' filepath='libtess/priorityq.h' line='93' column='1' id='type-id-383'/>
     <typedef-decl name='PQSortHandle' type-id='type-id-376' filepath='libtess/priorityq.h' line='94' column='1' id='type-id-370'/>
-    <typedef-decl name='GLfloat' type-id='type-id-30' filepath='../../../include/GL/gl.h' line='160' column='1' id='type-id-33'/>
+    <typedef-decl name='GLfloat' type-id='type-id-33' filepath='../../../include/GL/gl.h' line='160' column='1' id='type-id-35'/>
     <typedef-decl name='CachedVertex' type-id='type-id-384' filepath='libtess/tess.h' line='57' column='1' id='type-id-318'/>
     <class-decl name='CachedVertex' size-in-bits='256' is-struct='yes' visibility='default' filepath='libtess/tess.h' line='54' column='1' id='type-id-384'>
       <data-member access='public' layout-offset-in-bits='0'>
         <var-decl name='coords' type-id='type-id-322' visibility='default' filepath='libtess/tess.h' line='55' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='192'>
-        <var-decl name='data' type-id='type-id-22' visibility='default' filepath='libtess/tess.h' line='56' column='1'/>
+        <var-decl name='data' type-id='type-id-25' visibility='default' filepath='libtess/tess.h' line='56' column='1'/>
       </data-member>
     </class-decl>
     <typedef-decl name='jmp_buf' type-id='type-id-324' filepath='/usr/include/setjmp.h' line='49' column='1' id='type-id-200'/>
@@ -9649,7 +9649,7 @@
     <pointer-type-def type-id='type-id-359' size-in-bits='64' id='type-id-334'/>
     <pointer-type-def type-id='type-id-331' size-in-bits='64' id='type-id-386'/>
     <pointer-type-def type-id='type-id-349' size-in-bits='64' id='type-id-337'/>
-    <pointer-type-def type-id='type-id-33' size-in-bits='64' id='type-id-47'/>
+    <pointer-type-def type-id='type-id-35' size-in-bits='64' id='type-id-47'/>
     <pointer-type-def type-id='type-id-383' size-in-bits='64' id='type-id-368'/>
     <pointer-type-def type-id='type-id-368' size-in-bits='64' id='type-id-369'/>
     <pointer-type-def type-id='type-id-381' size-in-bits='64' id='type-id-375'/>
@@ -9664,75 +9664,75 @@
     <pointer-type-def type-id='type-id-392' size-in-bits='64' id='type-id-344'/>
     <pointer-type-def type-id='type-id-393' size-in-bits='64' id='type-id-340'/>
     <pointer-type-def type-id='type-id-394' size-in-bits='64' id='type-id-342'/>
-    <pointer-type-def type-id='type-id-395' size-in-bits='64' id='type-id-16'/>
-    <pointer-type-def type-id='type-id-396' size-in-bits='64' id='type-id-19'/>
-    <pointer-type-def type-id='type-id-397' size-in-bits='64' id='type-id-20'/>
+    <pointer-type-def type-id='type-id-395' size-in-bits='64' id='type-id-19'/>
+    <pointer-type-def type-id='type-id-396' size-in-bits='64' id='type-id-22'/>
+    <pointer-type-def type-id='type-id-397' size-in-bits='64' id='type-id-23'/>
     <pointer-type-def type-id='type-id-398' size-in-bits='64' id='type-id-343'/>
-    <pointer-type-def type-id='type-id-22' size-in-bits='64' id='type-id-185'/>
+    <pointer-type-def type-id='type-id-25' size-in-bits='64' id='type-id-185'/>
     <function-decl name='gluTessProperty' mangled-name='gluTessProperty' filepath='libtess/tess.c' line='201' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gluTessProperty'>
       <parameter type-id='type-id-386' name='tess' filepath='libtess/tess.c' line='201' column='1'/>
-      <parameter type-id='type-id-25' name='which' filepath='libtess/tess.c' line='201' column='1'/>
+      <parameter type-id='type-id-28' name='which' filepath='libtess/tess.c' line='201' column='1'/>
       <parameter type-id='type-id-321' name='value' filepath='libtess/tess.c' line='201' column='1'/>
-      <return type-id='type-id-11'/>
+      <return type-id='type-id-12'/>
     </function-decl>
     <function-decl name='gluGetTessProperty' mangled-name='gluGetTessProperty' filepath='libtess/tess.c' line='240' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gluGetTessProperty'>
       <parameter type-id='type-id-386' name='tess' filepath='libtess/tess.c' line='240' column='1'/>
-      <parameter type-id='type-id-25' name='which' filepath='libtess/tess.c' line='240' column='1'/>
+      <parameter type-id='type-id-28' name='which' filepath='libtess/tess.c' line='240' column='1'/>
       <parameter type-id='type-id-399' name='value' filepath='libtess/tess.c' line='240' column='1'/>
-      <return type-id='type-id-11'/>
+      <return type-id='type-id-12'/>
     </function-decl>
     <function-decl name='gluTessNormal' mangled-name='gluTessNormal' filepath='libtess/tess.c' line='268' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gluTessNormal'>
       <parameter type-id='type-id-386' name='tess' filepath='libtess/tess.c' line='268' column='1'/>
       <parameter type-id='type-id-321' name='x' filepath='libtess/tess.c' line='268' column='1'/>
       <parameter type-id='type-id-321' name='y' filepath='libtess/tess.c' line='268' column='1'/>
       <parameter type-id='type-id-321' name='z' filepath='libtess/tess.c' line='268' column='1'/>
-      <return type-id='type-id-11'/>
+      <return type-id='type-id-12'/>
     </function-decl>
     <function-decl name='gluTessCallback' mangled-name='gluTessCallback' filepath='libtess/tess.c' line='276' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gluTessCallback'>
       <parameter type-id='type-id-386' name='tess' filepath='libtess/tess.c' line='276' column='1'/>
-      <parameter type-id='type-id-25' name='which' filepath='libtess/tess.c' line='276' column='1'/>
-      <parameter type-id='type-id-26' name='fn' filepath='libtess/tess.c' line='276' column='1'/>
-      <return type-id='type-id-11'/>
+      <parameter type-id='type-id-28' name='which' filepath='libtess/tess.c' line='276' column='1'/>
+      <parameter type-id='type-id-29' name='fn' filepath='libtess/tess.c' line='276' column='1'/>
+      <return type-id='type-id-12'/>
     </function-decl>
     <function-decl name='gluTessEndContour' mangled-name='gluTessEndContour' filepath='libtess/tess.c' line='493' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gluTessEndContour'>
       <parameter type-id='type-id-386' name='tess' filepath='libtess/tess.c' line='493' column='1'/>
-      <return type-id='type-id-11'/>
+      <return type-id='type-id-12'/>
     </function-decl>
     <function-decl name='gluTessBeginContour' mangled-name='gluTessBeginContour' filepath='libtess/tess.c' line='476' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gluTessBeginContour'>
       <parameter type-id='type-id-386' name='tess' filepath='libtess/tess.c' line='476' column='1'/>
-      <return type-id='type-id-11'/>
+      <return type-id='type-id-12'/>
     </function-decl>
     <function-decl name='gluNextContour' mangled-name='gluNextContour' filepath='libtess/tess.c' line='620' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gluNextContour'>
       <parameter type-id='type-id-386' name='tess' filepath='libtess/tess.c' line='620' column='1'/>
-      <parameter type-id='type-id-25' name='type' filepath='libtess/tess.c' line='620' column='1'/>
-      <return type-id='type-id-11'/>
+      <parameter type-id='type-id-28' name='type' filepath='libtess/tess.c' line='620' column='1'/>
+      <return type-id='type-id-12'/>
     </function-decl>
     <function-decl name='gluTessBeginPolygon' mangled-name='gluTessBeginPolygon' filepath='libtess/tess.c' line='462' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gluTessBeginPolygon'>
       <parameter type-id='type-id-386' name='tess' filepath='libtess/tess.c' line='462' column='1'/>
-      <parameter type-id='type-id-22' name='data' filepath='libtess/tess.c' line='462' column='1'/>
-      <return type-id='type-id-11'/>
+      <parameter type-id='type-id-25' name='data' filepath='libtess/tess.c' line='462' column='1'/>
+      <return type-id='type-id-12'/>
     </function-decl>
     <function-decl name='gluBeginPolygon' mangled-name='gluBeginPolygon' filepath='libtess/tess.c' line='611' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gluBeginPolygon'>
       <parameter type-id='type-id-386' name='tess' filepath='libtess/tess.c' line='611' column='1'/>
-      <return type-id='type-id-11'/>
+      <return type-id='type-id-12'/>
     </function-decl>
     <function-decl name='gluTessEndPolygon' mangled-name='gluTessEndPolygon' filepath='libtess/tess.c' line='500' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gluTessEndPolygon'>
       <parameter type-id='type-id-386' name='tess' filepath='libtess/tess.c' line='500' column='1'/>
-      <return type-id='type-id-11'/>
+      <return type-id='type-id-12'/>
     </function-decl>
     <function-decl name='gluEndPolygon' mangled-name='gluEndPolygon' filepath='libtess/tess.c' line='628' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gluEndPolygon'>
       <parameter type-id='type-id-386' name='tess' filepath='libtess/tess.c' line='628' column='1'/>
-      <return type-id='type-id-11'/>
+      <return type-id='type-id-12'/>
     </function-decl>
     <function-decl name='gluTessVertex' mangled-name='gluTessVertex' filepath='libtess/tess.c' line='415' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gluTessVertex'>
       <parameter type-id='type-id-386' name='tess' filepath='libtess/tess.c' line='415' column='1'/>
       <parameter type-id='type-id-399' name='coords' filepath='libtess/tess.c' line='415' column='1'/>
-      <parameter type-id='type-id-22' name='data' filepath='libtess/tess.c' line='415' column='1'/>
-      <return type-id='type-id-11'/>
+      <parameter type-id='type-id-25' name='data' filepath='libtess/tess.c' line='415' column='1'/>
+      <return type-id='type-id-12'/>
     </function-decl>
     <function-decl name='gluDeleteTess' mangled-name='gluDeleteTess' filepath='libtess/tess.c' line='193' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gluDeleteTess'>
       <parameter type-id='type-id-386' name='tess' filepath='libtess/tess.c' line='193' column='1'/>
-      <return type-id='type-id-11'/>
+      <return type-id='type-id-12'/>
     </function-decl>
     <function-decl name='gluNewTess' mangled-name='gluNewTess' filepath='libtess/tess.c' line='92' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gluNewTess'>
       <return type-id='type-id-386'/>
@@ -9740,163 +9740,163 @@
     <function-type size-in-bits='64' id='type-id-387'>
       <parameter type-id='type-id-382'/>
       <parameter type-id='type-id-382'/>
-      <return type-id='type-id-10'/>
+      <return type-id='type-id-11'/>
     </function-type>
     <function-type size-in-bits='64' id='type-id-388'>
       <parameter type-id='type-id-383'/>
       <parameter type-id='type-id-383'/>
-      <return type-id='type-id-10'/>
+      <return type-id='type-id-11'/>
     </function-type>
     <function-type size-in-bits='64' id='type-id-389'>
-      <parameter type-id='type-id-22'/>
+      <parameter type-id='type-id-25'/>
       <parameter type-id='type-id-356'/>
       <parameter type-id='type-id-356'/>
-      <return type-id='type-id-10'/>
+      <return type-id='type-id-11'/>
     </function-type>
     <function-type size-in-bits='64' id='type-id-390'>
       <parameter type-id='type-id-334'/>
-      <return type-id='type-id-11'/>
+      <return type-id='type-id-12'/>
     </function-type>
     <function-type size-in-bits='64' id='type-id-391'>
       <parameter type-id='type-id-399'/>
       <parameter type-id='type-id-185'/>
       <parameter type-id='type-id-47'/>
       <parameter type-id='type-id-185'/>
-      <return type-id='type-id-11'/>
+      <return type-id='type-id-12'/>
     </function-type>
     <function-type size-in-bits='64' id='type-id-392'>
       <parameter type-id='type-id-399'/>
       <parameter type-id='type-id-185'/>
       <parameter type-id='type-id-47'/>
       <parameter type-id='type-id-185'/>
-      <parameter type-id='type-id-22'/>
-      <return type-id='type-id-11'/>
+      <parameter type-id='type-id-25'/>
+      <return type-id='type-id-12'/>
     </function-type>
     <function-type size-in-bits='64' id='type-id-393'>
       <parameter type-id='type-id-42'/>
-      <return type-id='type-id-11'/>
+      <return type-id='type-id-12'/>
     </function-type>
     <function-type size-in-bits='64' id='type-id-394'>
       <parameter type-id='type-id-42'/>
-      <parameter type-id='type-id-22'/>
-      <return type-id='type-id-11'/>
+      <parameter type-id='type-id-25'/>
+      <return type-id='type-id-12'/>
     </function-type>
     <function-type size-in-bits='64' id='type-id-395'>
-      <parameter type-id='type-id-25'/>
-      <return type-id='type-id-11'/>
+      <parameter type-id='type-id-28'/>
+      <return type-id='type-id-12'/>
     </function-type>
     <function-type size-in-bits='64' id='type-id-396'>
+      <parameter type-id='type-id-28'/>
       <parameter type-id='type-id-25'/>
-      <parameter type-id='type-id-22'/>
-      <return type-id='type-id-11'/>
+      <return type-id='type-id-12'/>
     </function-type>
     <function-type size-in-bits='64' id='type-id-397'>
-      <parameter type-id='type-id-22'/>
-      <return type-id='type-id-11'/>
+      <parameter type-id='type-id-25'/>
+      <return type-id='type-id-12'/>
     </function-type>
     <function-type size-in-bits='64' id='type-id-398'>
-      <parameter type-id='type-id-22'/>
-      <parameter type-id='type-id-22'/>
-      <return type-id='type-id-11'/>
+      <parameter type-id='type-id-25'/>
+      <parameter type-id='type-id-25'/>
+      <return type-id='type-id-12'/>
     </function-type>
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='libutil/error.c' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-T0fsxk/Mesa-8.0.5/src/glu/sgi' language='LANG_C99'>
     <type-decl name='unsigned char' size-in-bits='8' id='type-id-400'/>
     <type-decl name='unsigned int' size-in-bits='32' id='type-id-230'/>
     <typedef-decl name='GLubyte' type-id='type-id-400' filepath='../../../include/GL/gl.h' line='156' column='1' id='type-id-401'/>
-    <typedef-decl name='GLenum' type-id='type-id-230' filepath='../../../include/GL/gl.h' line='149' column='1' id='type-id-25'/>
+    <typedef-decl name='GLenum' type-id='type-id-230' filepath='../../../include/GL/gl.h' line='149' column='1' id='type-id-28'/>
     <qualified-type-def type-id='type-id-401' const='yes' id='type-id-402'/>
     <pointer-type-def type-id='type-id-402' size-in-bits='64' id='type-id-403'/>
     <function-decl name='gluErrorString' mangled-name='gluErrorString' filepath='libutil/error.c' line='66' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gluErrorString'>
-      <parameter type-id='type-id-25' name='errorCode' filepath='libutil/error.c' line='66' column='1'/>
+      <parameter type-id='type-id-28' name='errorCode' filepath='libutil/error.c' line='66' column='1'/>
       <return type-id='type-id-403'/>
     </function-decl>
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='libutil/mipmap.c' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-T0fsxk/Mesa-8.0.5/src/glu/sgi' language='LANG_C99'>
-    <type-decl name='int' size-in-bits='32' id='type-id-10'/>
-    <type-decl name='void' id='type-id-11'/>
-    <typedef-decl name='GLint' type-id='type-id-10' filepath='../../../include/GL/gl.h' line='155' column='1' id='type-id-60'/>
-    <typedef-decl name='GLsizei' type-id='type-id-10' filepath='../../../include/GL/gl.h' line='159' column='1' id='type-id-404'/>
-    <pointer-type-def type-id='type-id-11' size-in-bits='64' id='type-id-22'/>
+    <type-decl name='int' size-in-bits='32' id='type-id-11'/>
+    <type-decl name='void' id='type-id-12'/>
+    <typedef-decl name='GLint' type-id='type-id-11' filepath='../../../include/GL/gl.h' line='155' column='1' id='type-id-60'/>
+    <typedef-decl name='GLsizei' type-id='type-id-11' filepath='../../../include/GL/gl.h' line='159' column='1' id='type-id-404'/>
+    <pointer-type-def type-id='type-id-12' size-in-bits='64' id='type-id-25'/>
     <function-decl name='gluBuild3DMipmaps' mangled-name='gluBuild3DMipmaps' filepath='libutil/mipmap.c' line='8482' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gluBuild3DMipmaps'>
-      <parameter type-id='type-id-25' name='target' filepath='libutil/mipmap.c' line='8482' column='1'/>
+      <parameter type-id='type-id-28' name='target' filepath='libutil/mipmap.c' line='8482' column='1'/>
       <parameter type-id='type-id-60' name='internalFormat' filepath='libutil/mipmap.c' line='8482' column='1'/>
       <parameter type-id='type-id-404' name='width' filepath='libutil/mipmap.c' line='8483' column='1'/>
       <parameter type-id='type-id-404' name='height' filepath='libutil/mipmap.c' line='8483' column='1'/>
       <parameter type-id='type-id-404' name='depth' filepath='libutil/mipmap.c' line='8483' column='1'/>
-      <parameter type-id='type-id-25' name='format' filepath='libutil/mipmap.c' line='8484' column='1'/>
-      <parameter type-id='type-id-25' name='type' filepath='libutil/mipmap.c' line='8484' column='1'/>
-      <parameter type-id='type-id-22' name='data' filepath='libutil/mipmap.c' line='8484' column='1'/>
+      <parameter type-id='type-id-28' name='format' filepath='libutil/mipmap.c' line='8484' column='1'/>
+      <parameter type-id='type-id-28' name='type' filepath='libutil/mipmap.c' line='8484' column='1'/>
+      <parameter type-id='type-id-25' name='data' filepath='libutil/mipmap.c' line='8484' column='1'/>
       <return type-id='type-id-60'/>
     </function-decl>
     <function-decl name='gluBuild3DMipmapLevels' mangled-name='gluBuild3DMipmapLevels' filepath='libutil/mipmap.c' line='8444' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gluBuild3DMipmapLevels'>
-      <parameter type-id='type-id-25' name='target' filepath='libutil/mipmap.c' line='8444' column='1'/>
+      <parameter type-id='type-id-28' name='target' filepath='libutil/mipmap.c' line='8444' column='1'/>
       <parameter type-id='type-id-60' name='internalFormat' filepath='libutil/mipmap.c' line='8444' column='1'/>
       <parameter type-id='type-id-404' name='width' filepath='libutil/mipmap.c' line='8445' column='1'/>
       <parameter type-id='type-id-404' name='height' filepath='libutil/mipmap.c' line='8445' column='1'/>
       <parameter type-id='type-id-404' name='depth' filepath='libutil/mipmap.c' line='8445' column='1'/>
-      <parameter type-id='type-id-25' name='format' filepath='libutil/mipmap.c' line='8446' column='1'/>
-      <parameter type-id='type-id-25' name='type' filepath='libutil/mipmap.c' line='8446' column='1'/>
+      <parameter type-id='type-id-28' name='format' filepath='libutil/mipmap.c' line='8446' column='1'/>
+      <parameter type-id='type-id-28' name='type' filepath='libutil/mipmap.c' line='8446' column='1'/>
       <parameter type-id='type-id-60' name='userLevel' filepath='libutil/mipmap.c' line='8447' column='1'/>
       <parameter type-id='type-id-60' name='baseLevel' filepath='libutil/mipmap.c' line='8447' column='1'/>
       <parameter type-id='type-id-60' name='maxLevel' filepath='libutil/mipmap.c' line='8447' column='1'/>
-      <parameter type-id='type-id-22' name='data' filepath='libutil/mipmap.c' line='8448' column='1'/>
+      <parameter type-id='type-id-25' name='data' filepath='libutil/mipmap.c' line='8448' column='1'/>
       <return type-id='type-id-60'/>
     </function-decl>
     <function-decl name='gluScaleImage' mangled-name='gluScaleImage' filepath='libutil/mipmap.c' line='3498' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gluScaleImage'>
-      <parameter type-id='type-id-25' name='format' filepath='libutil/mipmap.c' line='3498' column='1'/>
+      <parameter type-id='type-id-28' name='format' filepath='libutil/mipmap.c' line='3498' column='1'/>
       <parameter type-id='type-id-404' name='widthin' filepath='libutil/mipmap.c' line='3498' column='1'/>
       <parameter type-id='type-id-404' name='heightin' filepath='libutil/mipmap.c' line='3498' column='1'/>
-      <parameter type-id='type-id-25' name='typein' filepath='libutil/mipmap.c' line='3499' column='1'/>
-      <parameter type-id='type-id-22' name='datain' filepath='libutil/mipmap.c' line='3499' column='1'/>
+      <parameter type-id='type-id-28' name='typein' filepath='libutil/mipmap.c' line='3499' column='1'/>
+      <parameter type-id='type-id-25' name='datain' filepath='libutil/mipmap.c' line='3499' column='1'/>
       <parameter type-id='type-id-404' name='widthout' filepath='libutil/mipmap.c' line='3500' column='1'/>
       <parameter type-id='type-id-404' name='heightout' filepath='libutil/mipmap.c' line='3500' column='1'/>
-      <parameter type-id='type-id-25' name='typeout' filepath='libutil/mipmap.c' line='3500' column='1'/>
-      <parameter type-id='type-id-22' name='dataout' filepath='libutil/mipmap.c' line='3501' column='1'/>
+      <parameter type-id='type-id-28' name='typeout' filepath='libutil/mipmap.c' line='3500' column='1'/>
+      <parameter type-id='type-id-25' name='dataout' filepath='libutil/mipmap.c' line='3501' column='1'/>
       <return type-id='type-id-60'/>
     </function-decl>
     <function-decl name='gluBuild1DMipmaps' mangled-name='gluBuild1DMipmaps' filepath='libutil/mipmap.c' line='3672' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gluBuild1DMipmaps'>
-      <parameter type-id='type-id-25' name='target' filepath='libutil/mipmap.c' line='3672' column='1'/>
+      <parameter type-id='type-id-28' name='target' filepath='libutil/mipmap.c' line='3672' column='1'/>
       <parameter type-id='type-id-60' name='internalFormat' filepath='libutil/mipmap.c' line='3672' column='1'/>
       <parameter type-id='type-id-404' name='width' filepath='libutil/mipmap.c' line='3672' column='1'/>
-      <parameter type-id='type-id-25' name='format' filepath='libutil/mipmap.c' line='3673' column='1'/>
-      <parameter type-id='type-id-25' name='type' filepath='libutil/mipmap.c' line='3673' column='1'/>
-      <parameter type-id='type-id-22' name='data' filepath='libutil/mipmap.c' line='3674' column='1'/>
+      <parameter type-id='type-id-28' name='format' filepath='libutil/mipmap.c' line='3673' column='1'/>
+      <parameter type-id='type-id-28' name='type' filepath='libutil/mipmap.c' line='3673' column='1'/>
+      <parameter type-id='type-id-25' name='data' filepath='libutil/mipmap.c' line='3674' column='1'/>
       <return type-id='type-id-60'/>
     </function-decl>
     <function-decl name='gluBuild1DMipmapLevels' mangled-name='gluBuild1DMipmapLevels' filepath='libutil/mipmap.c' line='3643' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gluBuild1DMipmapLevels'>
-      <parameter type-id='type-id-25' name='target' filepath='libutil/mipmap.c' line='3643' column='1'/>
+      <parameter type-id='type-id-28' name='target' filepath='libutil/mipmap.c' line='3643' column='1'/>
       <parameter type-id='type-id-60' name='internalFormat' filepath='libutil/mipmap.c' line='3643' column='1'/>
       <parameter type-id='type-id-404' name='width' filepath='libutil/mipmap.c' line='3644' column='1'/>
-      <parameter type-id='type-id-25' name='format' filepath='libutil/mipmap.c' line='3645' column='1'/>
-      <parameter type-id='type-id-25' name='type' filepath='libutil/mipmap.c' line='3645' column='1'/>
+      <parameter type-id='type-id-28' name='format' filepath='libutil/mipmap.c' line='3645' column='1'/>
+      <parameter type-id='type-id-28' name='type' filepath='libutil/mipmap.c' line='3645' column='1'/>
       <parameter type-id='type-id-60' name='userLevel' filepath='libutil/mipmap.c' line='3646' column='1'/>
       <parameter type-id='type-id-60' name='baseLevel' filepath='libutil/mipmap.c' line='3646' column='1'/>
       <parameter type-id='type-id-60' name='maxLevel' filepath='libutil/mipmap.c' line='3646' column='1'/>
-      <parameter type-id='type-id-22' name='data' filepath='libutil/mipmap.c' line='3647' column='1'/>
+      <parameter type-id='type-id-25' name='data' filepath='libutil/mipmap.c' line='3647' column='1'/>
       <return type-id='type-id-60'/>
     </function-decl>
     <function-decl name='gluBuild2DMipmaps' mangled-name='gluBuild2DMipmaps' filepath='libutil/mipmap.c' line='4584' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gluBuild2DMipmaps'>
-      <parameter type-id='type-id-25' name='target' filepath='libutil/mipmap.c' line='4584' column='1'/>
+      <parameter type-id='type-id-28' name='target' filepath='libutil/mipmap.c' line='4584' column='1'/>
       <parameter type-id='type-id-60' name='internalFormat' filepath='libutil/mipmap.c' line='4584' column='1'/>
       <parameter type-id='type-id-404' name='width' filepath='libutil/mipmap.c' line='4585' column='1'/>
       <parameter type-id='type-id-404' name='height' filepath='libutil/mipmap.c' line='4585' column='1'/>
-      <parameter type-id='type-id-25' name='format' filepath='libutil/mipmap.c' line='4586' column='1'/>
-      <parameter type-id='type-id-25' name='type' filepath='libutil/mipmap.c' line='4586' column='1'/>
-      <parameter type-id='type-id-22' name='data' filepath='libutil/mipmap.c' line='4587' column='1'/>
+      <parameter type-id='type-id-28' name='format' filepath='libutil/mipmap.c' line='4586' column='1'/>
+      <parameter type-id='type-id-28' name='type' filepath='libutil/mipmap.c' line='4586' column='1'/>
+      <parameter type-id='type-id-25' name='data' filepath='libutil/mipmap.c' line='4587' column='1'/>
       <return type-id='type-id-60'/>
     </function-decl>
     <function-decl name='gluBuild2DMipmapLevels' mangled-name='gluBuild2DMipmapLevels' filepath='libutil/mipmap.c' line='4552' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gluBuild2DMipmapLevels'>
-      <parameter type-id='type-id-25' name='target' filepath='libutil/mipmap.c' line='4552' column='1'/>
+      <parameter type-id='type-id-28' name='target' filepath='libutil/mipmap.c' line='4552' column='1'/>
       <parameter type-id='type-id-60' name='internalFormat' filepath='libutil/mipmap.c' line='4552' column='1'/>
       <parameter type-id='type-id-404' name='width' filepath='libutil/mipmap.c' line='4553' column='1'/>
       <parameter type-id='type-id-404' name='height' filepath='libutil/mipmap.c' line='4553' column='1'/>
-      <parameter type-id='type-id-25' name='format' filepath='libutil/mipmap.c' line='4554' column='1'/>
-      <parameter type-id='type-id-25' name='type' filepath='libutil/mipmap.c' line='4554' column='1'/>
+      <parameter type-id='type-id-28' name='format' filepath='libutil/mipmap.c' line='4554' column='1'/>
+      <parameter type-id='type-id-28' name='type' filepath='libutil/mipmap.c' line='4554' column='1'/>
       <parameter type-id='type-id-60' name='userLevel' filepath='libutil/mipmap.c' line='4555' column='1'/>
       <parameter type-id='type-id-60' name='baseLevel' filepath='libutil/mipmap.c' line='4555' column='1'/>
       <parameter type-id='type-id-60' name='maxLevel' filepath='libutil/mipmap.c' line='4555' column='1'/>
-      <parameter type-id='type-id-22' name='data' filepath='libutil/mipmap.c' line='4556' column='1'/>
+      <parameter type-id='type-id-25' name='data' filepath='libutil/mipmap.c' line='4556' column='1'/>
       <return type-id='type-id-60'/>
     </function-decl>
   </abi-instr>
@@ -9956,7 +9956,7 @@
       <parameter type-id='type-id-321' name='deltax' filepath='libutil/project.c' line='348' column='1'/>
       <parameter type-id='type-id-321' name='deltay' filepath='libutil/project.c' line='348' column='1'/>
       <parameter type-id='type-id-407' name='viewport' filepath='libutil/project.c' line='349' column='1'/>
-      <return type-id='type-id-11'/>
+      <return type-id='type-id-12'/>
     </function-decl>
     <function-decl name='gluLookAt' mangled-name='gluLookAt' filepath='libutil/project.c' line='108' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gluLookAt'>
       <parameter type-id='type-id-321' name='eyex' filepath='libutil/project.c' line='108' column='1'/>
@@ -9968,21 +9968,21 @@
       <parameter type-id='type-id-321' name='upx' filepath='libutil/project.c' line='109' column='1'/>
       <parameter type-id='type-id-321' name='upy' filepath='libutil/project.c' line='109' column='1'/>
       <parameter type-id='type-id-321' name='upz' filepath='libutil/project.c' line='110' column='1'/>
-      <return type-id='type-id-11'/>
+      <return type-id='type-id-12'/>
     </function-decl>
     <function-decl name='gluPerspective' mangled-name='gluPerspective' filepath='libutil/project.c' line='65' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gluPerspective'>
       <parameter type-id='type-id-321' name='fovy' filepath='libutil/project.c' line='65' column='1'/>
       <parameter type-id='type-id-321' name='aspect' filepath='libutil/project.c' line='65' column='1'/>
       <parameter type-id='type-id-321' name='zNear' filepath='libutil/project.c' line='65' column='1'/>
       <parameter type-id='type-id-321' name='zFar' filepath='libutil/project.c' line='65' column='1'/>
-      <return type-id='type-id-11'/>
+      <return type-id='type-id-12'/>
     </function-decl>
     <function-decl name='gluOrtho2D' mangled-name='gluOrtho2D' filepath='libutil/project.c' line='57' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gluOrtho2D'>
       <parameter type-id='type-id-321' name='left' filepath='libutil/project.c' line='57' column='1'/>
       <parameter type-id='type-id-321' name='right' filepath='libutil/project.c' line='57' column='1'/>
       <parameter type-id='type-id-321' name='bottom' filepath='libutil/project.c' line='57' column='1'/>
       <parameter type-id='type-id-321' name='top' filepath='libutil/project.c' line='57' column='1'/>
-      <return type-id='type-id-11'/>
+      <return type-id='type-id-12'/>
     </function-decl>
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='libutil/quad.c' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-T0fsxk/Mesa-8.0.5/src/glu/sgi' language='LANG_C99'>
@@ -10005,42 +10005,42 @@
       </data-member>
     </class-decl>
     <typedef-decl name='GLboolean' type-id='type-id-400' filepath='../../../include/GL/gl.h' line='150' column='1' id='type-id-42'/>
-    <typedef-decl name='_GLUfuncptr' type-id='type-id-17' filepath='../../../include/GL/glu.h' line='287' column='1' id='type-id-26'/>
+    <typedef-decl name='_GLUfuncptr' type-id='type-id-20' filepath='../../../include/GL/glu.h' line='287' column='1' id='type-id-29'/>
     <pointer-type-def type-id='type-id-412' size-in-bits='64' id='type-id-414'/>
-    <pointer-type-def type-id='type-id-415' size-in-bits='64' id='type-id-17'/>
+    <pointer-type-def type-id='type-id-415' size-in-bits='64' id='type-id-20'/>
     <pointer-type-def type-id='type-id-416' size-in-bits='64' id='type-id-413'/>
     <function-decl name='gluQuadricCallback' mangled-name='gluQuadricCallback' filepath='libutil/quad.c' line='86' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gluQuadricCallback'>
       <parameter type-id='type-id-414' name='qobj' filepath='libutil/quad.c' line='86' column='1'/>
-      <parameter type-id='type-id-25' name='which' filepath='libutil/quad.c' line='86' column='1'/>
-      <parameter type-id='type-id-26' name='fn' filepath='libutil/quad.c' line='86' column='1'/>
-      <return type-id='type-id-11'/>
+      <parameter type-id='type-id-28' name='which' filepath='libutil/quad.c' line='86' column='1'/>
+      <parameter type-id='type-id-29' name='fn' filepath='libutil/quad.c' line='86' column='1'/>
+      <return type-id='type-id-12'/>
     </function-decl>
     <function-decl name='gluQuadricNormals' mangled-name='gluQuadricNormals' filepath='libutil/quad.c' line='99' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gluQuadricNormals'>
       <parameter type-id='type-id-414' name='qobj' filepath='libutil/quad.c' line='99' column='1'/>
-      <parameter type-id='type-id-25' name='normals' filepath='libutil/quad.c' line='99' column='1'/>
-      <return type-id='type-id-11'/>
+      <parameter type-id='type-id-28' name='normals' filepath='libutil/quad.c' line='99' column='1'/>
+      <return type-id='type-id-12'/>
     </function-decl>
     <function-decl name='gluQuadricTexture' mangled-name='gluQuadricTexture' filepath='libutil/quad.c' line='114' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gluQuadricTexture'>
       <parameter type-id='type-id-414' name='qobj' filepath='libutil/quad.c' line='114' column='1'/>
       <parameter type-id='type-id-42' name='textureCoords' filepath='libutil/quad.c' line='114' column='1'/>
-      <return type-id='type-id-11'/>
+      <return type-id='type-id-12'/>
     </function-decl>
     <function-decl name='gluQuadricOrientation' mangled-name='gluQuadricOrientation' filepath='libutil/quad.c' line='120' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gluQuadricOrientation'>
       <parameter type-id='type-id-414' name='qobj' filepath='libutil/quad.c' line='120' column='1'/>
-      <parameter type-id='type-id-25' name='orientation' filepath='libutil/quad.c' line='120' column='1'/>
-      <return type-id='type-id-11'/>
+      <parameter type-id='type-id-28' name='orientation' filepath='libutil/quad.c' line='120' column='1'/>
+      <return type-id='type-id-12'/>
     </function-decl>
     <function-decl name='gluQuadricDrawStyle' mangled-name='gluQuadricDrawStyle' filepath='libutil/quad.c' line='134' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gluQuadricDrawStyle'>
       <parameter type-id='type-id-414' name='qobj' filepath='libutil/quad.c' line='134' column='1'/>
-      <parameter type-id='type-id-25' name='drawStyle' filepath='libutil/quad.c' line='134' column='1'/>
-      <return type-id='type-id-11'/>
+      <parameter type-id='type-id-28' name='drawStyle' filepath='libutil/quad.c' line='134' column='1'/>
+      <return type-id='type-id-12'/>
     </function-decl>
     <function-decl name='gluSphere' mangled-name='gluSphere' filepath='libutil/quad.c' line='694' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gluSphere'>
       <parameter type-id='type-id-414' name='qobj' filepath='libutil/quad.c' line='694' column='1'/>
       <parameter type-id='type-id-321' name='radius' filepath='libutil/quad.c' line='694' column='1'/>
       <parameter type-id='type-id-60' name='slices' filepath='libutil/quad.c' line='694' column='1'/>
       <parameter type-id='type-id-60' name='stacks' filepath='libutil/quad.c' line='694' column='1'/>
-      <return type-id='type-id-11'/>
+      <return type-id='type-id-12'/>
     </function-decl>
     <function-decl name='gluPartialDisk' mangled-name='gluPartialDisk' filepath='libutil/quad.c' line='431' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gluPartialDisk'>
       <parameter type-id='type-id-414' name='qobj' filepath='libutil/quad.c' line='431' column='1'/>
@@ -10050,7 +10050,7 @@
       <parameter type-id='type-id-60' name='loops' filepath='libutil/quad.c' line='432' column='1'/>
       <parameter type-id='type-id-321' name='startAngle' filepath='libutil/quad.c' line='433' column='1'/>
       <parameter type-id='type-id-321' name='sweepAngle' filepath='libutil/quad.c' line='433' column='1'/>
-      <return type-id='type-id-11'/>
+      <return type-id='type-id-12'/>
     </function-decl>
     <function-decl name='gluDisk' mangled-name='gluDisk' filepath='libutil/quad.c' line='424' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gluDisk'>
       <parameter type-id='type-id-414' name='qobj' filepath='libutil/quad.c' line='424' column='1'/>
@@ -10058,7 +10058,7 @@
       <parameter type-id='type-id-321' name='outerRadius' filepath='libutil/quad.c' line='424' column='1'/>
       <parameter type-id='type-id-60' name='slices' filepath='libutil/quad.c' line='425' column='1'/>
       <parameter type-id='type-id-60' name='loops' filepath='libutil/quad.c' line='425' column='1'/>
-      <return type-id='type-id-11'/>
+      <return type-id='type-id-12'/>
     </function-decl>
     <function-decl name='gluCylinder' mangled-name='gluCylinder' filepath='libutil/quad.c' line='150' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gluCylinder'>
       <parameter type-id='type-id-414' name='qobj' filepath='libutil/quad.c' line='150' column='1'/>
@@ -10067,26 +10067,26 @@
       <parameter type-id='type-id-321' name='height' filepath='libutil/quad.c' line='151' column='1'/>
       <parameter type-id='type-id-60' name='slices' filepath='libutil/quad.c' line='151' column='1'/>
       <parameter type-id='type-id-60' name='stacks' filepath='libutil/quad.c' line='151' column='1'/>
-      <return type-id='type-id-11'/>
+      <return type-id='type-id-12'/>
     </function-decl>
     <function-decl name='gluDeleteQuadric' mangled-name='gluDeleteQuadric' filepath='libutil/quad.c' line='73' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gluDeleteQuadric'>
       <parameter type-id='type-id-414' name='state' filepath='libutil/quad.c' line='73' column='1'/>
-      <return type-id='type-id-11'/>
+      <return type-id='type-id-12'/>
     </function-decl>
     <function-decl name='gluNewQuadric' mangled-name='gluNewQuadric' filepath='libutil/quad.c' line='54' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gluNewQuadric'>
       <return type-id='type-id-414'/>
     </function-decl>
     <function-type size-in-bits='64' id='type-id-415'>
-      <return type-id='type-id-11'/>
+      <return type-id='type-id-12'/>
     </function-type>
     <function-type size-in-bits='64' id='type-id-416'>
       <parameter type-id='type-id-60'/>
-      <return type-id='type-id-11'/>
+      <return type-id='type-id-12'/>
     </function-type>
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='libutil/registry.c' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-T0fsxk/Mesa-8.0.5/src/glu/sgi' language='LANG_C99'>
     <function-decl name='gluGetString' mangled-name='gluGetString' filepath='libutil/registry.c' line='44' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gluGetString'>
-      <parameter type-id='type-id-25' name='name' filepath='libutil/registry.c' line='44' column='1'/>
+      <parameter type-id='type-id-28' name='name' filepath='libutil/registry.c' line='44' column='1'/>
       <return type-id='type-id-403'/>
     </function-decl>
     <function-decl name='gluCheckExtension' mangled-name='gluCheckExtension' filepath='libutil/registry.c' line='63' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gluCheckExtension'>
diff --git a/tests/data/test-read-dwarf/test19-pr19023-libtcmalloc_and_profiler.so.abi b/tests/data/test-read-dwarf/test19-pr19023-libtcmalloc_and_profiler.so.abi
index 825ca410..3e39ab55 100644
--- a/tests/data/test-read-dwarf/test19-pr19023-libtcmalloc_and_profiler.so.abi
+++ b/tests/data/test-read-dwarf/test19-pr19023-libtcmalloc_and_profiler.so.abi
@@ -2992,7 +2992,7 @@
         </class-decl>
       </member-type>
       <member-type access='private'>
-        <class-decl name='Allocator' size-in-bits='8' is-struct='yes' visibility='default' filepath='src/heap-checker.cc' line='292' column='1' is-declaration-only='yes' id='type-id-247'>
+        <class-decl name='Allocator' size-in-bits='8' is-struct='yes' visibility='default' filepath='src/heap-checker.cc' line='292' column='1' id='type-id-247'>
           <data-member access='private' static='yes'>
             <var-decl name='arena_' type-id='type-id-74' mangled-name='_ZN15HeapLeakChecker9Allocator6arena_E' visibility='default' filepath='src/heap-checker.cc' line='333' column='1' elf-symbol-id='_ZN15HeapLeakChecker9Allocator6arena_E'/>
           </data-member>
@@ -14723,266 +14723,40 @@
     <function-decl name='MallocExtension_VerifyAllMemory' mangled-name='MallocExtension_VerifyAllMemory' filepath='src/malloc_extension.cc' line='351' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='MallocExtension_VerifyAllMemory'>
       <return type-id='type-id-1'/>
     </function-decl>
-    <class-decl name='MallocExtension' size-in-bits='64' visibility='default' filepath='src/gperftools/malloc_extension.h' line='90' column='1' is-declaration-only='yes' id='type-id-894'>
-      <member-type access='private'>
-        <enum-decl name='Ownership' filepath='./src/gperftools/malloc_extension.h' line='315' column='1' id='type-id-898'>
-          <underlying-type type-id='type-id-133'/>
-          <enumerator name='kUnknownOwnership' value='0'/>
-          <enumerator name='kOwned' value='1'/>
-          <enumerator name='kNotOwned' value='2'/>
-        </enum-decl>
-      </member-type>
-      <member-type access='private'>
-        <class-decl name='FreeListInfo' size-in-bits='256' is-struct='yes' visibility='default' filepath='./src/gperftools/malloc_extension.h' line='333' column='1' id='type-id-899'>
-          <data-member access='public' layout-offset-in-bits='0'>
-            <var-decl name='min_object_size' type-id='type-id-57' visibility='default' filepath='./src/gperftools/malloc_extension.h' line='334' column='1'/>
-          </data-member>
-          <data-member access='public' layout-offset-in-bits='64'>
-            <var-decl name='max_object_size' type-id='type-id-57' visibility='default' filepath='./src/gperftools/malloc_extension.h' line='335' column='1'/>
-          </data-member>
-          <data-member access='public' layout-offset-in-bits='128'>
-            <var-decl name='total_bytes_free' type-id='type-id-57' visibility='default' filepath='./src/gperftools/malloc_extension.h' line='336' column='1'/>
-          </data-member>
-          <data-member access='public' layout-offset-in-bits='192'>
-            <var-decl name='type' type-id='type-id-52' visibility='default' filepath='./src/gperftools/malloc_extension.h' line='337' column='1'/>
-          </data-member>
-        </class-decl>
-      </member-type>
-      <member-type access='private'>
-        <typedef-decl name='RangeFunction' type-id='type-id-900' filepath='src/gperftools/malloc_extension.h' line='143' column='1' id='type-id-895'/>
-      </member-type>
-      <member-function access='private' static='yes'>
-        <function-decl name='Initialize' mangled-name='_ZN15MallocExtension10InitializeEv' filepath='src/malloc_extension.cc' line='79' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN15MallocExtension10InitializeEv'>
-          <return type-id='type-id-56'/>
-        </function-decl>
-      </member-function>
-      <member-function access='private' static='yes'>
-        <function-decl name='instance' mangled-name='_ZN15MallocExtension8instanceEv' filepath='src/malloc_extension.cc' line='212' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN15MallocExtension8instanceEv'>
-          <return type-id='type-id-259'/>
-        </function-decl>
-      </member-function>
-      <member-function access='private'>
-        <function-decl name='Register' mangled-name='_ZN15MallocExtension8RegisterEPS_' filepath='src/malloc_extension.cc' line='217' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN15MallocExtension8RegisterEPS_'>
-          <parameter type-id='type-id-259' is-artificial='yes'/>
-          <return type-id='type-id-56'/>
-        </function-decl>
-      </member-function>
-      <member-function access='private' destructor='yes' vtable-offset='-1'>
-        <function-decl name='~MallocExtension' mangled-name='_ZN15MallocExtensionD1Ev' filepath='src/malloc_extension.cc' line='111' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN15MallocExtensionD1Ev'>
-          <parameter type-id='type-id-259' is-artificial='yes'/>
-          <parameter type-id='type-id-1' is-artificial='yes'/>
-          <return type-id='type-id-56'/>
-        </function-decl>
-      </member-function>
-      <member-function access='private' vtable-offset='2'>
-        <function-decl name='VerifyAllMemory' mangled-name='_ZN15MallocExtension15VerifyAllMemoryEv' filepath='src/malloc_extension.cc' line='112' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN15MallocExtension15VerifyAllMemoryEv'>
-          <parameter type-id='type-id-259' is-artificial='yes'/>
-          <return type-id='type-id-55'/>
-        </function-decl>
-      </member-function>
-      <member-function access='private' vtable-offset='3'>
-        <function-decl name='VerifyNewMemory' mangled-name='_ZN15MallocExtension15VerifyNewMemoryEPKv' filepath='src/malloc_extension.cc' line='113' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN15MallocExtension15VerifyNewMemoryEPKv'>
-          <parameter type-id='type-id-259' is-artificial='yes'/>
-          <parameter type-id='type-id-53'/>
-          <return type-id='type-id-55'/>
-        </function-decl>
-      </member-function>
-      <member-function access='private' vtable-offset='4'>
-        <function-decl name='VerifyArrayNewMemory' mangled-name='_ZN15MallocExtension20VerifyArrayNewMemoryEPKv' filepath='src/malloc_extension.cc' line='114' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN15MallocExtension20VerifyArrayNewMemoryEPKv'>
-          <parameter type-id='type-id-259' is-artificial='yes'/>
-          <parameter type-id='type-id-53'/>
-          <return type-id='type-id-55'/>
-        </function-decl>
-      </member-function>
-      <member-function access='private' vtable-offset='5'>
-        <function-decl name='VerifyMallocMemory' mangled-name='_ZN15MallocExtension18VerifyMallocMemoryEPKv' filepath='src/malloc_extension.cc' line='115' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN15MallocExtension18VerifyMallocMemoryEPKv'>
-          <parameter type-id='type-id-259' is-artificial='yes'/>
-          <parameter type-id='type-id-53'/>
-          <return type-id='type-id-55'/>
-        </function-decl>
-      </member-function>
-      <member-function access='private' vtable-offset='6'>
-        <function-decl name='MallocMemoryStats' mangled-name='_ZN15MallocExtension17MallocMemoryStatsEPiPmS0_' filepath='src/malloc_extension.cc' line='130' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN15MallocExtension17MallocMemoryStatsEPiPmS0_'>
-          <parameter type-id='type-id-259' is-artificial='yes'/>
-          <parameter type-id='type-id-897'/>
-          <parameter type-id='type-id-230'/>
-          <parameter type-id='type-id-897'/>
-          <return type-id='type-id-55'/>
-        </function-decl>
-      </member-function>
-      <member-function access='private' vtable-offset='7'>
-        <function-decl name='GetStats' mangled-name='_ZN15MallocExtension8GetStatsEPci' filepath='src/malloc_extension.cc' line='125' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN15MallocExtension8GetStatsEPci'>
-          <parameter type-id='type-id-259' is-artificial='yes'/>
-          <parameter type-id='type-id-90'/>
-          <parameter type-id='type-id-1'/>
-          <return type-id='type-id-56'/>
-        </function-decl>
-      </member-function>
-      <member-function access='private' vtable-offset='8'>
-        <function-decl name='GetHeapSample' mangled-name='_ZN15MallocExtension13GetHeapSampleEPSs' filepath='src/malloc_extension.cc' line='292' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN15MallocExtension13GetHeapSampleEPSs'>
-          <parameter type-id='type-id-259' is-artificial='yes'/>
-          <parameter type-id='type-id-901'/>
-          <return type-id='type-id-56'/>
-        </function-decl>
-      </member-function>
-      <member-function access='private' vtable-offset='9'>
-        <function-decl name='GetHeapGrowthStacks' mangled-name='_ZN15MallocExtension19GetHeapGrowthStacksEPSs' filepath='src/malloc_extension.cc' line='316' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN15MallocExtension19GetHeapGrowthStacksEPSs'>
-          <parameter type-id='type-id-259' is-artificial='yes'/>
-          <parameter type-id='type-id-901'/>
-          <return type-id='type-id-56'/>
-        </function-decl>
-      </member-function>
-      <member-function access='private' vtable-offset='10'>
-        <function-decl name='Ranges' mangled-name='_ZN15MallocExtension6RangesEPvPFvS0_PKN4base11MallocRangeEE' filepath='src/malloc_extension.cc' line='340' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN15MallocExtension6RangesEPvPFvS0_PKN4base11MallocRangeEE'>
-          <parameter type-id='type-id-259' is-artificial='yes'/>
-          <parameter type-id='type-id-53'/>
-          <parameter type-id='type-id-896'/>
-          <return type-id='type-id-56'/>
-        </function-decl>
-      </member-function>
-      <member-function access='private' vtable-offset='11'>
-        <function-decl name='GetNumericProperty' mangled-name='_ZN15MallocExtension18GetNumericPropertyEPKcPm' filepath='src/malloc_extension.cc' line='117' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN15MallocExtension18GetNumericPropertyEPKcPm'>
-          <parameter type-id='type-id-259' is-artificial='yes'/>
-          <parameter type-id='type-id-52'/>
-          <parameter type-id='type-id-230'/>
-          <return type-id='type-id-55'/>
-        </function-decl>
-      </member-function>
-      <member-function access='private' vtable-offset='12'>
-        <function-decl name='SetNumericProperty' mangled-name='_ZN15MallocExtension18SetNumericPropertyEPKcm' filepath='src/malloc_extension.cc' line='121' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN15MallocExtension18SetNumericPropertyEPKcm'>
-          <parameter type-id='type-id-259' is-artificial='yes'/>
-          <parameter type-id='type-id-52'/>
-          <parameter type-id='type-id-57'/>
-          <return type-id='type-id-55'/>
-        </function-decl>
-      </member-function>
-      <member-function access='private' vtable-offset='13'>
-        <function-decl name='MarkThreadIdle' mangled-name='_ZN15MallocExtension14MarkThreadIdleEv' filepath='src/malloc_extension.cc' line='146' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN15MallocExtension14MarkThreadIdleEv'>
-          <parameter type-id='type-id-259' is-artificial='yes'/>
-          <return type-id='type-id-56'/>
-        </function-decl>
-      </member-function>
-      <member-function access='private' vtable-offset='14'>
-        <function-decl name='MarkThreadBusy' mangled-name='_ZN15MallocExtension14MarkThreadBusyEv' filepath='src/malloc_extension.cc' line='150' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN15MallocExtension14MarkThreadBusyEv'>
-          <parameter type-id='type-id-259' is-artificial='yes'/>
-          <return type-id='type-id-56'/>
-        </function-decl>
-      </member-function>
-      <member-function access='private' vtable-offset='15'>
-        <function-decl name='GetSystemAllocator' mangled-name='_ZN15MallocExtension18GetSystemAllocatorEv' filepath='src/malloc_extension.cc' line='154' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN15MallocExtension18GetSystemAllocatorEv'>
-          <parameter type-id='type-id-259' is-artificial='yes'/>
-          <return type-id='type-id-902'/>
-        </function-decl>
-      </member-function>
-      <member-function access='private' vtable-offset='16'>
-        <function-decl name='SetSystemAllocator' mangled-name='_ZN15MallocExtension18SetSystemAllocatorEP12SysAllocator' filepath='src/malloc_extension.cc' line='158' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN15MallocExtension18SetSystemAllocatorEP12SysAllocator'>
-          <parameter type-id='type-id-259' is-artificial='yes'/>
-          <parameter type-id='type-id-902'/>
-          <return type-id='type-id-56'/>
-        </function-decl>
-      </member-function>
-      <member-function access='private' vtable-offset='17'>
-        <function-decl name='ReleaseToSystem' mangled-name='_ZN15MallocExtension15ReleaseToSystemEm' filepath='src/malloc_extension.cc' line='162' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN15MallocExtension15ReleaseToSystemEm'>
-          <parameter type-id='type-id-259' is-artificial='yes'/>
-          <parameter type-id='type-id-57'/>
-          <return type-id='type-id-56'/>
-        </function-decl>
-      </member-function>
-      <member-function access='private' vtable-offset='18'>
-        <function-decl name='ReleaseFreeMemory' mangled-name='_ZN15MallocExtension17ReleaseFreeMemoryEv' filepath='src/malloc_extension.cc' line='166' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN15MallocExtension17ReleaseFreeMemoryEv'>
-          <parameter type-id='type-id-259' is-artificial='yes'/>
-          <return type-id='type-id-56'/>
-        </function-decl>
-      </member-function>
-      <member-function access='private' vtable-offset='19'>
-        <function-decl name='SetMemoryReleaseRate' mangled-name='_ZN15MallocExtension20SetMemoryReleaseRateEd' filepath='src/malloc_extension.cc' line='170' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN15MallocExtension20SetMemoryReleaseRateEd'>
-          <parameter type-id='type-id-259' is-artificial='yes'/>
-          <parameter type-id='type-id-2'/>
-          <return type-id='type-id-56'/>
-        </function-decl>
-      </member-function>
-      <member-function access='private' vtable-offset='20'>
-        <function-decl name='GetMemoryReleaseRate' mangled-name='_ZN15MallocExtension20GetMemoryReleaseRateEv' filepath='src/malloc_extension.cc' line='174' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN15MallocExtension20GetMemoryReleaseRateEv'>
-          <parameter type-id='type-id-259' is-artificial='yes'/>
-          <return type-id='type-id-2'/>
-        </function-decl>
-      </member-function>
-      <member-function access='private' vtable-offset='21'>
-        <function-decl name='GetEstimatedAllocatedSize' mangled-name='_ZN15MallocExtension25GetEstimatedAllocatedSizeEm' filepath='src/malloc_extension.cc' line='178' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN15MallocExtension25GetEstimatedAllocatedSizeEm'>
-          <parameter type-id='type-id-259' is-artificial='yes'/>
-          <parameter type-id='type-id-57'/>
-          <return type-id='type-id-57'/>
-        </function-decl>
-      </member-function>
-      <member-function access='private' vtable-offset='22'>
-        <function-decl name='GetAllocatedSize' mangled-name='_ZN15MallocExtension16GetAllocatedSizeEPKv' filepath='src/malloc_extension.cc' line='182' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN15MallocExtension16GetAllocatedSizeEPKv'>
-          <parameter type-id='type-id-259' is-artificial='yes'/>
-          <parameter type-id='type-id-53'/>
-          <return type-id='type-id-57'/>
-        </function-decl>
-      </member-function>
-      <member-function access='private' vtable-offset='23'>
-        <function-decl name='GetOwnership' mangled-name='_ZN15MallocExtension12GetOwnershipEPKv' filepath='src/malloc_extension.cc' line='187' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN15MallocExtension12GetOwnershipEPKv'>
-          <parameter type-id='type-id-259' is-artificial='yes'/>
-          <parameter type-id='type-id-53'/>
-          <return type-id='type-id-898'/>
-        </function-decl>
-      </member-function>
-      <member-function access='private' vtable-offset='24'>
-        <function-decl name='GetFreeListSizes' mangled-name='_ZN15MallocExtension16GetFreeListSizesEPSt6vectorINS_12FreeListInfoESaIS1_EE' filepath='src/malloc_extension.cc' line='191' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN15MallocExtension16GetFreeListSizesEPSt6vectorINS_12FreeListInfoESaIS1_EE'>
-          <parameter type-id='type-id-259' is-artificial='yes'/>
-          <parameter type-id='type-id-903'/>
-          <return type-id='type-id-56'/>
-        </function-decl>
-      </member-function>
-      <member-function access='private' vtable-offset='25'>
-        <function-decl name='ReadStackTraces' mangled-name='_ZN15MallocExtension15ReadStackTracesEPi' filepath='src/malloc_extension.cc' line='138' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN15MallocExtension15ReadStackTracesEPi'>
-          <parameter type-id='type-id-259' is-artificial='yes'/>
-          <parameter type-id='type-id-897'/>
-          <return type-id='type-id-120'/>
-        </function-decl>
-      </member-function>
-      <member-function access='private' vtable-offset='26'>
-        <function-decl name='ReadHeapGrowthStackTraces' mangled-name='_ZN15MallocExtension25ReadHeapGrowthStackTracesEv' filepath='src/malloc_extension.cc' line='142' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN15MallocExtension25ReadHeapGrowthStackTracesEv'>
-          <parameter type-id='type-id-259' is-artificial='yes'/>
-          <return type-id='type-id-120'/>
-        </function-decl>
-      </member-function>
-    </class-decl>
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='src/malloc_hook.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-kFgaKP/gperftools-2.4' language='LANG_C_plus_plus'>
-    <typedef-decl name='MallocHook_PreMmapHook' type-id='type-id-904' filepath='./src/gperftools/malloc_hook_c.h' line='87' column='1' id='type-id-905'/>
-    <typedef-decl name='MallocHook_MmapReplacement' type-id='type-id-906' filepath='./src/gperftools/malloc_hook_c.h' line='111' column='1' id='type-id-907'/>
-    <typedef-decl name='MallocHook_MunmapReplacement' type-id='type-id-908' filepath='./src/gperftools/malloc_hook_c.h' line='123' column='1' id='type-id-909'/>
-    <typedef-decl name='MallocHook_MunmapHook' type-id='type-id-363' filepath='./src/gperftools/malloc_hook_c.h' line='115' column='1' id='type-id-910'/>
-    <typedef-decl name='MallocHook_MremapHook' type-id='type-id-911' filepath='./src/gperftools/malloc_hook_c.h' line='132' column='1' id='type-id-912'/>
-    <typedef-decl name='MallocHook_PreSbrkHook' type-id='type-id-913' filepath='./src/gperftools/malloc_hook_c.h' line='138' column='1' id='type-id-914'/>
+    <typedef-decl name='MallocHook_PreMmapHook' type-id='type-id-898' filepath='./src/gperftools/malloc_hook_c.h' line='87' column='1' id='type-id-899'/>
+    <typedef-decl name='MallocHook_MmapReplacement' type-id='type-id-900' filepath='./src/gperftools/malloc_hook_c.h' line='111' column='1' id='type-id-901'/>
+    <typedef-decl name='MallocHook_MunmapReplacement' type-id='type-id-902' filepath='./src/gperftools/malloc_hook_c.h' line='123' column='1' id='type-id-903'/>
+    <typedef-decl name='MallocHook_MunmapHook' type-id='type-id-363' filepath='./src/gperftools/malloc_hook_c.h' line='115' column='1' id='type-id-904'/>
+    <typedef-decl name='MallocHook_MremapHook' type-id='type-id-905' filepath='./src/gperftools/malloc_hook_c.h' line='132' column='1' id='type-id-906'/>
+    <typedef-decl name='MallocHook_PreSbrkHook' type-id='type-id-907' filepath='./src/gperftools/malloc_hook_c.h' line='138' column='1' id='type-id-908'/>
+    <pointer-type-def type-id='type-id-909' size-in-bits='64' id='type-id-910'/>
+    <pointer-type-def type-id='type-id-911' size-in-bits='64' id='type-id-912'/>
+    <pointer-type-def type-id='type-id-913' size-in-bits='64' id='type-id-914'/>
     <pointer-type-def type-id='type-id-915' size-in-bits='64' id='type-id-916'/>
     <pointer-type-def type-id='type-id-917' size-in-bits='64' id='type-id-918'/>
+    <qualified-type-def type-id='type-id-909' const='yes' id='type-id-919'/>
     <pointer-type-def type-id='type-id-919' size-in-bits='64' id='type-id-920'/>
+    <qualified-type-def type-id='type-id-911' const='yes' id='type-id-921'/>
     <pointer-type-def type-id='type-id-921' size-in-bits='64' id='type-id-922'/>
+    <qualified-type-def type-id='type-id-913' const='yes' id='type-id-923'/>
     <pointer-type-def type-id='type-id-923' size-in-bits='64' id='type-id-924'/>
     <qualified-type-def type-id='type-id-915' const='yes' id='type-id-925'/>
     <pointer-type-def type-id='type-id-925' size-in-bits='64' id='type-id-926'/>
     <qualified-type-def type-id='type-id-917' const='yes' id='type-id-927'/>
     <pointer-type-def type-id='type-id-927' size-in-bits='64' id='type-id-928'/>
-    <qualified-type-def type-id='type-id-919' const='yes' id='type-id-929'/>
-    <pointer-type-def type-id='type-id-929' size-in-bits='64' id='type-id-930'/>
-    <qualified-type-def type-id='type-id-921' const='yes' id='type-id-931'/>
-    <pointer-type-def type-id='type-id-931' size-in-bits='64' id='type-id-932'/>
-    <qualified-type-def type-id='type-id-923' const='yes' id='type-id-933'/>
-    <pointer-type-def type-id='type-id-933' size-in-bits='64' id='type-id-934'/>
-    <pointer-type-def type-id='type-id-935' size-in-bits='64' id='type-id-908'/>
-    <pointer-type-def type-id='type-id-908' size-in-bits='64' id='type-id-936'/>
-    <pointer-type-def type-id='type-id-937' size-in-bits='64' id='type-id-906'/>
-    <pointer-type-def type-id='type-id-906' size-in-bits='64' id='type-id-938'/>
-    <pointer-type-def type-id='type-id-939' size-in-bits='64' id='type-id-913'/>
-    <pointer-type-def type-id='type-id-913' size-in-bits='64' id='type-id-940'/>
-    <pointer-type-def type-id='type-id-941' size-in-bits='64' id='type-id-904'/>
-    <pointer-type-def type-id='type-id-904' size-in-bits='64' id='type-id-942'/>
-    <pointer-type-def type-id='type-id-943' size-in-bits='64' id='type-id-911'/>
-    <pointer-type-def type-id='type-id-911' size-in-bits='64' id='type-id-944'/>
-    <pointer-type-def type-id='type-id-945' size-in-bits='64' id='type-id-946'/>
+    <pointer-type-def type-id='type-id-929' size-in-bits='64' id='type-id-902'/>
+    <pointer-type-def type-id='type-id-902' size-in-bits='64' id='type-id-930'/>
+    <pointer-type-def type-id='type-id-931' size-in-bits='64' id='type-id-900'/>
+    <pointer-type-def type-id='type-id-900' size-in-bits='64' id='type-id-932'/>
+    <pointer-type-def type-id='type-id-933' size-in-bits='64' id='type-id-907'/>
+    <pointer-type-def type-id='type-id-907' size-in-bits='64' id='type-id-934'/>
+    <pointer-type-def type-id='type-id-935' size-in-bits='64' id='type-id-898'/>
+    <pointer-type-def type-id='type-id-898' size-in-bits='64' id='type-id-936'/>
+    <pointer-type-def type-id='type-id-937' size-in-bits='64' id='type-id-905'/>
+    <pointer-type-def type-id='type-id-905' size-in-bits='64' id='type-id-938'/>
+    <pointer-type-def type-id='type-id-939' size-in-bits='64' id='type-id-940'/>
     <namespace-decl name='std'>
       <function-decl name='__copy_move_a&lt;false, void**, void**&gt;' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_algobase.h' line='386' column='1' visibility='default' binding='global' size-in-bits='64'>
         <parameter type-id='type-id-120'/>
@@ -15005,7 +14779,7 @@
     </namespace-decl>
     <namespace-decl name='base'>
       <namespace-decl name='internal'>
-        <class-decl name='HookList&lt;void (*)(const void*, size_t, int, int, int, off_t)&gt;' size-in-bits='576' is-struct='yes' visibility='default' filepath='src/malloc_hook-inl.h' line='59' column='1' id='type-id-921'>
+        <class-decl name='HookList&lt;void (*)(const void*, size_t, int, int, int, off_t)&gt;' size-in-bits='576' is-struct='yes' visibility='default' filepath='src/malloc_hook-inl.h' line='59' column='1' id='type-id-915'>
           <data-member access='public' layout-offset-in-bits='0'>
             <var-decl name='priv_end' type-id='type-id-781' visibility='default' filepath='src/malloc_hook-inl.h' line='101' column='1'/>
           </data-member>
@@ -15014,53 +14788,53 @@
           </data-member>
           <member-function access='public'>
             <function-decl name='Add' mangled-name='_ZN4base8internal8HookListIPFvPKvmiiilEE3AddES5_' filepath='src/malloc_hook-inl.h' line='65' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-922' is-artificial='yes'/>
-              <parameter type-id='type-id-904'/>
+              <parameter type-id='type-id-916' is-artificial='yes'/>
+              <parameter type-id='type-id-898'/>
               <return type-id='type-id-55'/>
             </function-decl>
           </member-function>
           <member-function access='public'>
             <function-decl name='FixupPrivEndLocked' mangled-name='_ZN4base8internal8HookListIPFvPKvmiiilEE18FixupPrivEndLockedEv' filepath='src/malloc_hook-inl.h' line='67' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-922' is-artificial='yes'/>
+              <parameter type-id='type-id-916' is-artificial='yes'/>
               <return type-id='type-id-56'/>
             </function-decl>
           </member-function>
           <member-function access='public'>
             <function-decl name='Remove' mangled-name='_ZN4base8internal8HookListIPFvPKvmiiilEE6RemoveES5_' filepath='src/malloc_hook-inl.h' line='72' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-922' is-artificial='yes'/>
-              <parameter type-id='type-id-904'/>
+              <parameter type-id='type-id-916' is-artificial='yes'/>
+              <parameter type-id='type-id-898'/>
               <return type-id='type-id-55'/>
             </function-decl>
           </member-function>
           <member-function access='public'>
             <function-decl name='Traverse' mangled-name='_ZNK4base8internal8HookListIPFvPKvmiiilEE8TraverseEPS5_i' filepath='src/malloc_hook-inl.h' line='77' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-932' is-artificial='yes'/>
-              <parameter type-id='type-id-942'/>
+              <parameter type-id='type-id-926' is-artificial='yes'/>
+              <parameter type-id='type-id-936'/>
               <parameter type-id='type-id-1'/>
               <return type-id='type-id-1'/>
             </function-decl>
           </member-function>
           <member-function access='public'>
             <function-decl name='empty' mangled-name='_ZNK4base8internal8HookListIPFvPKvmiiilEE5emptyEv' filepath='src/malloc_hook-inl.h' line='80' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-932' is-artificial='yes'/>
+              <parameter type-id='type-id-926' is-artificial='yes'/>
               <return type-id='type-id-55'/>
             </function-decl>
           </member-function>
           <member-function access='public'>
             <function-decl name='GetSingular' mangled-name='_ZNK4base8internal8HookListIPFvPKvmiiilEE11GetSingularEv' filepath='src/malloc_hook-inl.h' line='85' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-932' is-artificial='yes'/>
-              <return type-id='type-id-904'/>
+              <parameter type-id='type-id-926' is-artificial='yes'/>
+              <return type-id='type-id-898'/>
             </function-decl>
           </member-function>
           <member-function access='public'>
             <function-decl name='ExchangeSingular' mangled-name='_ZN4base8internal8HookListIPFvPKvmiiilEE16ExchangeSingularES5_' filepath='src/malloc_hook-inl.h' line='90' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-922' is-artificial='yes'/>
-              <parameter type-id='type-id-904'/>
-              <return type-id='type-id-904'/>
+              <parameter type-id='type-id-916' is-artificial='yes'/>
+              <parameter type-id='type-id-898'/>
+              <return type-id='type-id-898'/>
             </function-decl>
           </member-function>
         </class-decl>
-        <class-decl name='HookList&lt;void (*)(const void*, const void*, size_t, size_t, int, const void*)&gt;' size-in-bits='576' is-struct='yes' visibility='default' filepath='src/malloc_hook-inl.h' line='59' column='1' id='type-id-919'>
+        <class-decl name='HookList&lt;void (*)(const void*, const void*, size_t, size_t, int, const void*)&gt;' size-in-bits='576' is-struct='yes' visibility='default' filepath='src/malloc_hook-inl.h' line='59' column='1' id='type-id-913'>
           <data-member access='public' layout-offset-in-bits='0'>
             <var-decl name='priv_end' type-id='type-id-781' visibility='default' filepath='src/malloc_hook-inl.h' line='101' column='1'/>
           </data-member>
@@ -15069,53 +14843,53 @@
           </data-member>
           <member-function access='public'>
             <function-decl name='Add' mangled-name='_ZN4base8internal8HookListIPFvPKvS3_mmiS3_EE3AddES5_' filepath='src/malloc_hook-inl.h' line='65' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-920' is-artificial='yes'/>
-              <parameter type-id='type-id-911'/>
+              <parameter type-id='type-id-914' is-artificial='yes'/>
+              <parameter type-id='type-id-905'/>
               <return type-id='type-id-55'/>
             </function-decl>
           </member-function>
           <member-function access='public'>
             <function-decl name='FixupPrivEndLocked' mangled-name='_ZN4base8internal8HookListIPFvPKvS3_mmiS3_EE18FixupPrivEndLockedEv' filepath='src/malloc_hook-inl.h' line='67' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-920' is-artificial='yes'/>
+              <parameter type-id='type-id-914' is-artificial='yes'/>
               <return type-id='type-id-56'/>
             </function-decl>
           </member-function>
           <member-function access='public'>
             <function-decl name='Remove' mangled-name='_ZN4base8internal8HookListIPFvPKvS3_mmiS3_EE6RemoveES5_' filepath='src/malloc_hook-inl.h' line='72' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-920' is-artificial='yes'/>
-              <parameter type-id='type-id-911'/>
+              <parameter type-id='type-id-914' is-artificial='yes'/>
+              <parameter type-id='type-id-905'/>
               <return type-id='type-id-55'/>
             </function-decl>
           </member-function>
           <member-function access='public'>
             <function-decl name='Traverse' mangled-name='_ZNK4base8internal8HookListIPFvPKvS3_mmiS3_EE8TraverseEPS5_i' filepath='src/malloc_hook-inl.h' line='77' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-930' is-artificial='yes'/>
-              <parameter type-id='type-id-944'/>
+              <parameter type-id='type-id-924' is-artificial='yes'/>
+              <parameter type-id='type-id-938'/>
               <parameter type-id='type-id-1'/>
               <return type-id='type-id-1'/>
             </function-decl>
           </member-function>
           <member-function access='public'>
             <function-decl name='empty' mangled-name='_ZNK4base8internal8HookListIPFvPKvS3_mmiS3_EE5emptyEv' filepath='src/malloc_hook-inl.h' line='80' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-930' is-artificial='yes'/>
+              <parameter type-id='type-id-924' is-artificial='yes'/>
               <return type-id='type-id-55'/>
             </function-decl>
           </member-function>
           <member-function access='public'>
             <function-decl name='GetSingular' mangled-name='_ZNK4base8internal8HookListIPFvPKvS3_mmiS3_EE11GetSingularEv' filepath='src/malloc_hook-inl.h' line='85' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-930' is-artificial='yes'/>
-              <return type-id='type-id-911'/>
+              <parameter type-id='type-id-924' is-artificial='yes'/>
+              <return type-id='type-id-905'/>
             </function-decl>
           </member-function>
           <member-function access='public'>
             <function-decl name='ExchangeSingular' mangled-name='_ZN4base8internal8HookListIPFvPKvS3_mmiS3_EE16ExchangeSingularES5_' filepath='src/malloc_hook-inl.h' line='90' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-920' is-artificial='yes'/>
-              <parameter type-id='type-id-911'/>
-              <return type-id='type-id-911'/>
+              <parameter type-id='type-id-914' is-artificial='yes'/>
+              <parameter type-id='type-id-905'/>
+              <return type-id='type-id-905'/>
             </function-decl>
           </member-function>
         </class-decl>
-        <class-decl name='HookList&lt;void (*)(ptrdiff_t)&gt;' size-in-bits='576' is-struct='yes' visibility='default' filepath='src/malloc_hook-inl.h' line='59' column='1' id='type-id-923'>
+        <class-decl name='HookList&lt;void (*)(ptrdiff_t)&gt;' size-in-bits='576' is-struct='yes' visibility='default' filepath='src/malloc_hook-inl.h' line='59' column='1' id='type-id-917'>
           <data-member access='public' layout-offset-in-bits='0'>
             <var-decl name='priv_end' type-id='type-id-781' visibility='default' filepath='src/malloc_hook-inl.h' line='101' column='1'/>
           </data-member>
@@ -15124,53 +14898,53 @@
           </data-member>
           <member-function access='public'>
             <function-decl name='Add' mangled-name='_ZN4base8internal8HookListIPFvlEE3AddES3_' filepath='src/malloc_hook-inl.h' line='65' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-924' is-artificial='yes'/>
-              <parameter type-id='type-id-913'/>
+              <parameter type-id='type-id-918' is-artificial='yes'/>
+              <parameter type-id='type-id-907'/>
               <return type-id='type-id-55'/>
             </function-decl>
           </member-function>
           <member-function access='public'>
             <function-decl name='FixupPrivEndLocked' mangled-name='_ZN4base8internal8HookListIPFvlEE18FixupPrivEndLockedEv' filepath='src/malloc_hook-inl.h' line='67' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-924' is-artificial='yes'/>
+              <parameter type-id='type-id-918' is-artificial='yes'/>
               <return type-id='type-id-56'/>
             </function-decl>
           </member-function>
           <member-function access='public'>
             <function-decl name='Remove' mangled-name='_ZN4base8internal8HookListIPFvlEE6RemoveES3_' filepath='src/malloc_hook-inl.h' line='72' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-924' is-artificial='yes'/>
-              <parameter type-id='type-id-913'/>
+              <parameter type-id='type-id-918' is-artificial='yes'/>
+              <parameter type-id='type-id-907'/>
               <return type-id='type-id-55'/>
             </function-decl>
           </member-function>
           <member-function access='public'>
             <function-decl name='Traverse' mangled-name='_ZNK4base8internal8HookListIPFvlEE8TraverseEPS3_i' filepath='src/malloc_hook-inl.h' line='77' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-934' is-artificial='yes'/>
-              <parameter type-id='type-id-940'/>
+              <parameter type-id='type-id-928' is-artificial='yes'/>
+              <parameter type-id='type-id-934'/>
               <parameter type-id='type-id-1'/>
               <return type-id='type-id-1'/>
             </function-decl>
           </member-function>
           <member-function access='public'>
             <function-decl name='empty' mangled-name='_ZNK4base8internal8HookListIPFvlEE5emptyEv' filepath='src/malloc_hook-inl.h' line='80' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-934' is-artificial='yes'/>
+              <parameter type-id='type-id-928' is-artificial='yes'/>
               <return type-id='type-id-55'/>
             </function-decl>
           </member-function>
           <member-function access='public'>
             <function-decl name='GetSingular' mangled-name='_ZNK4base8internal8HookListIPFvlEE11GetSingularEv' filepath='src/malloc_hook-inl.h' line='85' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-934' is-artificial='yes'/>
-              <return type-id='type-id-913'/>
+              <parameter type-id='type-id-928' is-artificial='yes'/>
+              <return type-id='type-id-907'/>
             </function-decl>
           </member-function>
           <member-function access='public'>
             <function-decl name='ExchangeSingular' mangled-name='_ZN4base8internal8HookListIPFvlEE16ExchangeSingularES3_' filepath='src/malloc_hook-inl.h' line='90' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-924' is-artificial='yes'/>
-              <parameter type-id='type-id-913'/>
-              <return type-id='type-id-913'/>
+              <parameter type-id='type-id-918' is-artificial='yes'/>
+              <parameter type-id='type-id-907'/>
+              <return type-id='type-id-907'/>
             </function-decl>
           </member-function>
         </class-decl>
-        <class-decl name='HookList&lt;int (*)(const void*, size_t, int, int, int, off_t, void**)&gt;' size-in-bits='576' is-struct='yes' visibility='default' filepath='src/malloc_hook-inl.h' line='59' column='1' id='type-id-917'>
+        <class-decl name='HookList&lt;int (*)(const void*, size_t, int, int, int, off_t, void**)&gt;' size-in-bits='576' is-struct='yes' visibility='default' filepath='src/malloc_hook-inl.h' line='59' column='1' id='type-id-911'>
           <data-member access='public' layout-offset-in-bits='0'>
             <var-decl name='priv_end' type-id='type-id-781' visibility='default' filepath='src/malloc_hook-inl.h' line='101' column='1'/>
           </data-member>
@@ -15179,53 +14953,53 @@
           </data-member>
           <member-function access='public'>
             <function-decl name='Add' mangled-name='_ZN4base8internal8HookListIPFiPKvmiiilPPvEE3AddES7_' filepath='src/malloc_hook-inl.h' line='65' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-918' is-artificial='yes'/>
-              <parameter type-id='type-id-906'/>
+              <parameter type-id='type-id-912' is-artificial='yes'/>
+              <parameter type-id='type-id-900'/>
               <return type-id='type-id-55'/>
             </function-decl>
           </member-function>
           <member-function access='public'>
             <function-decl name='FixupPrivEndLocked' mangled-name='_ZN4base8internal8HookListIPFiPKvmiiilPPvEE18FixupPrivEndLockedEv' filepath='src/malloc_hook-inl.h' line='67' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-918' is-artificial='yes'/>
+              <parameter type-id='type-id-912' is-artificial='yes'/>
               <return type-id='type-id-56'/>
             </function-decl>
           </member-function>
           <member-function access='public'>
             <function-decl name='Remove' mangled-name='_ZN4base8internal8HookListIPFiPKvmiiilPPvEE6RemoveES7_' filepath='src/malloc_hook-inl.h' line='72' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-918' is-artificial='yes'/>
-              <parameter type-id='type-id-906'/>
+              <parameter type-id='type-id-912' is-artificial='yes'/>
+              <parameter type-id='type-id-900'/>
               <return type-id='type-id-55'/>
             </function-decl>
           </member-function>
           <member-function access='public'>
             <function-decl name='Traverse' mangled-name='_ZNK4base8internal8HookListIPFiPKvmiiilPPvEE8TraverseEPS7_i' filepath='src/malloc_hook-inl.h' line='77' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-928' is-artificial='yes'/>
-              <parameter type-id='type-id-938'/>
+              <parameter type-id='type-id-922' is-artificial='yes'/>
+              <parameter type-id='type-id-932'/>
               <parameter type-id='type-id-1'/>
               <return type-id='type-id-1'/>
             </function-decl>
           </member-function>
           <member-function access='public'>
             <function-decl name='empty' mangled-name='_ZNK4base8internal8HookListIPFiPKvmiiilPPvEE5emptyEv' filepath='src/malloc_hook-inl.h' line='80' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-928' is-artificial='yes'/>
+              <parameter type-id='type-id-922' is-artificial='yes'/>
               <return type-id='type-id-55'/>
             </function-decl>
           </member-function>
           <member-function access='public'>
             <function-decl name='GetSingular' mangled-name='_ZNK4base8internal8HookListIPFiPKvmiiilPPvEE11GetSingularEv' filepath='src/malloc_hook-inl.h' line='85' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-928' is-artificial='yes'/>
-              <return type-id='type-id-906'/>
+              <parameter type-id='type-id-922' is-artificial='yes'/>
+              <return type-id='type-id-900'/>
             </function-decl>
           </member-function>
           <member-function access='public'>
             <function-decl name='ExchangeSingular' mangled-name='_ZN4base8internal8HookListIPFiPKvmiiilPPvEE16ExchangeSingularES7_' filepath='src/malloc_hook-inl.h' line='90' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-918' is-artificial='yes'/>
-              <parameter type-id='type-id-906'/>
-              <return type-id='type-id-906'/>
+              <parameter type-id='type-id-912' is-artificial='yes'/>
+              <parameter type-id='type-id-900'/>
+              <return type-id='type-id-900'/>
             </function-decl>
           </member-function>
         </class-decl>
-        <class-decl name='HookList&lt;int (*)(const void*, size_t, int*)&gt;' size-in-bits='576' is-struct='yes' visibility='default' filepath='src/malloc_hook-inl.h' line='59' column='1' id='type-id-915'>
+        <class-decl name='HookList&lt;int (*)(const void*, size_t, int*)&gt;' size-in-bits='576' is-struct='yes' visibility='default' filepath='src/malloc_hook-inl.h' line='59' column='1' id='type-id-909'>
           <data-member access='public' layout-offset-in-bits='0'>
             <var-decl name='priv_end' type-id='type-id-781' visibility='default' filepath='src/malloc_hook-inl.h' line='101' column='1'/>
           </data-member>
@@ -15234,72 +15008,72 @@
           </data-member>
           <member-function access='public'>
             <function-decl name='Add' mangled-name='_ZN4base8internal8HookListIPFiPKvmPiEE3AddES6_' filepath='src/malloc_hook.cc' line='168' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-916' is-artificial='yes'/>
-              <parameter type-id='type-id-908'/>
+              <parameter type-id='type-id-910' is-artificial='yes'/>
+              <parameter type-id='type-id-902'/>
               <return type-id='type-id-55'/>
             </function-decl>
           </member-function>
           <member-function access='public'>
             <function-decl name='FixupPrivEndLocked' mangled-name='_ZN4base8internal8HookListIPFiPKvmPiEE18FixupPrivEndLockedEv' filepath='src/malloc_hook.cc' line='192' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-916' is-artificial='yes'/>
+              <parameter type-id='type-id-910' is-artificial='yes'/>
               <return type-id='type-id-56'/>
             </function-decl>
           </member-function>
           <member-function access='public'>
             <function-decl name='Remove' mangled-name='_ZN4base8internal8HookListIPFiPKvmPiEE6RemoveES6_' filepath='src/malloc_hook.cc' line='202' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-916' is-artificial='yes'/>
-              <parameter type-id='type-id-908'/>
+              <parameter type-id='type-id-910' is-artificial='yes'/>
+              <parameter type-id='type-id-902'/>
               <return type-id='type-id-55'/>
             </function-decl>
           </member-function>
           <member-function access='public'>
             <function-decl name='Traverse' mangled-name='_ZNK4base8internal8HookListIPFiPKvmPiEE8TraverseEPS6_i' filepath='src/malloc_hook.cc' line='222' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-926' is-artificial='yes'/>
-              <parameter type-id='type-id-936'/>
+              <parameter type-id='type-id-920' is-artificial='yes'/>
+              <parameter type-id='type-id-930'/>
               <parameter type-id='type-id-1'/>
               <return type-id='type-id-1'/>
             </function-decl>
           </member-function>
           <member-function access='public'>
             <function-decl name='empty' mangled-name='_ZNK4base8internal8HookListIPFiPKvmPiEE5emptyEv' filepath='src/malloc_hook-inl.h' line='80' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-926' is-artificial='yes'/>
+              <parameter type-id='type-id-920' is-artificial='yes'/>
               <return type-id='type-id-55'/>
             </function-decl>
           </member-function>
           <member-function access='public'>
             <function-decl name='GetSingular' mangled-name='_ZNK4base8internal8HookListIPFiPKvmPiEE11GetSingularEv' filepath='src/malloc_hook-inl.h' line='85' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-926' is-artificial='yes'/>
-              <return type-id='type-id-908'/>
+              <parameter type-id='type-id-920' is-artificial='yes'/>
+              <return type-id='type-id-902'/>
             </function-decl>
           </member-function>
           <member-function access='public'>
             <function-decl name='ExchangeSingular' mangled-name='_ZN4base8internal8HookListIPFiPKvmPiEE16ExchangeSingularES6_' filepath='src/malloc_hook.cc' line='237' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-916' is-artificial='yes'/>
-              <parameter type-id='type-id-908'/>
-              <return type-id='type-id-908'/>
+              <parameter type-id='type-id-910' is-artificial='yes'/>
+              <parameter type-id='type-id-902'/>
+              <return type-id='type-id-902'/>
             </function-decl>
           </member-function>
         </class-decl>
-        <var-decl name='new_hooks_' type-id='type-id-947' mangled-name='_ZN4base8internal10new_hooks_E' visibility='default' filepath='src/malloc_hook.cc' line='260' column='1'/>
-        <var-decl name='delete_hooks_' type-id='type-id-948' mangled-name='_ZN4base8internal13delete_hooks_E' visibility='default' filepath='src/malloc_hook.cc' line='262' column='1'/>
-        <var-decl name='premmap_hooks_' type-id='type-id-921' mangled-name='_ZN4base8internal14premmap_hooks_E' visibility='default' filepath='src/malloc_hook.cc' line='263' column='1'/>
+        <var-decl name='new_hooks_' type-id='type-id-941' mangled-name='_ZN4base8internal10new_hooks_E' visibility='default' filepath='src/malloc_hook.cc' line='260' column='1'/>
+        <var-decl name='delete_hooks_' type-id='type-id-942' mangled-name='_ZN4base8internal13delete_hooks_E' visibility='default' filepath='src/malloc_hook.cc' line='262' column='1'/>
+        <var-decl name='premmap_hooks_' type-id='type-id-915' mangled-name='_ZN4base8internal14premmap_hooks_E' visibility='default' filepath='src/malloc_hook.cc' line='263' column='1'/>
         <var-decl name='mmap_hooks_' type-id='type-id-403' mangled-name='_ZN4base8internal11mmap_hooks_E' visibility='default' filepath='src/malloc_hook.cc' line='265' column='1'/>
-        <var-decl name='mmap_replacement_' type-id='type-id-917' mangled-name='_ZN4base8internal17mmap_replacement_E' visibility='default' filepath='src/malloc_hook.cc' line='273' column='1'/>
-        <var-decl name='munmap_hooks_' type-id='type-id-947' mangled-name='_ZN4base8internal13munmap_hooks_E' visibility='default' filepath='src/malloc_hook.cc' line='266' column='1'/>
-        <var-decl name='munmap_replacement_' type-id='type-id-915' mangled-name='_ZN4base8internal19munmap_replacement_E' visibility='default' filepath='src/malloc_hook.cc' line='274' column='1'/>
-        <var-decl name='mremap_hooks_' type-id='type-id-919' mangled-name='_ZN4base8internal13mremap_hooks_E' visibility='default' filepath='src/malloc_hook.cc' line='267' column='1'/>
-        <var-decl name='presbrk_hooks_' type-id='type-id-923' mangled-name='_ZN4base8internal14presbrk_hooks_E' visibility='default' filepath='src/malloc_hook.cc' line='268' column='1'/>
+        <var-decl name='mmap_replacement_' type-id='type-id-911' mangled-name='_ZN4base8internal17mmap_replacement_E' visibility='default' filepath='src/malloc_hook.cc' line='273' column='1'/>
+        <var-decl name='munmap_hooks_' type-id='type-id-941' mangled-name='_ZN4base8internal13munmap_hooks_E' visibility='default' filepath='src/malloc_hook.cc' line='266' column='1'/>
+        <var-decl name='munmap_replacement_' type-id='type-id-909' mangled-name='_ZN4base8internal19munmap_replacement_E' visibility='default' filepath='src/malloc_hook.cc' line='274' column='1'/>
+        <var-decl name='mremap_hooks_' type-id='type-id-913' mangled-name='_ZN4base8internal13mremap_hooks_E' visibility='default' filepath='src/malloc_hook.cc' line='267' column='1'/>
+        <var-decl name='presbrk_hooks_' type-id='type-id-917' mangled-name='_ZN4base8internal14presbrk_hooks_E' visibility='default' filepath='src/malloc_hook.cc' line='268' column='1'/>
         <var-decl name='sbrk_hooks_' type-id='type-id-405' mangled-name='_ZN4base8internal11sbrk_hooks_E' visibility='default' filepath='src/malloc_hook.cc' line='270' column='1'/>
       </namespace-decl>
       <namespace-decl name='subtle'>
         <function-decl name='NoBarrier_Store' filepath='./src/base/atomicops-internals-x86.h' line='215' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-946'/>
-          <parameter type-id='type-id-949'/>
+          <parameter type-id='type-id-940'/>
+          <parameter type-id='type-id-943'/>
           <return type-id='type-id-56'/>
         </function-decl>
         <function-decl name='Acquire_Load' filepath='./src/base/atomicops-internals-x86.h' line='249' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-950'/>
-          <return type-id='type-id-949'/>
+          <parameter type-id='type-id-944'/>
+          <return type-id='type-id-943'/>
         </function-decl>
       </namespace-decl>
     </namespace-decl>
@@ -15318,7 +15092,7 @@
       <parameter type-id='type-id-1' name='prot' filepath='src/malloc_hook_mmap_linux.h' line='155' column='1'/>
       <parameter type-id='type-id-1' name='flags' filepath='src/malloc_hook_mmap_linux.h' line='155' column='1'/>
       <parameter type-id='type-id-1' name='fd' filepath='src/malloc_hook_mmap_linux.h' line='156' column='1'/>
-      <parameter type-id='type-id-951' name='offset' filepath='src/malloc_hook_mmap_linux.h' line='156' column='1'/>
+      <parameter type-id='type-id-945' name='offset' filepath='src/malloc_hook_mmap_linux.h' line='156' column='1'/>
       <return type-id='type-id-53'/>
     </function-decl>
     <function-decl name='munmap' mangled-name='munmap' filepath='src/malloc_hook_mmap_linux.h' line='184' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='munmap'>
@@ -15345,12 +15119,12 @@
       <return type-id='type-id-1'/>
     </function-decl>
     <function-decl name='MallocHook_AddPreSbrkHook' mangled-name='MallocHook_AddPreSbrkHook' filepath='src/malloc_hook.cc' line='399' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='MallocHook_AddPreSbrkHook'>
-      <parameter type-id='type-id-914' name='hook' filepath='src/malloc_hook.cc' line='399' column='1'/>
+      <parameter type-id='type-id-908' name='hook' filepath='src/malloc_hook.cc' line='399' column='1'/>
       <return type-id='type-id-1'/>
     </function-decl>
     <function-decl name='MallocHook_SetMunmapHook' mangled-name='MallocHook_SetMunmapHook' filepath='src/malloc_hook.cc' line='448' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='MallocHook_SetMunmapHook'>
-      <parameter type-id='type-id-910' name='hook' filepath='src/malloc_hook.cc' line='448' column='1'/>
-      <return type-id='type-id-910'/>
+      <parameter type-id='type-id-904' name='hook' filepath='src/malloc_hook.cc' line='448' column='1'/>
+      <return type-id='type-id-904'/>
     </function-decl>
     <function-decl name='MallocHook_SetNewHook' mangled-name='MallocHook_SetNewHook' filepath='src/malloc_hook.cc' line='424' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='MallocHook_SetNewHook'>
       <parameter type-id='type-id-364' name='hook' filepath='src/malloc_hook.cc' line='424' column='1'/>
@@ -15361,27 +15135,27 @@
       <return type-id='type-id-369'/>
     </function-decl>
     <function-decl name='MallocHook_SetPreSbrkHook' mangled-name='MallocHook_SetPreSbrkHook' filepath='src/malloc_hook.cc' line='460' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='MallocHook_SetPreSbrkHook'>
-      <parameter type-id='type-id-914' name='hook' filepath='src/malloc_hook.cc' line='460' column='1'/>
-      <return type-id='type-id-914'/>
+      <parameter type-id='type-id-908' name='hook' filepath='src/malloc_hook.cc' line='460' column='1'/>
+      <return type-id='type-id-908'/>
     </function-decl>
     <function-decl name='MallocHook_SetMremapHook' mangled-name='MallocHook_SetMremapHook' filepath='src/malloc_hook.cc' line='454' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='MallocHook_SetMremapHook'>
-      <parameter type-id='type-id-912' name='hook' filepath='src/malloc_hook.cc' line='454' column='1'/>
-      <return type-id='type-id-912'/>
+      <parameter type-id='type-id-906' name='hook' filepath='src/malloc_hook.cc' line='454' column='1'/>
+      <return type-id='type-id-906'/>
     </function-decl>
     <function-decl name='MallocHook_SetMmapHook' mangled-name='MallocHook_SetMmapHook' filepath='src/malloc_hook.cc' line='442' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='MallocHook_SetMmapHook'>
       <parameter type-id='type-id-367' name='hook' filepath='src/malloc_hook.cc' line='442' column='1'/>
       <return type-id='type-id-367'/>
     </function-decl>
     <function-decl name='MallocHook_SetPreMmapHook' mangled-name='MallocHook_SetPreMmapHook' filepath='src/malloc_hook.cc' line='436' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='MallocHook_SetPreMmapHook'>
-      <parameter type-id='type-id-905' name='hook' filepath='src/malloc_hook.cc' line='436' column='1'/>
-      <return type-id='type-id-905'/>
+      <parameter type-id='type-id-899' name='hook' filepath='src/malloc_hook.cc' line='436' column='1'/>
+      <return type-id='type-id-899'/>
     </function-decl>
     <function-decl name='MallocHook_SetDeleteHook' mangled-name='MallocHook_SetDeleteHook' filepath='src/malloc_hook.cc' line='430' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='MallocHook_SetDeleteHook'>
       <parameter type-id='type-id-365' name='hook' filepath='src/malloc_hook.cc' line='430' column='1'/>
       <return type-id='type-id-365'/>
     </function-decl>
     <function-decl name='MallocHook_RemoveMunmapHook' mangled-name='MallocHook_RemoveMunmapHook' filepath='src/malloc_hook.cc' line='365' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='MallocHook_RemoveMunmapHook'>
-      <parameter type-id='type-id-910' name='hook' filepath='src/malloc_hook.cc' line='365' column='1'/>
+      <parameter type-id='type-id-904' name='hook' filepath='src/malloc_hook.cc' line='365' column='1'/>
       <return type-id='type-id-1'/>
     </function-decl>
     <function-decl name='MallocHook_RemoveNewHook' mangled-name='MallocHook_RemoveNewHook' filepath='src/malloc_hook.cc' line='302' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='MallocHook_RemoveNewHook'>
@@ -15393,11 +15167,11 @@
       <return type-id='type-id-1'/>
     </function-decl>
     <function-decl name='MallocHook_RemoveMmapReplacement' mangled-name='MallocHook_RemoveMmapReplacement' filepath='src/malloc_hook.cc' line='341' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='MallocHook_RemoveMmapReplacement'>
-      <parameter type-id='type-id-907' name='hook' filepath='src/malloc_hook.cc' line='341' column='1'/>
+      <parameter type-id='type-id-901' name='hook' filepath='src/malloc_hook.cc' line='341' column='1'/>
       <return type-id='type-id-1'/>
     </function-decl>
     <function-decl name='MallocHook_RemovePreMmapHook' mangled-name='MallocHook_RemovePreMmapHook' filepath='src/malloc_hook.cc' line='326' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='MallocHook_RemovePreMmapHook'>
-      <parameter type-id='type-id-905' name='hook' filepath='src/malloc_hook.cc' line='326' column='1'/>
+      <parameter type-id='type-id-899' name='hook' filepath='src/malloc_hook.cc' line='326' column='1'/>
       <return type-id='type-id-1'/>
     </function-decl>
     <function-decl name='MallocHook_RemoveDeleteHook' mangled-name='MallocHook_RemoveDeleteHook' filepath='src/malloc_hook.cc' line='314' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='MallocHook_RemoveDeleteHook'>
@@ -15405,15 +15179,15 @@
       <return type-id='type-id-1'/>
     </function-decl>
     <function-decl name='MallocHook_RemovePreSbrkHook' mangled-name='MallocHook_RemovePreSbrkHook' filepath='src/malloc_hook.cc' line='405' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='MallocHook_RemovePreSbrkHook'>
-      <parameter type-id='type-id-914' name='hook' filepath='src/malloc_hook.cc' line='399' column='1'/>
+      <parameter type-id='type-id-908' name='hook' filepath='src/malloc_hook.cc' line='399' column='1'/>
       <return type-id='type-id-1'/>
     </function-decl>
     <function-decl name='MallocHook_RemoveMremapHook' mangled-name='MallocHook_RemoveMremapHook' filepath='src/malloc_hook.cc' line='393' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='MallocHook_RemoveMremapHook'>
-      <parameter type-id='type-id-912' name='hook' filepath='src/malloc_hook.cc' line='393' column='1'/>
+      <parameter type-id='type-id-906' name='hook' filepath='src/malloc_hook.cc' line='393' column='1'/>
       <return type-id='type-id-1'/>
     </function-decl>
     <function-decl name='MallocHook_RemoveMunmapReplacement' mangled-name='MallocHook_RemoveMunmapReplacement' filepath='src/malloc_hook.cc' line='381' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='MallocHook_RemoveMunmapReplacement'>
-      <parameter type-id='type-id-909' name='hook' filepath='src/malloc_hook.cc' line='381' column='1'/>
+      <parameter type-id='type-id-903' name='hook' filepath='src/malloc_hook.cc' line='381' column='1'/>
       <return type-id='type-id-1'/>
     </function-decl>
     <function-decl name='MallocHook_RemoveMmapHook' mangled-name='MallocHook_RemoveMmapHook' filepath='src/malloc_hook.cc' line='353' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='MallocHook_RemoveMmapHook'>
@@ -15425,23 +15199,23 @@
       <return type-id='type-id-1'/>
     </function-decl>
     <function-decl name='MallocHook_AddMremapHook' mangled-name='MallocHook_AddMremapHook' filepath='src/malloc_hook.cc' line='387' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='MallocHook_AddMremapHook'>
-      <parameter type-id='type-id-912' name='hook' filepath='src/malloc_hook.cc' line='393' column='1'/>
+      <parameter type-id='type-id-906' name='hook' filepath='src/malloc_hook.cc' line='393' column='1'/>
       <return type-id='type-id-1'/>
     </function-decl>
     <function-decl name='MallocHook_SetMunmapReplacement' mangled-name='MallocHook_SetMunmapReplacement' filepath='src/malloc_hook.cc' line='371' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='MallocHook_SetMunmapReplacement'>
-      <parameter type-id='type-id-909' name='hook' filepath='src/malloc_hook.cc' line='381' column='1'/>
+      <parameter type-id='type-id-903' name='hook' filepath='src/malloc_hook.cc' line='381' column='1'/>
       <return type-id='type-id-1'/>
     </function-decl>
     <function-decl name='MallocHook_SetMmapReplacement' mangled-name='MallocHook_SetMmapReplacement' filepath='src/malloc_hook.cc' line='332' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='MallocHook_SetMmapReplacement'>
-      <parameter type-id='type-id-907' name='hook' filepath='src/malloc_hook.cc' line='341' column='1'/>
+      <parameter type-id='type-id-901' name='hook' filepath='src/malloc_hook.cc' line='341' column='1'/>
       <return type-id='type-id-1'/>
     </function-decl>
     <function-decl name='MallocHook_AddPreMmapHook' mangled-name='MallocHook_AddPreMmapHook' filepath='src/malloc_hook.cc' line='320' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='MallocHook_AddPreMmapHook'>
-      <parameter type-id='type-id-905' name='hook' filepath='src/malloc_hook.cc' line='326' column='1'/>
+      <parameter type-id='type-id-899' name='hook' filepath='src/malloc_hook.cc' line='326' column='1'/>
       <return type-id='type-id-1'/>
     </function-decl>
     <function-decl name='MallocHook_AddMunmapHook' mangled-name='MallocHook_AddMunmapHook' filepath='src/malloc_hook.cc' line='359' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='MallocHook_AddMunmapHook'>
-      <parameter type-id='type-id-910' name='hook' filepath='src/malloc_hook.cc' line='365' column='1'/>
+      <parameter type-id='type-id-904' name='hook' filepath='src/malloc_hook.cc' line='365' column='1'/>
       <return type-id='type-id-1'/>
     </function-decl>
     <function-decl name='MallocHook_AddNewHook' mangled-name='MallocHook_AddNewHook' filepath='src/malloc_hook.cc' line='296' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='MallocHook_AddNewHook'>
@@ -15456,13 +15230,13 @@
       <parameter type-id='type-id-365' name='hook' filepath='src/malloc_hook.cc' line='314' column='1'/>
       <return type-id='type-id-1'/>
     </function-decl>
-    <function-type size-in-bits='64' id='type-id-935'>
+    <function-type size-in-bits='64' id='type-id-929'>
       <parameter type-id='type-id-53'/>
       <parameter type-id='type-id-57'/>
       <parameter type-id='type-id-897'/>
       <return type-id='type-id-1'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-937'>
+    <function-type size-in-bits='64' id='type-id-931'>
       <parameter type-id='type-id-53'/>
       <parameter type-id='type-id-57'/>
       <parameter type-id='type-id-1'/>
@@ -15472,16 +15246,11 @@
       <parameter type-id='type-id-120'/>
       <return type-id='type-id-1'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-939'>
+    <function-type size-in-bits='64' id='type-id-933'>
       <parameter type-id='type-id-186'/>
       <return type-id='type-id-56'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-900'>
-      <parameter type-id='type-id-53'/>
-      <parameter type-id='type-id-952'/>
-      <return type-id='type-id-56'/>
-    </function-type>
-    <function-type size-in-bits='64' id='type-id-941'>
+    <function-type size-in-bits='64' id='type-id-935'>
       <parameter type-id='type-id-53'/>
       <parameter type-id='type-id-57'/>
       <parameter type-id='type-id-1'/>
@@ -15490,7 +15259,7 @@
       <parameter type-id='type-id-185'/>
       <return type-id='type-id-56'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-943'>
+    <function-type size-in-bits='64' id='type-id-937'>
       <parameter type-id='type-id-53'/>
       <parameter type-id='type-id-53'/>
       <parameter type-id='type-id-57'/>
@@ -15501,35 +15270,35 @@
     </function-type>
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='src/maybe_threads.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-kFgaKP/gperftools-2.4' language='LANG_C_plus_plus'>
-    <pointer-type-def type-id='type-id-953' size-in-bits='64' id='type-id-954'/>
-    <pointer-type-def type-id='type-id-955' size-in-bits='64' id='type-id-956'/>
+    <pointer-type-def type-id='type-id-946' size-in-bits='64' id='type-id-947'/>
+    <pointer-type-def type-id='type-id-948' size-in-bits='64' id='type-id-949'/>
     <function-decl name='perftools_pthread_once' mangled-name='_Z22perftools_pthread_oncePiPFvvE' filepath='src/maybe_threads.cc' line='128' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z22perftools_pthread_oncePiPFvvE'>
-      <parameter type-id='type-id-956' name='ctl' filepath='src/maybe_threads.cc' line='128' column='1'/>
+      <parameter type-id='type-id-949' name='ctl' filepath='src/maybe_threads.cc' line='128' column='1'/>
       <parameter type-id='type-id-153' name='init_routine' filepath='src/maybe_threads.cc' line='129' column='1'/>
       <return type-id='type-id-1'/>
     </function-decl>
     <function-decl name='perftools_pthread_setspecific' mangled-name='_Z29perftools_pthread_setspecificjPv' filepath='src/maybe_threads.cc' line='117' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z29perftools_pthread_setspecificjPv'>
-      <parameter type-id='type-id-953' name='key' filepath='src/maybe_threads.cc' line='117' column='1'/>
+      <parameter type-id='type-id-946' name='key' filepath='src/maybe_threads.cc' line='117' column='1'/>
       <parameter type-id='type-id-53' name='val' filepath='src/maybe_threads.cc' line='117' column='1'/>
       <return type-id='type-id-1'/>
     </function-decl>
     <function-decl name='perftools_pthread_getspecific' mangled-name='_Z29perftools_pthread_getspecificj' filepath='src/maybe_threads.cc' line='109' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z29perftools_pthread_getspecificj'>
-      <parameter type-id='type-id-953' name='key' filepath='src/maybe_threads.cc' line='109' column='1'/>
+      <parameter type-id='type-id-946' name='key' filepath='src/maybe_threads.cc' line='109' column='1'/>
       <return type-id='type-id-53'/>
     </function-decl>
     <function-decl name='perftools_pthread_key_delete' mangled-name='_Z28perftools_pthread_key_deletej' filepath='src/maybe_threads.cc' line='101' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z28perftools_pthread_key_deletej'>
-      <parameter type-id='type-id-953' name='key' filepath='src/maybe_threads.cc' line='101' column='1'/>
+      <parameter type-id='type-id-946' name='key' filepath='src/maybe_threads.cc' line='101' column='1'/>
       <return type-id='type-id-1'/>
     </function-decl>
     <function-decl name='perftools_pthread_key_create' mangled-name='_Z28perftools_pthread_key_createPjPFvPvE' filepath='src/maybe_threads.cc' line='90' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z28perftools_pthread_key_createPjPFvPvE'>
-      <parameter type-id='type-id-954' name='key' filepath='src/maybe_threads.cc' line='90' column='1'/>
+      <parameter type-id='type-id-947' name='key' filepath='src/maybe_threads.cc' line='90' column='1'/>
       <parameter type-id='type-id-218' name='destr_function' filepath='src/maybe_threads.cc' line='91' column='1'/>
       <return type-id='type-id-1'/>
     </function-decl>
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='src/memfs_malloc.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-kFgaKP/gperftools-2.4' language='LANG_C_plus_plus'>
-    <class-decl name='HugetlbSysAllocator' size-in-bits='384' visibility='default' filepath='src/memfs_malloc.cc' line='90' column='1' id='type-id-957'>
-      <base-class access='public' layout-offset-in-bits='0' type-id='type-id-958'/>
+    <class-decl name='HugetlbSysAllocator' size-in-bits='384' visibility='default' filepath='src/memfs_malloc.cc' line='90' column='1' id='type-id-950'>
+      <base-class access='public' layout-offset-in-bits='0' type-id='type-id-951'/>
       <data-member access='private' layout-offset-in-bits='64'>
         <var-decl name='failed_' type-id='type-id-55' visibility='default' filepath='src/memfs_malloc.cc' line='103' column='1'/>
       </data-member>
@@ -15543,24 +15312,24 @@
         <var-decl name='hugetlb_base_' type-id='type-id-185' visibility='default' filepath='src/memfs_malloc.cc' line='110' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='320'>
-        <var-decl name='fallback_' type-id='type-id-902' visibility='default' filepath='src/memfs_malloc.cc' line='112' column='1'/>
+        <var-decl name='fallback_' type-id='type-id-952' visibility='default' filepath='src/memfs_malloc.cc' line='112' column='1'/>
       </data-member>
       <member-function access='private' constructor='yes'>
         <function-decl name='HugetlbSysAllocator' filepath='src/memfs_malloc.cc' line='92' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-959' is-artificial='yes'/>
-          <parameter type-id='type-id-902'/>
+          <parameter type-id='type-id-953' is-artificial='yes'/>
+          <parameter type-id='type-id-952'/>
           <return type-id='type-id-56'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
         <function-decl name='Initialize' mangled-name='_ZN19HugetlbSysAllocator10InitializeEv' filepath='src/memfs_malloc.cc' line='218' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN19HugetlbSysAllocator10InitializeEv'>
-          <parameter type-id='type-id-959' is-artificial='yes'/>
+          <parameter type-id='type-id-953' is-artificial='yes'/>
           <return type-id='type-id-55'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
         <function-decl name='AllocInternal' mangled-name='_ZN19HugetlbSysAllocator13AllocInternalEmPmm' filepath='src/memfs_malloc.cc' line='152' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN19HugetlbSysAllocator13AllocInternalEmPmm'>
-          <parameter type-id='type-id-959' is-artificial='yes'/>
+          <parameter type-id='type-id-953' is-artificial='yes'/>
           <parameter type-id='type-id-57'/>
           <parameter type-id='type-id-230'/>
           <parameter type-id='type-id-57'/>
@@ -15569,7 +15338,7 @@
       </member-function>
       <member-function access='private' vtable-offset='2'>
         <function-decl name='Alloc' mangled-name='_ZN19HugetlbSysAllocator5AllocEmPmm' filepath='src/memfs_malloc.cc' line='118' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN19HugetlbSysAllocator5AllocEmPmm'>
-          <parameter type-id='type-id-959' is-artificial='yes'/>
+          <parameter type-id='type-id-953' is-artificial='yes'/>
           <parameter type-id='type-id-57'/>
           <parameter type-id='type-id-230'/>
           <parameter type-id='type-id-57'/>
@@ -15577,7 +15346,7 @@
         </function-decl>
       </member-function>
     </class-decl>
-    <pointer-type-def type-id='type-id-957' size-in-bits='64' id='type-id-959'/>
+    <pointer-type-def type-id='type-id-950' size-in-bits='64' id='type-id-953'/>
     <namespace-decl name='FLAG__namespace_do_not_use_directly_use_DECLARE_string_instead'>
       <var-decl name='FLAGS_memfs_malloc_path' type-id='type-id-783' mangled-name='_ZN62FLAG__namespace_do_not_use_directly_use_DECLARE_string_instead23FLAGS_memfs_malloc_pathE' visibility='default' filepath='src/memfs_malloc.cc' line='70' column='1' elf-symbol-id='_ZN62FLAG__namespace_do_not_use_directly_use_DECLARE_string_instead23FLAGS_memfs_malloc_pathE'/>
       <var-decl name='FLAGS_nomemfs_malloc_path' type-id='type-id-66' mangled-name='_ZN62FLAG__namespace_do_not_use_directly_use_DECLARE_string_instead25FLAGS_nomemfs_malloc_pathE' visibility='default' filepath='src/memfs_malloc.cc' line='73' column='1' elf-symbol-id='_ZN62FLAG__namespace_do_not_use_directly_use_DECLARE_string_instead25FLAGS_nomemfs_malloc_pathE'/>
@@ -15594,77 +15363,53 @@
       <var-decl name='FLAGS_memfs_malloc_map_private' type-id='type-id-55' mangled-name='_ZN60FLAG__namespace_do_not_use_directly_use_DECLARE_bool_instead30FLAGS_memfs_malloc_map_privateE' visibility='default' filepath='src/memfs_malloc.cc' line='85' column='1' elf-symbol-id='_ZN60FLAG__namespace_do_not_use_directly_use_DECLARE_bool_instead30FLAGS_memfs_malloc_map_privateE'/>
       <var-decl name='FLAGS_nomemfs_malloc_map_private' type-id='type-id-66' mangled-name='_ZN60FLAG__namespace_do_not_use_directly_use_DECLARE_bool_instead32FLAGS_nomemfs_malloc_map_privateE' visibility='default' filepath='src/memfs_malloc.cc' line='87' column='1' elf-symbol-id='_ZN60FLAG__namespace_do_not_use_directly_use_DECLARE_bool_instead32FLAGS_nomemfs_malloc_map_privateE'/>
     </namespace-decl>
-    <class-decl name='SysAllocator' size-in-bits='64' visibility='default' filepath='src/gperftools/malloc_extension.h' line='75' column='1' is-declaration-only='yes' id='type-id-958'>
-      <member-function access='private' constructor='yes'>
-        <function-decl name='SysAllocator' filepath='./src/gperftools/malloc_extension.h' line='77' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-902' is-artificial='yes'/>
-          <return type-id='type-id-56'/>
-        </function-decl>
-      </member-function>
-      <member-function access='private' destructor='yes' vtable-offset='-1'>
-        <function-decl name='~SysAllocator' mangled-name='_ZN12SysAllocatorD1Ev' filepath='src/malloc_extension.cc' line='108' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN12SysAllocatorD1Ev'>
-          <parameter type-id='type-id-902' is-artificial='yes'/>
-          <parameter type-id='type-id-1' is-artificial='yes'/>
-          <return type-id='type-id-56'/>
-        </function-decl>
-      </member-function>
-      <member-function access='private' vtable-offset='2'>
-        <function-decl name='Alloc' mangled-name='_ZN12SysAllocator5AllocEmPmm' filepath='src/gperftools/malloc_extension.h' line='84' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-902' is-artificial='yes'/>
-          <parameter type-id='type-id-57'/>
-          <parameter type-id='type-id-230'/>
-          <parameter type-id='type-id-57'/>
-          <return type-id='type-id-53'/>
-        </function-decl>
-      </member-function>
-    </class-decl>
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='src/memory_region_map.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-kFgaKP/gperftools-2.4' language='LANG_C_plus_plus'>
     <array-type-def dimensions='1' type-id='type-id-190' size-in-bits='8960' id='type-id-179'>
-      <subrange length='20' type-id='type-id-5' id='type-id-960'/>
+      <subrange length='20' type-id='type-id-5' id='type-id-954'/>
     </array-type-def>
     <array-type-def dimensions='2' type-id='type-id-53' size-in-bits='40960' id='type-id-180'>
-      <subrange length='20' type-id='type-id-5' id='type-id-960'/>
+      <subrange length='20' type-id='type-id-5' id='type-id-954'/>
       <subrange length='32' type-id='type-id-5' id='type-id-128'/>
     </array-type-def>
-    <class-decl name='STL_Allocator&lt;std::_Rb_tree_node&lt;MemoryRegionMap::Region&gt;, MemoryRegionMap::MyAllocator&gt;' size-in-bits='8' visibility='default' filepath='src/base/stl_allocator.h' line='60' column='1' id='type-id-961'>
+    <class-decl name='STL_Allocator&lt;std::_Rb_tree_node&lt;MemoryRegionMap::Region&gt;, MemoryRegionMap::MyAllocator&gt;' size-in-bits='8' visibility='default' filepath='src/base/stl_allocator.h' line='60' column='1' id='type-id-955'>
       <member-function access='private'>
         <function-decl name='STL_Allocator' filepath='src/base/stl_allocator.h' line='74' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-962' is-artificial='yes'/>
+          <parameter type-id='type-id-956' is-artificial='yes'/>
           <return type-id='type-id-56'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
         <function-decl name='STL_Allocator' filepath='src/base/stl_allocator.h' line='75' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-962' is-artificial='yes'/>
-          <parameter type-id='type-id-963'/>
+          <parameter type-id='type-id-956' is-artificial='yes'/>
+          <parameter type-id='type-id-957'/>
           <return type-id='type-id-56'/>
         </function-decl>
       </member-function>
       <member-function access='private' destructor='yes'>
         <function-decl name='~STL_Allocator' filepath='src/base/stl_allocator.h' line='77' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-962' is-artificial='yes'/>
+          <parameter type-id='type-id-956' is-artificial='yes'/>
           <parameter type-id='type-id-1' is-artificial='yes'/>
           <return type-id='type-id-56'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
         <function-decl name='address' mangled-name='_ZNK13STL_AllocatorISt13_Rb_tree_nodeIN15MemoryRegionMap6RegionEENS1_11MyAllocatorEE7addressERS3_' filepath='src/base/stl_allocator.h' line='79' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-964' is-artificial='yes'/>
-          <parameter type-id='type-id-965'/>
+          <parameter type-id='type-id-958' is-artificial='yes'/>
+          <parameter type-id='type-id-959'/>
           <return type-id='type-id-776'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
         <function-decl name='address' mangled-name='_ZNK13STL_AllocatorISt13_Rb_tree_nodeIN15MemoryRegionMap6RegionEENS1_11MyAllocatorEE7addressERKS3_' filepath='src/base/stl_allocator.h' line='80' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-964' is-artificial='yes'/>
-          <parameter type-id='type-id-966'/>
+          <parameter type-id='type-id-958' is-artificial='yes'/>
+          <parameter type-id='type-id-960'/>
           <return type-id='type-id-522'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
         <function-decl name='allocate' mangled-name='_ZN13STL_AllocatorISt13_Rb_tree_nodeIN15MemoryRegionMap6RegionEENS1_11MyAllocatorEE8allocateEmPKv' filepath='src/base/stl_allocator.h' line='82' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-962' is-artificial='yes'/>
+          <parameter type-id='type-id-956' is-artificial='yes'/>
           <parameter type-id='type-id-5'/>
           <parameter type-id='type-id-53'/>
           <return type-id='type-id-776'/>
@@ -15672,7 +15417,7 @@
       </member-function>
       <member-function access='private'>
         <function-decl name='deallocate' mangled-name='_ZN13STL_AllocatorISt13_Rb_tree_nodeIN15MemoryRegionMap6RegionEENS1_11MyAllocatorEE10deallocateEPS3_m' filepath='src/base/stl_allocator.h' line='86' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-962' is-artificial='yes'/>
+          <parameter type-id='type-id-956' is-artificial='yes'/>
           <parameter type-id='type-id-776'/>
           <parameter type-id='type-id-5'/>
           <return type-id='type-id-56'/>
@@ -15680,78 +15425,78 @@
       </member-function>
       <member-function access='private'>
         <function-decl name='max_size' mangled-name='_ZNK13STL_AllocatorISt13_Rb_tree_nodeIN15MemoryRegionMap6RegionEENS1_11MyAllocatorEE8max_sizeEv' filepath='src/base/stl_allocator.h' line='88' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-964' is-artificial='yes'/>
+          <parameter type-id='type-id-958' is-artificial='yes'/>
           <return type-id='type-id-57'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
         <function-decl name='construct' mangled-name='_ZN13STL_AllocatorISt13_Rb_tree_nodeIN15MemoryRegionMap6RegionEENS1_11MyAllocatorEE9constructEPS3_RKS3_' filepath='src/base/stl_allocator.h' line='90' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-962' is-artificial='yes'/>
+          <parameter type-id='type-id-956' is-artificial='yes'/>
           <parameter type-id='type-id-776'/>
-          <parameter type-id='type-id-966'/>
+          <parameter type-id='type-id-960'/>
           <return type-id='type-id-56'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
         <function-decl name='construct' mangled-name='_ZN13STL_AllocatorISt13_Rb_tree_nodeIN15MemoryRegionMap6RegionEENS1_11MyAllocatorEE9constructEPS3_' filepath='src/base/stl_allocator.h' line='91' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-962' is-artificial='yes'/>
+          <parameter type-id='type-id-956' is-artificial='yes'/>
           <parameter type-id='type-id-776'/>
           <return type-id='type-id-56'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
         <function-decl name='destroy' mangled-name='_ZN13STL_AllocatorISt13_Rb_tree_nodeIN15MemoryRegionMap6RegionEENS1_11MyAllocatorEE7destroyEPS3_' filepath='src/base/stl_allocator.h' line='92' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-962' is-artificial='yes'/>
+          <parameter type-id='type-id-956' is-artificial='yes'/>
           <parameter type-id='type-id-776'/>
           <return type-id='type-id-56'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
         <function-decl name='operator==' mangled-name='_ZNK13STL_AllocatorISt13_Rb_tree_nodeIN15MemoryRegionMap6RegionEENS1_11MyAllocatorEEeqERKS5_' filepath='src/base/stl_allocator.h' line='95' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-964' is-artificial='yes'/>
-          <parameter type-id='type-id-963'/>
+          <parameter type-id='type-id-958' is-artificial='yes'/>
+          <parameter type-id='type-id-957'/>
           <return type-id='type-id-55'/>
         </function-decl>
       </member-function>
     </class-decl>
-    <class-decl name='STL_Allocator&lt;MemoryRegionMap::Region, MemoryRegionMap::MyAllocator&gt;' size-in-bits='8' visibility='default' filepath='src/base/stl_allocator.h' line='60' column='1' id='type-id-967'>
+    <class-decl name='STL_Allocator&lt;MemoryRegionMap::Region, MemoryRegionMap::MyAllocator&gt;' size-in-bits='8' visibility='default' filepath='src/base/stl_allocator.h' line='60' column='1' id='type-id-961'>
       <member-function access='private'>
         <function-decl name='STL_Allocator' filepath='src/base/stl_allocator.h' line='74' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-968' is-artificial='yes'/>
+          <parameter type-id='type-id-962' is-artificial='yes'/>
           <return type-id='type-id-56'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
         <function-decl name='STL_Allocator' filepath='src/base/stl_allocator.h' line='75' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-968' is-artificial='yes'/>
-          <parameter type-id='type-id-969'/>
+          <parameter type-id='type-id-962' is-artificial='yes'/>
+          <parameter type-id='type-id-963'/>
           <return type-id='type-id-56'/>
         </function-decl>
       </member-function>
       <member-function access='private' destructor='yes'>
         <function-decl name='~STL_Allocator' filepath='src/base/stl_allocator.h' line='77' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-968' is-artificial='yes'/>
+          <parameter type-id='type-id-962' is-artificial='yes'/>
           <parameter type-id='type-id-1' is-artificial='yes'/>
           <return type-id='type-id-56'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
         <function-decl name='address' mangled-name='_ZNK13STL_AllocatorIN15MemoryRegionMap6RegionENS0_11MyAllocatorEE7addressERS1_' filepath='src/base/stl_allocator.h' line='79' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-970' is-artificial='yes'/>
+          <parameter type-id='type-id-964' is-artificial='yes'/>
           <parameter type-id='type-id-778'/>
           <return type-id='type-id-163'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
         <function-decl name='address' mangled-name='_ZNK13STL_AllocatorIN15MemoryRegionMap6RegionENS0_11MyAllocatorEE7addressERKS1_' filepath='src/base/stl_allocator.h' line='80' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-970' is-artificial='yes'/>
+          <parameter type-id='type-id-964' is-artificial='yes'/>
           <parameter type-id='type-id-160'/>
           <return type-id='type-id-162'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
         <function-decl name='allocate' mangled-name='_ZN13STL_AllocatorIN15MemoryRegionMap6RegionENS0_11MyAllocatorEE8allocateEmPKv' filepath='src/base/stl_allocator.h' line='82' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-968' is-artificial='yes'/>
+          <parameter type-id='type-id-962' is-artificial='yes'/>
           <parameter type-id='type-id-5'/>
           <parameter type-id='type-id-53'/>
           <return type-id='type-id-163'/>
@@ -15759,7 +15504,7 @@
       </member-function>
       <member-function access='private'>
         <function-decl name='deallocate' mangled-name='_ZN13STL_AllocatorIN15MemoryRegionMap6RegionENS0_11MyAllocatorEE10deallocateEPS1_m' filepath='src/base/stl_allocator.h' line='86' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-968' is-artificial='yes'/>
+          <parameter type-id='type-id-962' is-artificial='yes'/>
           <parameter type-id='type-id-163'/>
           <parameter type-id='type-id-5'/>
           <return type-id='type-id-56'/>
@@ -15767,13 +15512,13 @@
       </member-function>
       <member-function access='private'>
         <function-decl name='max_size' mangled-name='_ZNK13STL_AllocatorIN15MemoryRegionMap6RegionENS0_11MyAllocatorEE8max_sizeEv' filepath='src/base/stl_allocator.h' line='88' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-970' is-artificial='yes'/>
+          <parameter type-id='type-id-964' is-artificial='yes'/>
           <return type-id='type-id-57'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
         <function-decl name='construct' mangled-name='_ZN13STL_AllocatorIN15MemoryRegionMap6RegionENS0_11MyAllocatorEE9constructEPS1_RKS1_' filepath='src/base/stl_allocator.h' line='90' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-968' is-artificial='yes'/>
+          <parameter type-id='type-id-962' is-artificial='yes'/>
           <parameter type-id='type-id-163'/>
           <parameter type-id='type-id-160'/>
           <return type-id='type-id-56'/>
@@ -15781,29 +15526,29 @@
       </member-function>
       <member-function access='private'>
         <function-decl name='construct' mangled-name='_ZN13STL_AllocatorIN15MemoryRegionMap6RegionENS0_11MyAllocatorEE9constructEPS1_' filepath='src/base/stl_allocator.h' line='91' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-968' is-artificial='yes'/>
+          <parameter type-id='type-id-962' is-artificial='yes'/>
           <parameter type-id='type-id-163'/>
           <return type-id='type-id-56'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
         <function-decl name='destroy' mangled-name='_ZN13STL_AllocatorIN15MemoryRegionMap6RegionENS0_11MyAllocatorEE7destroyEPS1_' filepath='src/base/stl_allocator.h' line='92' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-968' is-artificial='yes'/>
+          <parameter type-id='type-id-962' is-artificial='yes'/>
           <parameter type-id='type-id-163'/>
           <return type-id='type-id-56'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
         <function-decl name='operator==' mangled-name='_ZNK13STL_AllocatorIN15MemoryRegionMap6RegionENS0_11MyAllocatorEEeqERKS3_' filepath='src/base/stl_allocator.h' line='95' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-970' is-artificial='yes'/>
-          <parameter type-id='type-id-969'/>
+          <parameter type-id='type-id-964' is-artificial='yes'/>
+          <parameter type-id='type-id-963'/>
           <return type-id='type-id-55'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
         <function-decl name='STL_Allocator&lt;std::_Rb_tree_node&lt;MemoryRegionMap::Region&gt; &gt;' filepath='src/base/stl_allocator.h' line='76' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-968' is-artificial='yes'/>
-          <parameter type-id='type-id-963'/>
+          <parameter type-id='type-id-962' is-artificial='yes'/>
+          <parameter type-id='type-id-957'/>
           <return type-id='type-id-56'/>
         </function-decl>
       </member-function>
@@ -15812,42 +15557,42 @@
     <reference-type-def kind='lvalue' type-id='type-id-161' size-in-bits='64' id='type-id-778'/>
     <pointer-type-def type-id='type-id-165' size-in-bits='64' id='type-id-170'/>
     <pointer-type-def type-id='type-id-167' size-in-bits='64' id='type-id-169'/>
-    <pointer-type-def type-id='type-id-967' size-in-bits='64' id='type-id-968'/>
-    <reference-type-def kind='lvalue' type-id='type-id-961' size-in-bits='64' id='type-id-971'/>
     <pointer-type-def type-id='type-id-961' size-in-bits='64' id='type-id-962'/>
-    <qualified-type-def type-id='type-id-158' const='yes' id='type-id-972'/>
-    <reference-type-def kind='lvalue' type-id='type-id-972' size-in-bits='64' id='type-id-973'/>
-    <pointer-type-def type-id='type-id-972' size-in-bits='64' id='type-id-159'/>
-    <qualified-type-def type-id='type-id-967' const='yes' id='type-id-974'/>
-    <reference-type-def kind='lvalue' type-id='type-id-974' size-in-bits='64' id='type-id-969'/>
-    <pointer-type-def type-id='type-id-974' size-in-bits='64' id='type-id-970'/>
-    <qualified-type-def type-id='type-id-961' const='yes' id='type-id-975'/>
-    <reference-type-def kind='lvalue' type-id='type-id-975' size-in-bits='64' id='type-id-963'/>
-    <pointer-type-def type-id='type-id-975' size-in-bits='64' id='type-id-964'/>
-    <qualified-type-def type-id='type-id-976' const='yes' id='type-id-977'/>
-    <pointer-type-def type-id='type-id-977' size-in-bits='64' id='type-id-978'/>
-    <qualified-type-def type-id='type-id-979' const='yes' id='type-id-980'/>
-    <reference-type-def kind='lvalue' type-id='type-id-980' size-in-bits='64' id='type-id-981'/>
-    <pointer-type-def type-id='type-id-980' size-in-bits='64' id='type-id-982'/>
+    <reference-type-def kind='lvalue' type-id='type-id-955' size-in-bits='64' id='type-id-965'/>
+    <pointer-type-def type-id='type-id-955' size-in-bits='64' id='type-id-956'/>
+    <qualified-type-def type-id='type-id-158' const='yes' id='type-id-966'/>
+    <reference-type-def kind='lvalue' type-id='type-id-966' size-in-bits='64' id='type-id-967'/>
+    <pointer-type-def type-id='type-id-966' size-in-bits='64' id='type-id-159'/>
+    <qualified-type-def type-id='type-id-961' const='yes' id='type-id-968'/>
+    <reference-type-def kind='lvalue' type-id='type-id-968' size-in-bits='64' id='type-id-963'/>
+    <pointer-type-def type-id='type-id-968' size-in-bits='64' id='type-id-964'/>
+    <qualified-type-def type-id='type-id-955' const='yes' id='type-id-969'/>
+    <reference-type-def kind='lvalue' type-id='type-id-969' size-in-bits='64' id='type-id-957'/>
+    <pointer-type-def type-id='type-id-969' size-in-bits='64' id='type-id-958'/>
+    <qualified-type-def type-id='type-id-970' const='yes' id='type-id-971'/>
+    <pointer-type-def type-id='type-id-971' size-in-bits='64' id='type-id-972'/>
+    <qualified-type-def type-id='type-id-973' const='yes' id='type-id-974'/>
+    <reference-type-def kind='lvalue' type-id='type-id-974' size-in-bits='64' id='type-id-975'/>
+    <pointer-type-def type-id='type-id-974' size-in-bits='64' id='type-id-976'/>
     <pointer-type-def type-id='type-id-502' size-in-bits='64' id='type-id-777'/>
-    <reference-type-def kind='lvalue' type-id='type-id-521' size-in-bits='64' id='type-id-966'/>
-    <qualified-type-def type-id='type-id-166' const='yes' id='type-id-983'/>
-    <reference-type-def kind='lvalue' type-id='type-id-983' size-in-bits='64' id='type-id-984'/>
-    <pointer-type-def type-id='type-id-983' size-in-bits='64' id='type-id-985'/>
-    <qualified-type-def type-id='type-id-986' const='yes' id='type-id-987'/>
-    <pointer-type-def type-id='type-id-987' size-in-bits='64' id='type-id-81'/>
-    <reference-type-def kind='lvalue' type-id='type-id-979' size-in-bits='64' id='type-id-988'/>
-    <pointer-type-def type-id='type-id-979' size-in-bits='64' id='type-id-989'/>
-    <pointer-type-def type-id='type-id-990' size-in-bits='64' id='type-id-991'/>
+    <reference-type-def kind='lvalue' type-id='type-id-521' size-in-bits='64' id='type-id-960'/>
+    <qualified-type-def type-id='type-id-166' const='yes' id='type-id-977'/>
+    <reference-type-def kind='lvalue' type-id='type-id-977' size-in-bits='64' id='type-id-978'/>
+    <pointer-type-def type-id='type-id-977' size-in-bits='64' id='type-id-979'/>
+    <qualified-type-def type-id='type-id-980' const='yes' id='type-id-981'/>
+    <pointer-type-def type-id='type-id-981' size-in-bits='64' id='type-id-81'/>
+    <reference-type-def kind='lvalue' type-id='type-id-973' size-in-bits='64' id='type-id-982'/>
+    <pointer-type-def type-id='type-id-973' size-in-bits='64' id='type-id-983'/>
+    <pointer-type-def type-id='type-id-984' size-in-bits='64' id='type-id-985'/>
     <reference-type-def kind='lvalue' type-id='type-id-501' size-in-bits='64' id='type-id-779'/>
     <pointer-type-def type-id='type-id-501' size-in-bits='64' id='type-id-775'/>
-    <reference-type-def kind='lvalue' type-id='type-id-520' size-in-bits='64' id='type-id-965'/>
+    <reference-type-def kind='lvalue' type-id='type-id-520' size-in-bits='64' id='type-id-959'/>
     <pointer-type-def type-id='type-id-520' size-in-bits='64' id='type-id-776'/>
-    <pointer-type-def type-id='type-id-992' size-in-bits='64' id='type-id-993'/>
-    <pointer-type-def type-id='type-id-994' size-in-bits='64' id='type-id-995'/>
-    <reference-type-def kind='lvalue' type-id='type-id-166' size-in-bits='64' id='type-id-996'/>
-    <pointer-type-def type-id='type-id-166' size-in-bits='64' id='type-id-997'/>
-    <pointer-type-def type-id='type-id-998' size-in-bits='64' id='type-id-184'/>
+    <pointer-type-def type-id='type-id-986' size-in-bits='64' id='type-id-987'/>
+    <pointer-type-def type-id='type-id-988' size-in-bits='64' id='type-id-989'/>
+    <reference-type-def kind='lvalue' type-id='type-id-166' size-in-bits='64' id='type-id-990'/>
+    <pointer-type-def type-id='type-id-166' size-in-bits='64' id='type-id-991'/>
+    <pointer-type-def type-id='type-id-992' size-in-bits='64' id='type-id-184'/>
     <namespace-decl name='std'>
       <function-decl name='__equal_aux&lt;const void**, const void**&gt;' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_algobase.h' line='822' column='1' visibility='default' binding='global' size-in-bits='64'>
         <parameter type-id='type-id-120'/>
@@ -15881,113 +15626,113 @@
       </function-decl>
       <class-decl name='set&lt;MemoryRegionMap::Region, MemoryRegionMap::RegionCmp, STL_Allocator&lt;MemoryRegionMap::Region, MemoryRegionMap::MyAllocator&gt; &gt;' size-in-bits='384' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_set.h' line='88' column='1' id='type-id-166'>
         <data-member access='private' layout-offset-in-bits='0'>
-          <var-decl name='_M_t' type-id='type-id-979' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_set.h' line='112' column='1'/>
+          <var-decl name='_M_t' type-id='type-id-973' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_set.h' line='112' column='1'/>
         </data-member>
         <member-function access='private'>
           <function-decl name='set' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_set.h' line='136' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-997' is-artificial='yes'/>
+            <parameter type-id='type-id-991' is-artificial='yes'/>
             <return type-id='type-id-56'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='set' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_set.h' line='145' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-997' is-artificial='yes'/>
-            <parameter type-id='type-id-973'/>
-            <parameter type-id='type-id-969'/>
+            <parameter type-id='type-id-991' is-artificial='yes'/>
+            <parameter type-id='type-id-967'/>
+            <parameter type-id='type-id-963'/>
             <return type-id='type-id-56'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='set' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_set.h' line='188' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-997' is-artificial='yes'/>
-            <parameter type-id='type-id-984'/>
+            <parameter type-id='type-id-991' is-artificial='yes'/>
+            <parameter type-id='type-id-978'/>
             <return type-id='type-id-56'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='operator=' mangled-name='_ZNSt3setIN15MemoryRegionMap6RegionENS0_9RegionCmpE13STL_AllocatorIS1_NS0_11MyAllocatorEEEaSERKS6_' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_set.h' line='227' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-997' is-artificial='yes'/>
-            <parameter type-id='type-id-984'/>
-            <return type-id='type-id-996'/>
+            <parameter type-id='type-id-991' is-artificial='yes'/>
+            <parameter type-id='type-id-978'/>
+            <return type-id='type-id-990'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='key_comp' mangled-name='_ZNKSt3setIN15MemoryRegionMap6RegionENS0_9RegionCmpE13STL_AllocatorIS1_NS0_11MyAllocatorEEE8key_compEv' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_set.h' line='274' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-985' is-artificial='yes'/>
+            <parameter type-id='type-id-979' is-artificial='yes'/>
             <return type-id='type-id-158'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='value_comp' mangled-name='_ZNKSt3setIN15MemoryRegionMap6RegionENS0_9RegionCmpE13STL_AllocatorIS1_NS0_11MyAllocatorEEE10value_compEv' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_set.h' line='278' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-985' is-artificial='yes'/>
+            <parameter type-id='type-id-979' is-artificial='yes'/>
             <return type-id='type-id-158'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='get_allocator' mangled-name='_ZNKSt3setIN15MemoryRegionMap6RegionENS0_9RegionCmpE13STL_AllocatorIS1_NS0_11MyAllocatorEEE13get_allocatorEv' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_set.h' line='282' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-985' is-artificial='yes'/>
-            <return type-id='type-id-967'/>
+            <parameter type-id='type-id-979' is-artificial='yes'/>
+            <return type-id='type-id-961'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='begin' mangled-name='_ZNKSt3setIN15MemoryRegionMap6RegionENS0_9RegionCmpE13STL_AllocatorIS1_NS0_11MyAllocatorEEE5beginEv' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_set.h' line='291' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-985' is-artificial='yes'/>
+            <parameter type-id='type-id-979' is-artificial='yes'/>
             <return type-id='type-id-175'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='end' mangled-name='_ZNKSt3setIN15MemoryRegionMap6RegionENS0_9RegionCmpE13STL_AllocatorIS1_NS0_11MyAllocatorEEE3endEv' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_set.h' line='300' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-985' is-artificial='yes'/>
+            <parameter type-id='type-id-979' is-artificial='yes'/>
             <return type-id='type-id-175'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='rbegin' mangled-name='_ZNKSt3setIN15MemoryRegionMap6RegionENS0_9RegionCmpE13STL_AllocatorIS1_NS0_11MyAllocatorEEE6rbeginEv' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_set.h' line='309' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-985' is-artificial='yes'/>
-            <return type-id='type-id-999'/>
+            <parameter type-id='type-id-979' is-artificial='yes'/>
+            <return type-id='type-id-993'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='rend' mangled-name='_ZNKSt3setIN15MemoryRegionMap6RegionENS0_9RegionCmpE13STL_AllocatorIS1_NS0_11MyAllocatorEEE4rendEv' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_set.h' line='318' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-985' is-artificial='yes'/>
-            <return type-id='type-id-999'/>
+            <parameter type-id='type-id-979' is-artificial='yes'/>
+            <return type-id='type-id-993'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='empty' mangled-name='_ZNKSt3setIN15MemoryRegionMap6RegionENS0_9RegionCmpE13STL_AllocatorIS1_NS0_11MyAllocatorEEE5emptyEv' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_set.h' line='361' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-985' is-artificial='yes'/>
+            <parameter type-id='type-id-979' is-artificial='yes'/>
             <return type-id='type-id-55'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='size' mangled-name='_ZNKSt3setIN15MemoryRegionMap6RegionENS0_9RegionCmpE13STL_AllocatorIS1_NS0_11MyAllocatorEEE4sizeEv' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_set.h' line='366' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-985' is-artificial='yes'/>
+            <parameter type-id='type-id-979' is-artificial='yes'/>
             <return type-id='type-id-57'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='max_size' mangled-name='_ZNKSt3setIN15MemoryRegionMap6RegionENS0_9RegionCmpE13STL_AllocatorIS1_NS0_11MyAllocatorEEE8max_sizeEv' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_set.h' line='371' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-985' is-artificial='yes'/>
+            <parameter type-id='type-id-979' is-artificial='yes'/>
             <return type-id='type-id-57'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='swap' mangled-name='_ZNSt3setIN15MemoryRegionMap6RegionENS0_9RegionCmpE13STL_AllocatorIS1_NS0_11MyAllocatorEEE4swapERS6_' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_set.h' line='389' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-997' is-artificial='yes'/>
-            <parameter type-id='type-id-996'/>
+            <parameter type-id='type-id-991' is-artificial='yes'/>
+            <parameter type-id='type-id-990'/>
             <return type-id='type-id-56'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='insert' mangled-name='_ZNSt3setIN15MemoryRegionMap6RegionENS0_9RegionCmpE13STL_AllocatorIS1_NS0_11MyAllocatorEEE6insertERKS1_' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_set.h' line='408' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-997' is-artificial='yes'/>
+            <parameter type-id='type-id-991' is-artificial='yes'/>
             <parameter type-id='type-id-160'/>
-            <return type-id='type-id-992'/>
+            <return type-id='type-id-986'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='insert' mangled-name='_ZNSt3setIN15MemoryRegionMap6RegionENS0_9RegionCmpE13STL_AllocatorIS1_NS0_11MyAllocatorEEE6insertESt23_Rb_tree_const_iteratorIS1_ERKS1_' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_set.h' line='435' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-997' is-artificial='yes'/>
+            <parameter type-id='type-id-991' is-artificial='yes'/>
             <parameter type-id='type-id-175'/>
             <parameter type-id='type-id-160'/>
             <return type-id='type-id-175'/>
@@ -15995,21 +15740,21 @@
         </member-function>
         <member-function access='private'>
           <function-decl name='erase' mangled-name='_ZNSt3setIN15MemoryRegionMap6RegionENS0_9RegionCmpE13STL_AllocatorIS1_NS0_11MyAllocatorEEE5eraseESt23_Rb_tree_const_iteratorIS1_E' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_set.h' line='475' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-997' is-artificial='yes'/>
+            <parameter type-id='type-id-991' is-artificial='yes'/>
             <parameter type-id='type-id-175'/>
             <return type-id='type-id-56'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='erase' mangled-name='_ZNSt3setIN15MemoryRegionMap6RegionENS0_9RegionCmpE13STL_AllocatorIS1_NS0_11MyAllocatorEEE5eraseERKS1_' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_set.h' line='490' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-997' is-artificial='yes'/>
+            <parameter type-id='type-id-991' is-artificial='yes'/>
             <parameter type-id='type-id-160'/>
             <return type-id='type-id-57'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='erase' mangled-name='_ZNSt3setIN15MemoryRegionMap6RegionENS0_9RegionCmpE13STL_AllocatorIS1_NS0_11MyAllocatorEEE5eraseESt23_Rb_tree_const_iteratorIS1_ES8_' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_set.h' line='505' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-997' is-artificial='yes'/>
+            <parameter type-id='type-id-991' is-artificial='yes'/>
             <parameter type-id='type-id-175'/>
             <parameter type-id='type-id-175'/>
             <return type-id='type-id-56'/>
@@ -16017,78 +15762,78 @@
         </member-function>
         <member-function access='private'>
           <function-decl name='clear' mangled-name='_ZNSt3setIN15MemoryRegionMap6RegionENS0_9RegionCmpE13STL_AllocatorIS1_NS0_11MyAllocatorEEE5clearEv' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_set.h' line='515' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-997' is-artificial='yes'/>
+            <parameter type-id='type-id-991' is-artificial='yes'/>
             <return type-id='type-id-56'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='count' mangled-name='_ZNKSt3setIN15MemoryRegionMap6RegionENS0_9RegionCmpE13STL_AllocatorIS1_NS0_11MyAllocatorEEE5countERKS1_' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_set.h' line='529' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-985' is-artificial='yes'/>
+            <parameter type-id='type-id-979' is-artificial='yes'/>
             <parameter type-id='type-id-160'/>
             <return type-id='type-id-57'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='find' mangled-name='_ZNSt3setIN15MemoryRegionMap6RegionENS0_9RegionCmpE13STL_AllocatorIS1_NS0_11MyAllocatorEEE4findERKS1_' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_set.h' line='547' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-997' is-artificial='yes'/>
+            <parameter type-id='type-id-991' is-artificial='yes'/>
             <parameter type-id='type-id-160'/>
             <return type-id='type-id-175'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='find' mangled-name='_ZNKSt3setIN15MemoryRegionMap6RegionENS0_9RegionCmpE13STL_AllocatorIS1_NS0_11MyAllocatorEEE4findERKS1_' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_set.h' line='551' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-985' is-artificial='yes'/>
+            <parameter type-id='type-id-979' is-artificial='yes'/>
             <parameter type-id='type-id-160'/>
             <return type-id='type-id-175'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='lower_bound' mangled-name='_ZNSt3setIN15MemoryRegionMap6RegionENS0_9RegionCmpE13STL_AllocatorIS1_NS0_11MyAllocatorEEE11lower_boundERKS1_' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_set.h' line='568' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-997' is-artificial='yes'/>
+            <parameter type-id='type-id-991' is-artificial='yes'/>
             <parameter type-id='type-id-160'/>
             <return type-id='type-id-175'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='lower_bound' mangled-name='_ZNKSt3setIN15MemoryRegionMap6RegionENS0_9RegionCmpE13STL_AllocatorIS1_NS0_11MyAllocatorEEE11lower_boundERKS1_' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_set.h' line='572' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-985' is-artificial='yes'/>
+            <parameter type-id='type-id-979' is-artificial='yes'/>
             <parameter type-id='type-id-160'/>
             <return type-id='type-id-175'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='upper_bound' mangled-name='_ZNSt3setIN15MemoryRegionMap6RegionENS0_9RegionCmpE13STL_AllocatorIS1_NS0_11MyAllocatorEEE11upper_boundERKS1_' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_set.h' line='584' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-997' is-artificial='yes'/>
+            <parameter type-id='type-id-991' is-artificial='yes'/>
             <parameter type-id='type-id-160'/>
             <return type-id='type-id-175'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='upper_bound' mangled-name='_ZNKSt3setIN15MemoryRegionMap6RegionENS0_9RegionCmpE13STL_AllocatorIS1_NS0_11MyAllocatorEEE11upper_boundERKS1_' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_set.h' line='588' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-985' is-artificial='yes'/>
+            <parameter type-id='type-id-979' is-artificial='yes'/>
             <parameter type-id='type-id-160'/>
             <return type-id='type-id-175'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='equal_range' mangled-name='_ZNSt3setIN15MemoryRegionMap6RegionENS0_9RegionCmpE13STL_AllocatorIS1_NS0_11MyAllocatorEEE11equal_rangeERKS1_' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_set.h' line='609' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-997' is-artificial='yes'/>
+            <parameter type-id='type-id-991' is-artificial='yes'/>
             <parameter type-id='type-id-160'/>
-            <return type-id='type-id-1000'/>
+            <return type-id='type-id-994'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='equal_range' mangled-name='_ZNKSt3setIN15MemoryRegionMap6RegionENS0_9RegionCmpE13STL_AllocatorIS1_NS0_11MyAllocatorEEE11equal_rangeERKS1_' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_set.h' line='613' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-985' is-artificial='yes'/>
+            <parameter type-id='type-id-979' is-artificial='yes'/>
             <parameter type-id='type-id-160'/>
-            <return type-id='type-id-1000'/>
+            <return type-id='type-id-994'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='_Rb_tree&lt;MemoryRegionMap::Region, MemoryRegionMap::Region, std::_Identity&lt;MemoryRegionMap::Region&gt;, MemoryRegionMap::RegionCmp, STL_Allocator&lt;MemoryRegionMap::Region, MemoryRegionMap::MyAllocator&gt; &gt;' size-in-bits='384' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='323' column='1' id='type-id-979'>
+      <class-decl name='_Rb_tree&lt;MemoryRegionMap::Region, MemoryRegionMap::Region, std::_Identity&lt;MemoryRegionMap::Region&gt;, MemoryRegionMap::RegionCmp, STL_Allocator&lt;MemoryRegionMap::Region, MemoryRegionMap::MyAllocator&gt; &gt;' size-in-bits='384' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='323' column='1' id='type-id-973'>
         <member-type access='protected'>
-          <class-decl name='_Rb_tree_impl&lt;MemoryRegionMap::RegionCmp, true&gt;' size-in-bits='384' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='427' column='1' id='type-id-990'>
-            <base-class access='public' layout-offset-in-bits='0' type-id='type-id-961'/>
+          <class-decl name='_Rb_tree_impl&lt;MemoryRegionMap::RegionCmp, true&gt;' size-in-bits='384' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='427' column='1' id='type-id-984'>
+            <base-class access='public' layout-offset-in-bits='0' type-id='type-id-955'/>
             <data-member access='public' layout-offset-in-bits='0'>
               <var-decl name='_M_key_compare' type-id='type-id-158' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='428' column='1'/>
             </data-member>
@@ -16100,138 +15845,138 @@
             </data-member>
             <member-function access='public'>
               <function-decl name='_Rb_tree_impl' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='432' column='1' visibility='default' binding='global' size-in-bits='64'>
-                <parameter type-id='type-id-991' is-artificial='yes'/>
+                <parameter type-id='type-id-985' is-artificial='yes'/>
                 <return type-id='type-id-56'/>
               </function-decl>
             </member-function>
             <member-function access='public'>
               <function-decl name='_Rb_tree_impl' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='437' column='1' visibility='default' binding='global' size-in-bits='64'>
-                <parameter type-id='type-id-991' is-artificial='yes'/>
-                <parameter type-id='type-id-973'/>
-                <parameter type-id='type-id-963'/>
+                <parameter type-id='type-id-985' is-artificial='yes'/>
+                <parameter type-id='type-id-967'/>
+                <parameter type-id='type-id-957'/>
                 <return type-id='type-id-56'/>
               </function-decl>
             </member-function>
             <member-function access='private'>
               <function-decl name='_M_initialize' mangled-name='_ZNSt8_Rb_treeIN15MemoryRegionMap6RegionES1_St9_IdentityIS1_ENS0_9RegionCmpE13STL_AllocatorIS1_NS0_11MyAllocatorEEE13_Rb_tree_implIS4_Lb1EE13_M_initializeEv' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='444' column='1' visibility='default' binding='global' size-in-bits='64'>
-                <parameter type-id='type-id-991' is-artificial='yes'/>
+                <parameter type-id='type-id-985' is-artificial='yes'/>
                 <return type-id='type-id-56'/>
               </function-decl>
             </member-function>
           </class-decl>
         </member-type>
         <data-member access='protected' layout-offset-in-bits='0'>
-          <var-decl name='_M_impl' type-id='type-id-990' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='453' column='1'/>
+          <var-decl name='_M_impl' type-id='type-id-984' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='453' column='1'/>
         </data-member>
         <member-function access='private'>
           <function-decl name='_M_get_Node_allocator' mangled-name='_ZNSt8_Rb_treeIN15MemoryRegionMap6RegionES1_St9_IdentityIS1_ENS0_9RegionCmpE13STL_AllocatorIS1_NS0_11MyAllocatorEEE21_M_get_Node_allocatorEv' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='345' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-989' is-artificial='yes'/>
-            <return type-id='type-id-971'/>
+            <parameter type-id='type-id-983' is-artificial='yes'/>
+            <return type-id='type-id-965'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='_M_get_Node_allocator' mangled-name='_ZNKSt8_Rb_treeIN15MemoryRegionMap6RegionES1_St9_IdentityIS1_ENS0_9RegionCmpE13STL_AllocatorIS1_NS0_11MyAllocatorEEE21_M_get_Node_allocatorEv' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='349' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-982' is-artificial='yes'/>
-            <return type-id='type-id-963'/>
+            <parameter type-id='type-id-976' is-artificial='yes'/>
+            <return type-id='type-id-957'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='get_allocator' mangled-name='_ZNKSt8_Rb_treeIN15MemoryRegionMap6RegionES1_St9_IdentityIS1_ENS0_9RegionCmpE13STL_AllocatorIS1_NS0_11MyAllocatorEEE13get_allocatorEv' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='353' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-982' is-artificial='yes'/>
-            <return type-id='type-id-967'/>
+            <parameter type-id='type-id-976' is-artificial='yes'/>
+            <return type-id='type-id-961'/>
           </function-decl>
         </member-function>
         <member-function access='protected'>
           <function-decl name='_M_get_node' mangled-name='_ZNSt8_Rb_treeIN15MemoryRegionMap6RegionES1_St9_IdentityIS1_ENS0_9RegionCmpE13STL_AllocatorIS1_NS0_11MyAllocatorEEE11_M_get_nodeEv' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='358' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-989' is-artificial='yes'/>
+            <parameter type-id='type-id-983' is-artificial='yes'/>
             <return type-id='type-id-776'/>
           </function-decl>
         </member-function>
         <member-function access='protected'>
           <function-decl name='_M_put_node' mangled-name='_ZNSt8_Rb_treeIN15MemoryRegionMap6RegionES1_St9_IdentityIS1_ENS0_9RegionCmpE13STL_AllocatorIS1_NS0_11MyAllocatorEEE11_M_put_nodeEPSt13_Rb_tree_nodeIS1_E' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='362' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-989' is-artificial='yes'/>
+            <parameter type-id='type-id-983' is-artificial='yes'/>
             <parameter type-id='type-id-776'/>
             <return type-id='type-id-56'/>
           </function-decl>
         </member-function>
         <member-function access='protected'>
           <function-decl name='_M_create_node' mangled-name='_ZNSt8_Rb_treeIN15MemoryRegionMap6RegionES1_St9_IdentityIS1_ENS0_9RegionCmpE13STL_AllocatorIS1_NS0_11MyAllocatorEEE14_M_create_nodeERKS1_' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='367' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-989' is-artificial='yes'/>
+            <parameter type-id='type-id-983' is-artificial='yes'/>
             <parameter type-id='type-id-160'/>
             <return type-id='type-id-776'/>
           </function-decl>
         </member-function>
         <member-function access='protected'>
           <function-decl name='_M_destroy_node' mangled-name='_ZNSt8_Rb_treeIN15MemoryRegionMap6RegionES1_St9_IdentityIS1_ENS0_9RegionCmpE13STL_AllocatorIS1_NS0_11MyAllocatorEEE15_M_destroy_nodeEPSt13_Rb_tree_nodeIS1_E' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='381' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-989' is-artificial='yes'/>
+            <parameter type-id='type-id-983' is-artificial='yes'/>
             <parameter type-id='type-id-776'/>
             <return type-id='type-id-56'/>
           </function-decl>
         </member-function>
         <member-function access='protected'>
           <function-decl name='_M_clone_node' mangled-name='_ZNSt8_Rb_treeIN15MemoryRegionMap6RegionES1_St9_IdentityIS1_ENS0_9RegionCmpE13STL_AllocatorIS1_NS0_11MyAllocatorEEE13_M_clone_nodeEPKSt13_Rb_tree_nodeIS1_E' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='414' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-989' is-artificial='yes'/>
+            <parameter type-id='type-id-983' is-artificial='yes'/>
             <parameter type-id='type-id-522'/>
             <return type-id='type-id-776'/>
           </function-decl>
         </member-function>
         <member-function access='protected'>
           <function-decl name='_M_root' mangled-name='_ZNSt8_Rb_treeIN15MemoryRegionMap6RegionES1_St9_IdentityIS1_ENS0_9RegionCmpE13STL_AllocatorIS1_NS0_11MyAllocatorEEE7_M_rootEv' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='457' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-989' is-artificial='yes'/>
+            <parameter type-id='type-id-983' is-artificial='yes'/>
             <return type-id='type-id-651'/>
           </function-decl>
         </member-function>
         <member-function access='protected'>
           <function-decl name='_M_root' mangled-name='_ZNKSt8_Rb_treeIN15MemoryRegionMap6RegionES1_St9_IdentityIS1_ENS0_9RegionCmpE13STL_AllocatorIS1_NS0_11MyAllocatorEEE7_M_rootEv' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='461' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-982' is-artificial='yes'/>
+            <parameter type-id='type-id-976' is-artificial='yes'/>
             <return type-id='type-id-533'/>
           </function-decl>
         </member-function>
         <member-function access='protected'>
           <function-decl name='_M_leftmost' mangled-name='_ZNSt8_Rb_treeIN15MemoryRegionMap6RegionES1_St9_IdentityIS1_ENS0_9RegionCmpE13STL_AllocatorIS1_NS0_11MyAllocatorEEE11_M_leftmostEv' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='465' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-989' is-artificial='yes'/>
+            <parameter type-id='type-id-983' is-artificial='yes'/>
             <return type-id='type-id-651'/>
           </function-decl>
         </member-function>
         <member-function access='protected'>
           <function-decl name='_M_leftmost' mangled-name='_ZNKSt8_Rb_treeIN15MemoryRegionMap6RegionES1_St9_IdentityIS1_ENS0_9RegionCmpE13STL_AllocatorIS1_NS0_11MyAllocatorEEE11_M_leftmostEv' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='469' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-982' is-artificial='yes'/>
+            <parameter type-id='type-id-976' is-artificial='yes'/>
             <return type-id='type-id-533'/>
           </function-decl>
         </member-function>
         <member-function access='protected'>
           <function-decl name='_M_rightmost' mangled-name='_ZNSt8_Rb_treeIN15MemoryRegionMap6RegionES1_St9_IdentityIS1_ENS0_9RegionCmpE13STL_AllocatorIS1_NS0_11MyAllocatorEEE12_M_rightmostEv' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='473' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-989' is-artificial='yes'/>
+            <parameter type-id='type-id-983' is-artificial='yes'/>
             <return type-id='type-id-651'/>
           </function-decl>
         </member-function>
         <member-function access='protected'>
           <function-decl name='_M_rightmost' mangled-name='_ZNKSt8_Rb_treeIN15MemoryRegionMap6RegionES1_St9_IdentityIS1_ENS0_9RegionCmpE13STL_AllocatorIS1_NS0_11MyAllocatorEEE12_M_rightmostEv' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='477' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-982' is-artificial='yes'/>
+            <parameter type-id='type-id-976' is-artificial='yes'/>
             <return type-id='type-id-533'/>
           </function-decl>
         </member-function>
         <member-function access='protected'>
           <function-decl name='_M_begin' mangled-name='_ZNSt8_Rb_treeIN15MemoryRegionMap6RegionES1_St9_IdentityIS1_ENS0_9RegionCmpE13STL_AllocatorIS1_NS0_11MyAllocatorEEE8_M_beginEv' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='481' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-989' is-artificial='yes'/>
+            <parameter type-id='type-id-983' is-artificial='yes'/>
             <return type-id='type-id-776'/>
           </function-decl>
         </member-function>
         <member-function access='protected'>
           <function-decl name='_M_begin' mangled-name='_ZNKSt8_Rb_treeIN15MemoryRegionMap6RegionES1_St9_IdentityIS1_ENS0_9RegionCmpE13STL_AllocatorIS1_NS0_11MyAllocatorEEE8_M_beginEv' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='485' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-982' is-artificial='yes'/>
+            <parameter type-id='type-id-976' is-artificial='yes'/>
             <return type-id='type-id-522'/>
           </function-decl>
         </member-function>
         <member-function access='protected'>
           <function-decl name='_M_end' mangled-name='_ZNSt8_Rb_treeIN15MemoryRegionMap6RegionES1_St9_IdentityIS1_ENS0_9RegionCmpE13STL_AllocatorIS1_NS0_11MyAllocatorEEE6_M_endEv' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='492' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-989' is-artificial='yes'/>
+            <parameter type-id='type-id-983' is-artificial='yes'/>
             <return type-id='type-id-776'/>
           </function-decl>
         </member-function>
         <member-function access='protected'>
           <function-decl name='_M_end' mangled-name='_ZNKSt8_Rb_treeIN15MemoryRegionMap6RegionES1_St9_IdentityIS1_ENS0_9RegionCmpE13STL_AllocatorIS1_NS0_11MyAllocatorEEE6_M_endEv' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='496' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-982' is-artificial='yes'/>
+            <parameter type-id='type-id-976' is-artificial='yes'/>
             <return type-id='type-id-522'/>
           </function-decl>
         </member-function>
@@ -16309,7 +16054,7 @@
         </member-function>
         <member-function access='private'>
           <function-decl name='_M_insert_' mangled-name='_ZNSt8_Rb_treeIN15MemoryRegionMap6RegionES1_St9_IdentityIS1_ENS0_9RegionCmpE13STL_AllocatorIS1_NS0_11MyAllocatorEEE10_M_insert_EPKSt18_Rb_tree_node_baseSB_RKS1_' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='874' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt8_Rb_treeIN15MemoryRegionMap6RegionES1_St9_IdentityIS1_ENS0_9RegionCmpE13STL_AllocatorIS1_NS0_11MyAllocatorEEE10_M_insert_EPKSt18_Rb_tree_node_baseSB_RKS1_'>
-            <parameter type-id='type-id-989' is-artificial='yes'/>
+            <parameter type-id='type-id-983' is-artificial='yes'/>
             <parameter type-id='type-id-533'/>
             <parameter type-id='type-id-533'/>
             <parameter type-id='type-id-160'/>
@@ -16318,7 +16063,7 @@
         </member-function>
         <member-function access='private'>
           <function-decl name='_M_insert_lower' mangled-name='_ZNSt8_Rb_treeIN15MemoryRegionMap6RegionES1_St9_IdentityIS1_ENS0_9RegionCmpE13STL_AllocatorIS1_NS0_11MyAllocatorEEE15_M_insert_lowerEPSt18_Rb_tree_node_baseSA_RKS1_' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='893' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-989' is-artificial='yes'/>
+            <parameter type-id='type-id-983' is-artificial='yes'/>
             <parameter type-id='type-id-650'/>
             <parameter type-id='type-id-650'/>
             <parameter type-id='type-id-160'/>
@@ -16327,14 +16072,14 @@
         </member-function>
         <member-function access='private'>
           <function-decl name='_M_insert_equal_lower' mangled-name='_ZNSt8_Rb_treeIN15MemoryRegionMap6RegionES1_St9_IdentityIS1_ENS0_9RegionCmpE13STL_AllocatorIS1_NS0_11MyAllocatorEEE21_M_insert_equal_lowerERKS1_' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='911' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-989' is-artificial='yes'/>
+            <parameter type-id='type-id-983' is-artificial='yes'/>
             <parameter type-id='type-id-160'/>
             <return type-id='type-id-501'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='_M_copy' mangled-name='_ZNSt8_Rb_treeIN15MemoryRegionMap6RegionES1_St9_IdentityIS1_ENS0_9RegionCmpE13STL_AllocatorIS1_NS0_11MyAllocatorEEE7_M_copyEPKSt13_Rb_tree_nodeIS1_EPSA_' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='928' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-989' is-artificial='yes'/>
+            <parameter type-id='type-id-983' is-artificial='yes'/>
             <parameter type-id='type-id-522'/>
             <parameter type-id='type-id-776'/>
             <return type-id='type-id-776'/>
@@ -16342,14 +16087,14 @@
         </member-function>
         <member-function access='private'>
           <function-decl name='_M_erase' mangled-name='_ZNSt8_Rb_treeIN15MemoryRegionMap6RegionES1_St9_IdentityIS1_ENS0_9RegionCmpE13STL_AllocatorIS1_NS0_11MyAllocatorEEE8_M_eraseEPSt13_Rb_tree_nodeIS1_E' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='964' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt8_Rb_treeIN15MemoryRegionMap6RegionES1_St9_IdentityIS1_ENS0_9RegionCmpE13STL_AllocatorIS1_NS0_11MyAllocatorEEE8_M_eraseEPSt13_Rb_tree_nodeIS1_E'>
-            <parameter type-id='type-id-989' is-artificial='yes'/>
+            <parameter type-id='type-id-983' is-artificial='yes'/>
             <parameter type-id='type-id-776'/>
             <return type-id='type-id-56'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='_M_lower_bound' mangled-name='_ZNSt8_Rb_treeIN15MemoryRegionMap6RegionES1_St9_IdentityIS1_ENS0_9RegionCmpE13STL_AllocatorIS1_NS0_11MyAllocatorEEE14_M_lower_boundEPSt13_Rb_tree_nodeIS1_ESB_RKS1_' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='981' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-989' is-artificial='yes'/>
+            <parameter type-id='type-id-983' is-artificial='yes'/>
             <parameter type-id='type-id-776'/>
             <parameter type-id='type-id-776'/>
             <parameter type-id='type-id-160'/>
@@ -16358,7 +16103,7 @@
         </member-function>
         <member-function access='private'>
           <function-decl name='_M_lower_bound' mangled-name='_ZNKSt8_Rb_treeIN15MemoryRegionMap6RegionES1_St9_IdentityIS1_ENS0_9RegionCmpE13STL_AllocatorIS1_NS0_11MyAllocatorEEE14_M_lower_boundEPKSt13_Rb_tree_nodeIS1_ESC_RKS1_' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='997' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-982' is-artificial='yes'/>
+            <parameter type-id='type-id-976' is-artificial='yes'/>
             <parameter type-id='type-id-522'/>
             <parameter type-id='type-id-522'/>
             <parameter type-id='type-id-160'/>
@@ -16367,7 +16112,7 @@
         </member-function>
         <member-function access='private'>
           <function-decl name='_M_upper_bound' mangled-name='_ZNSt8_Rb_treeIN15MemoryRegionMap6RegionES1_St9_IdentityIS1_ENS0_9RegionCmpE13STL_AllocatorIS1_NS0_11MyAllocatorEEE14_M_upper_boundEPSt13_Rb_tree_nodeIS1_ESB_RKS1_' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='1013' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-989' is-artificial='yes'/>
+            <parameter type-id='type-id-983' is-artificial='yes'/>
             <parameter type-id='type-id-776'/>
             <parameter type-id='type-id-776'/>
             <parameter type-id='type-id-160'/>
@@ -16376,7 +16121,7 @@
         </member-function>
         <member-function access='private'>
           <function-decl name='_M_upper_bound' mangled-name='_ZNKSt8_Rb_treeIN15MemoryRegionMap6RegionES1_St9_IdentityIS1_ENS0_9RegionCmpE13STL_AllocatorIS1_NS0_11MyAllocatorEEE14_M_upper_boundEPKSt13_Rb_tree_nodeIS1_ESC_RKS1_' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='1029' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-982' is-artificial='yes'/>
+            <parameter type-id='type-id-976' is-artificial='yes'/>
             <parameter type-id='type-id-522'/>
             <parameter type-id='type-id-522'/>
             <parameter type-id='type-id-160'/>
@@ -16385,135 +16130,135 @@
         </member-function>
         <member-function access='private'>
           <function-decl name='_Rb_tree' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='591' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-989' is-artificial='yes'/>
+            <parameter type-id='type-id-983' is-artificial='yes'/>
             <return type-id='type-id-56'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='_Rb_tree' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='593' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-989' is-artificial='yes'/>
-            <parameter type-id='type-id-973'/>
-            <parameter type-id='type-id-969'/>
+            <parameter type-id='type-id-983' is-artificial='yes'/>
+            <parameter type-id='type-id-967'/>
+            <parameter type-id='type-id-963'/>
             <return type-id='type-id-56'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='_Rb_tree' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='597' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-989' is-artificial='yes'/>
-            <parameter type-id='type-id-981'/>
+            <parameter type-id='type-id-983' is-artificial='yes'/>
+            <parameter type-id='type-id-975'/>
             <return type-id='type-id-56'/>
           </function-decl>
         </member-function>
         <member-function access='private' destructor='yes'>
           <function-decl name='~_Rb_tree' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='613' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-989' is-artificial='yes'/>
+            <parameter type-id='type-id-983' is-artificial='yes'/>
             <parameter type-id='type-id-1' is-artificial='yes'/>
             <return type-id='type-id-56'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='operator=' mangled-name='_ZNSt8_Rb_treeIN15MemoryRegionMap6RegionES1_St9_IdentityIS1_ENS0_9RegionCmpE13STL_AllocatorIS1_NS0_11MyAllocatorEEEaSERKS8_' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='852' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-989' is-artificial='yes'/>
-            <parameter type-id='type-id-981'/>
-            <return type-id='type-id-988'/>
+            <parameter type-id='type-id-983' is-artificial='yes'/>
+            <parameter type-id='type-id-975'/>
+            <return type-id='type-id-982'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='key_comp' mangled-name='_ZNKSt8_Rb_treeIN15MemoryRegionMap6RegionES1_St9_IdentityIS1_ENS0_9RegionCmpE13STL_AllocatorIS1_NS0_11MyAllocatorEEE8key_compEv' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='621' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-982' is-artificial='yes'/>
+            <parameter type-id='type-id-976' is-artificial='yes'/>
             <return type-id='type-id-158'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='begin' mangled-name='_ZNSt8_Rb_treeIN15MemoryRegionMap6RegionES1_St9_IdentityIS1_ENS0_9RegionCmpE13STL_AllocatorIS1_NS0_11MyAllocatorEEE5beginEv' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='625' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-989' is-artificial='yes'/>
+            <parameter type-id='type-id-983' is-artificial='yes'/>
             <return type-id='type-id-501'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='begin' mangled-name='_ZNKSt8_Rb_treeIN15MemoryRegionMap6RegionES1_St9_IdentityIS1_ENS0_9RegionCmpE13STL_AllocatorIS1_NS0_11MyAllocatorEEE5beginEv' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='632' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-982' is-artificial='yes'/>
+            <parameter type-id='type-id-976' is-artificial='yes'/>
             <return type-id='type-id-175'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='end' mangled-name='_ZNSt8_Rb_treeIN15MemoryRegionMap6RegionES1_St9_IdentityIS1_ENS0_9RegionCmpE13STL_AllocatorIS1_NS0_11MyAllocatorEEE3endEv' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='639' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-989' is-artificial='yes'/>
+            <parameter type-id='type-id-983' is-artificial='yes'/>
             <return type-id='type-id-501'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='end' mangled-name='_ZNKSt8_Rb_treeIN15MemoryRegionMap6RegionES1_St9_IdentityIS1_ENS0_9RegionCmpE13STL_AllocatorIS1_NS0_11MyAllocatorEEE3endEv' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='643' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-982' is-artificial='yes'/>
+            <parameter type-id='type-id-976' is-artificial='yes'/>
             <return type-id='type-id-175'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='rbegin' mangled-name='_ZNSt8_Rb_treeIN15MemoryRegionMap6RegionES1_St9_IdentityIS1_ENS0_9RegionCmpE13STL_AllocatorIS1_NS0_11MyAllocatorEEE6rbeginEv' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='650' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-989' is-artificial='yes'/>
-            <return type-id='type-id-1001'/>
+            <parameter type-id='type-id-983' is-artificial='yes'/>
+            <return type-id='type-id-995'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='rbegin' mangled-name='_ZNKSt8_Rb_treeIN15MemoryRegionMap6RegionES1_St9_IdentityIS1_ENS0_9RegionCmpE13STL_AllocatorIS1_NS0_11MyAllocatorEEE6rbeginEv' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='654' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-982' is-artificial='yes'/>
-            <return type-id='type-id-999'/>
+            <parameter type-id='type-id-976' is-artificial='yes'/>
+            <return type-id='type-id-993'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='rend' mangled-name='_ZNSt8_Rb_treeIN15MemoryRegionMap6RegionES1_St9_IdentityIS1_ENS0_9RegionCmpE13STL_AllocatorIS1_NS0_11MyAllocatorEEE4rendEv' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='658' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-989' is-artificial='yes'/>
-            <return type-id='type-id-1001'/>
+            <parameter type-id='type-id-983' is-artificial='yes'/>
+            <return type-id='type-id-995'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='rend' mangled-name='_ZNKSt8_Rb_treeIN15MemoryRegionMap6RegionES1_St9_IdentityIS1_ENS0_9RegionCmpE13STL_AllocatorIS1_NS0_11MyAllocatorEEE4rendEv' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='662' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-982' is-artificial='yes'/>
-            <return type-id='type-id-999'/>
+            <parameter type-id='type-id-976' is-artificial='yes'/>
+            <return type-id='type-id-993'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='empty' mangled-name='_ZNKSt8_Rb_treeIN15MemoryRegionMap6RegionES1_St9_IdentityIS1_ENS0_9RegionCmpE13STL_AllocatorIS1_NS0_11MyAllocatorEEE5emptyEv' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='666' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-982' is-artificial='yes'/>
+            <parameter type-id='type-id-976' is-artificial='yes'/>
             <return type-id='type-id-55'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='size' mangled-name='_ZNKSt8_Rb_treeIN15MemoryRegionMap6RegionES1_St9_IdentityIS1_ENS0_9RegionCmpE13STL_AllocatorIS1_NS0_11MyAllocatorEEE4sizeEv' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='670' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-982' is-artificial='yes'/>
+            <parameter type-id='type-id-976' is-artificial='yes'/>
             <return type-id='type-id-57'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='max_size' mangled-name='_ZNKSt8_Rb_treeIN15MemoryRegionMap6RegionES1_St9_IdentityIS1_ENS0_9RegionCmpE13STL_AllocatorIS1_NS0_11MyAllocatorEEE8max_sizeEv' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='674' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-982' is-artificial='yes'/>
+            <parameter type-id='type-id-976' is-artificial='yes'/>
             <return type-id='type-id-57'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='swap' mangled-name='_ZNSt8_Rb_treeIN15MemoryRegionMap6RegionES1_St9_IdentityIS1_ENS0_9RegionCmpE13STL_AllocatorIS1_NS0_11MyAllocatorEEE4swapERS8_' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='1106' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-989' is-artificial='yes'/>
-            <parameter type-id='type-id-988'/>
+            <parameter type-id='type-id-983' is-artificial='yes'/>
+            <parameter type-id='type-id-982'/>
             <return type-id='type-id-56'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='_M_insert_unique' mangled-name='_ZNSt8_Rb_treeIN15MemoryRegionMap6RegionES1_St9_IdentityIS1_ENS0_9RegionCmpE13STL_AllocatorIS1_NS0_11MyAllocatorEEE16_M_insert_uniqueERKS1_' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='1161' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-989' is-artificial='yes'/>
+            <parameter type-id='type-id-983' is-artificial='yes'/>
             <parameter type-id='type-id-160'/>
-            <return type-id='type-id-994'/>
+            <return type-id='type-id-988'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='_M_insert_equal' mangled-name='_ZNSt8_Rb_treeIN15MemoryRegionMap6RegionES1_St9_IdentityIS1_ENS0_9RegionCmpE13STL_AllocatorIS1_NS0_11MyAllocatorEEE15_M_insert_equalERKS1_' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='1189' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-989' is-artificial='yes'/>
+            <parameter type-id='type-id-983' is-artificial='yes'/>
             <parameter type-id='type-id-160'/>
             <return type-id='type-id-501'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='_M_insert_unique_' mangled-name='_ZNSt8_Rb_treeIN15MemoryRegionMap6RegionES1_St9_IdentityIS1_ENS0_9RegionCmpE13STL_AllocatorIS1_NS0_11MyAllocatorEEE17_M_insert_unique_ESt23_Rb_tree_const_iteratorIS1_ERKS1_' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='1206' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-989' is-artificial='yes'/>
+            <parameter type-id='type-id-983' is-artificial='yes'/>
             <parameter type-id='type-id-175'/>
             <parameter type-id='type-id-160'/>
             <return type-id='type-id-501'/>
@@ -16521,7 +16266,7 @@
         </member-function>
         <member-function access='private'>
           <function-decl name='_M_insert_equal_' mangled-name='_ZNSt8_Rb_treeIN15MemoryRegionMap6RegionES1_St9_IdentityIS1_ENS0_9RegionCmpE13STL_AllocatorIS1_NS0_11MyAllocatorEEE16_M_insert_equal_ESt23_Rb_tree_const_iteratorIS1_ERKS1_' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='1265' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-989' is-artificial='yes'/>
+            <parameter type-id='type-id-983' is-artificial='yes'/>
             <parameter type-id='type-id-175'/>
             <parameter type-id='type-id-160'/>
             <return type-id='type-id-501'/>
@@ -16529,28 +16274,28 @@
         </member-function>
         <member-function access='private'>
           <function-decl name='erase' mangled-name='_ZNSt8_Rb_treeIN15MemoryRegionMap6RegionES1_St9_IdentityIS1_ENS0_9RegionCmpE13STL_AllocatorIS1_NS0_11MyAllocatorEEE5eraseESt17_Rb_tree_iteratorIS1_E' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='1341' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-989' is-artificial='yes'/>
+            <parameter type-id='type-id-983' is-artificial='yes'/>
             <parameter type-id='type-id-501'/>
             <return type-id='type-id-56'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='erase' mangled-name='_ZNSt8_Rb_treeIN15MemoryRegionMap6RegionES1_St9_IdentityIS1_ENS0_9RegionCmpE13STL_AllocatorIS1_NS0_11MyAllocatorEEE5eraseESt23_Rb_tree_const_iteratorIS1_E' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='1355' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-989' is-artificial='yes'/>
+            <parameter type-id='type-id-983' is-artificial='yes'/>
             <parameter type-id='type-id-175'/>
             <return type-id='type-id-56'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='erase' mangled-name='_ZNSt8_Rb_treeIN15MemoryRegionMap6RegionES1_St9_IdentityIS1_ENS0_9RegionCmpE13STL_AllocatorIS1_NS0_11MyAllocatorEEE5eraseERKS1_' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='1369' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-989' is-artificial='yes'/>
+            <parameter type-id='type-id-983' is-artificial='yes'/>
             <parameter type-id='type-id-160'/>
             <return type-id='type-id-57'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='erase' mangled-name='_ZNSt8_Rb_treeIN15MemoryRegionMap6RegionES1_St9_IdentityIS1_ENS0_9RegionCmpE13STL_AllocatorIS1_NS0_11MyAllocatorEEE5eraseESt17_Rb_tree_iteratorIS1_ESA_' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='1381' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-989' is-artificial='yes'/>
+            <parameter type-id='type-id-983' is-artificial='yes'/>
             <parameter type-id='type-id-501'/>
             <parameter type-id='type-id-501'/>
             <return type-id='type-id-56'/>
@@ -16558,7 +16303,7 @@
         </member-function>
         <member-function access='private'>
           <function-decl name='erase' mangled-name='_ZNSt8_Rb_treeIN15MemoryRegionMap6RegionES1_St9_IdentityIS1_ENS0_9RegionCmpE13STL_AllocatorIS1_NS0_11MyAllocatorEEE5eraseESt23_Rb_tree_const_iteratorIS1_ESA_' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='1394' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-989' is-artificial='yes'/>
+            <parameter type-id='type-id-983' is-artificial='yes'/>
             <parameter type-id='type-id-175'/>
             <parameter type-id='type-id-175'/>
             <return type-id='type-id-56'/>
@@ -16566,7 +16311,7 @@
         </member-function>
         <member-function access='private'>
           <function-decl name='erase' mangled-name='_ZNSt8_Rb_treeIN15MemoryRegionMap6RegionES1_St9_IdentityIS1_ENS0_9RegionCmpE13STL_AllocatorIS1_NS0_11MyAllocatorEEE5eraseEPKS1_SA_' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='1407' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-989' is-artificial='yes'/>
+            <parameter type-id='type-id-983' is-artificial='yes'/>
             <parameter type-id='type-id-162'/>
             <parameter type-id='type-id-162'/>
             <return type-id='type-id-56'/>
@@ -16574,83 +16319,83 @@
         </member-function>
         <member-function access='private'>
           <function-decl name='clear' mangled-name='_ZNSt8_Rb_treeIN15MemoryRegionMap6RegionES1_St9_IdentityIS1_ENS0_9RegionCmpE13STL_AllocatorIS1_NS0_11MyAllocatorEEE5clearEv' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='724' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-989' is-artificial='yes'/>
+            <parameter type-id='type-id-983' is-artificial='yes'/>
             <return type-id='type-id-56'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='find' mangled-name='_ZNSt8_Rb_treeIN15MemoryRegionMap6RegionES1_St9_IdentityIS1_ENS0_9RegionCmpE13STL_AllocatorIS1_NS0_11MyAllocatorEEE4findERKS1_' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='1418' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-989' is-artificial='yes'/>
+            <parameter type-id='type-id-983' is-artificial='yes'/>
             <parameter type-id='type-id-160'/>
             <return type-id='type-id-501'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='find' mangled-name='_ZNKSt8_Rb_treeIN15MemoryRegionMap6RegionES1_St9_IdentityIS1_ENS0_9RegionCmpE13STL_AllocatorIS1_NS0_11MyAllocatorEEE4findERKS1_' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='1431' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-982' is-artificial='yes'/>
+            <parameter type-id='type-id-976' is-artificial='yes'/>
             <parameter type-id='type-id-160'/>
             <return type-id='type-id-175'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='count' mangled-name='_ZNKSt8_Rb_treeIN15MemoryRegionMap6RegionES1_St9_IdentityIS1_ENS0_9RegionCmpE13STL_AllocatorIS1_NS0_11MyAllocatorEEE5countERKS1_' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='1443' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-982' is-artificial='yes'/>
+            <parameter type-id='type-id-976' is-artificial='yes'/>
             <parameter type-id='type-id-160'/>
             <return type-id='type-id-57'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='lower_bound' mangled-name='_ZNSt8_Rb_treeIN15MemoryRegionMap6RegionES1_St9_IdentityIS1_ENS0_9RegionCmpE13STL_AllocatorIS1_NS0_11MyAllocatorEEE11lower_boundERKS1_' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='744' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-989' is-artificial='yes'/>
+            <parameter type-id='type-id-983' is-artificial='yes'/>
             <parameter type-id='type-id-160'/>
             <return type-id='type-id-501'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='lower_bound' mangled-name='_ZNKSt8_Rb_treeIN15MemoryRegionMap6RegionES1_St9_IdentityIS1_ENS0_9RegionCmpE13STL_AllocatorIS1_NS0_11MyAllocatorEEE11lower_boundERKS1_' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='748' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-982' is-artificial='yes'/>
+            <parameter type-id='type-id-976' is-artificial='yes'/>
             <parameter type-id='type-id-160'/>
             <return type-id='type-id-175'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='upper_bound' mangled-name='_ZNSt8_Rb_treeIN15MemoryRegionMap6RegionES1_St9_IdentityIS1_ENS0_9RegionCmpE13STL_AllocatorIS1_NS0_11MyAllocatorEEE11upper_boundERKS1_' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='752' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-989' is-artificial='yes'/>
+            <parameter type-id='type-id-983' is-artificial='yes'/>
             <parameter type-id='type-id-160'/>
             <return type-id='type-id-501'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='upper_bound' mangled-name='_ZNKSt8_Rb_treeIN15MemoryRegionMap6RegionES1_St9_IdentityIS1_ENS0_9RegionCmpE13STL_AllocatorIS1_NS0_11MyAllocatorEEE11upper_boundERKS1_' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='756' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-982' is-artificial='yes'/>
+            <parameter type-id='type-id-976' is-artificial='yes'/>
             <parameter type-id='type-id-160'/>
             <return type-id='type-id-175'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='equal_range' mangled-name='_ZNSt8_Rb_treeIN15MemoryRegionMap6RegionES1_St9_IdentityIS1_ENS0_9RegionCmpE13STL_AllocatorIS1_NS0_11MyAllocatorEEE11equal_rangeERKS1_' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='1047' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-989' is-artificial='yes'/>
+            <parameter type-id='type-id-983' is-artificial='yes'/>
             <parameter type-id='type-id-160'/>
-            <return type-id='type-id-1002'/>
+            <return type-id='type-id-996'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='equal_range' mangled-name='_ZNKSt8_Rb_treeIN15MemoryRegionMap6RegionES1_St9_IdentityIS1_ENS0_9RegionCmpE13STL_AllocatorIS1_NS0_11MyAllocatorEEE11equal_rangeERKS1_' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='1078' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-982' is-artificial='yes'/>
+            <parameter type-id='type-id-976' is-artificial='yes'/>
             <parameter type-id='type-id-160'/>
-            <return type-id='type-id-1000'/>
+            <return type-id='type-id-994'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='__rb_verify' mangled-name='_ZNKSt8_Rb_treeIN15MemoryRegionMap6RegionES1_St9_IdentityIS1_ENS0_9RegionCmpE13STL_AllocatorIS1_NS0_11MyAllocatorEEE11__rb_verifyEv' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='1458' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-982' is-artificial='yes'/>
+            <parameter type-id='type-id-976' is-artificial='yes'/>
             <return type-id='type-id-55'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='reverse_iterator&lt;std::_Rb_tree_iterator&lt;MemoryRegionMap::Region&gt; &gt;' visibility='default' is-declaration-only='yes' id='type-id-1001'/>
-      <class-decl name='reverse_iterator&lt;std::_Rb_tree_const_iterator&lt;MemoryRegionMap::Region&gt; &gt;' visibility='default' is-declaration-only='yes' id='type-id-999'/>
-      <class-decl name='pair&lt;std::_Rb_tree_iterator&lt;MemoryRegionMap::Region&gt;, bool&gt;' size-in-bits='128' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_pair.h' line='68' column='1' id='type-id-994'>
+      <class-decl name='reverse_iterator&lt;std::_Rb_tree_iterator&lt;MemoryRegionMap::Region&gt; &gt;' visibility='default' is-declaration-only='yes' id='type-id-995'/>
+      <class-decl name='reverse_iterator&lt;std::_Rb_tree_const_iterator&lt;MemoryRegionMap::Region&gt; &gt;' visibility='default' is-declaration-only='yes' id='type-id-993'/>
+      <class-decl name='pair&lt;std::_Rb_tree_iterator&lt;MemoryRegionMap::Region&gt;, bool&gt;' size-in-bits='128' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_pair.h' line='68' column='1' id='type-id-988'>
         <data-member access='public' layout-offset-in-bits='0'>
           <var-decl name='first' type-id='type-id-501' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_pair.h' line='72' column='1'/>
         </data-member>
@@ -16659,22 +16404,22 @@
         </data-member>
         <member-function access='public'>
           <function-decl name='pair' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_pair.h' line='79' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-995' is-artificial='yes'/>
+            <parameter type-id='type-id-989' is-artificial='yes'/>
             <return type-id='type-id-56'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='pair' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_pair.h' line='83' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-995' is-artificial='yes'/>
+            <parameter type-id='type-id-989' is-artificial='yes'/>
             <parameter type-id='type-id-503'/>
             <parameter type-id='type-id-460'/>
             <return type-id='type-id-56'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='pair&lt;std::_Rb_tree_iterator&lt;MemoryRegionMap::Region&gt;, std::_Rb_tree_iterator&lt;MemoryRegionMap::Region&gt; &gt;' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-1002'/>
-      <class-decl name='pair&lt;std::_Rb_tree_const_iterator&lt;MemoryRegionMap::Region&gt;, std::_Rb_tree_const_iterator&lt;MemoryRegionMap::Region&gt; &gt;' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-1000'/>
-      <class-decl name='pair&lt;std::_Rb_tree_const_iterator&lt;MemoryRegionMap::Region&gt;, bool&gt;' size-in-bits='128' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_pair.h' line='68' column='1' id='type-id-992'>
+      <class-decl name='pair&lt;std::_Rb_tree_iterator&lt;MemoryRegionMap::Region&gt;, std::_Rb_tree_iterator&lt;MemoryRegionMap::Region&gt; &gt;' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-996'/>
+      <class-decl name='pair&lt;std::_Rb_tree_const_iterator&lt;MemoryRegionMap::Region&gt;, std::_Rb_tree_const_iterator&lt;MemoryRegionMap::Region&gt; &gt;' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-994'/>
+      <class-decl name='pair&lt;std::_Rb_tree_const_iterator&lt;MemoryRegionMap::Region&gt;, bool&gt;' size-in-bits='128' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_pair.h' line='68' column='1' id='type-id-986'>
         <data-member access='public' layout-offset-in-bits='0'>
           <var-decl name='first' type-id='type-id-175' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_pair.h' line='72' column='1'/>
         </data-member>
@@ -16683,38 +16428,38 @@
         </data-member>
         <member-function access='public'>
           <function-decl name='pair' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_pair.h' line='79' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-993' is-artificial='yes'/>
+            <parameter type-id='type-id-987' is-artificial='yes'/>
             <return type-id='type-id-56'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='pair' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_pair.h' line='83' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-993' is-artificial='yes'/>
+            <parameter type-id='type-id-987' is-artificial='yes'/>
             <parameter type-id='type-id-483'/>
             <parameter type-id='type-id-460'/>
             <return type-id='type-id-56'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='_Identity&lt;MemoryRegionMap::Region&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_function.h' line='469' column='1' id='type-id-976'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1003'/>
+      <class-decl name='_Identity&lt;MemoryRegionMap::Region&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_function.h' line='469' column='1' id='type-id-970'>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-997'/>
         <member-function access='public'>
           <function-decl name='operator()' mangled-name='_ZNKSt9_IdentityIN15MemoryRegionMap6RegionEEclERS1_' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_function.h' line='471' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-978' is-artificial='yes'/>
+            <parameter type-id='type-id-972' is-artificial='yes'/>
             <parameter type-id='type-id-778'/>
             <return type-id='type-id-778'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='operator()' mangled-name='_ZNKSt9_IdentityIN15MemoryRegionMap6RegionEEclERKS1_' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_function.h' line='475' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-978' is-artificial='yes'/>
+            <parameter type-id='type-id-972' is-artificial='yes'/>
             <parameter type-id='type-id-160'/>
             <return type-id='type-id-160'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='unary_function&lt;MemoryRegionMap::Region, MemoryRegionMap::Region&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_function.h' line='101' column='1' id='type-id-1003'/>
-      <class-decl name='__miter_base&lt;const void**, false&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_algobase.h' line='285' column='1' id='type-id-1004'>
+      <class-decl name='unary_function&lt;MemoryRegionMap::Region, MemoryRegionMap::Region&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_function.h' line='101' column='1' id='type-id-997'/>
+      <class-decl name='__miter_base&lt;const void**, false&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_algobase.h' line='285' column='1' id='type-id-998'>
         <member-function access='public' static='yes'>
           <function-decl name='__b' mangled-name='_ZNSt12__miter_baseIPPKvLb0EE3__bES2_' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_algobase.h' line='287' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-120'/>
@@ -16731,7 +16476,7 @@
         </function-decl>
       </namespace-decl>
     </namespace-decl>
-    <function-type size-in-bits='64' id='type-id-998'>
+    <function-type size-in-bits='64' id='type-id-992'>
       <parameter type-id='type-id-160'/>
       <return type-id='type-id-56'/>
     </function-type>
@@ -16756,24 +16501,24 @@
     </namespace-decl>
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='src/profile-handler.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-kFgaKP/gperftools-2.4' language='LANG_C_plus_plus'>
-    <typedef-decl name='ProfileHandlerCallback' type-id='type-id-1005' filepath='src/profile-handler.h' line='95' column='1' id='type-id-1006'/>
-    <class-decl name='timer_id_holder' size-in-bits='64' is-struct='yes' visibility='default' filepath='src/profile-handler.cc' line='266' column='1' id='type-id-1007'>
+    <typedef-decl name='ProfileHandlerCallback' type-id='type-id-999' filepath='src/profile-handler.h' line='95' column='1' id='type-id-1000'/>
+    <class-decl name='timer_id_holder' size-in-bits='64' is-struct='yes' visibility='default' filepath='src/profile-handler.cc' line='266' column='1' id='type-id-1001'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='timerid' type-id='type-id-1008' visibility='default' filepath='src/profile-handler.cc' line='267' column='1'/>
+        <var-decl name='timerid' type-id='type-id-1002' visibility='default' filepath='src/profile-handler.cc' line='267' column='1'/>
       </data-member>
       <member-function access='public' constructor='yes'>
         <function-decl name='timer_id_holder' filepath='src/profile-handler.cc' line='268' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-1009' is-artificial='yes'/>
-          <parameter type-id='type-id-1008'/>
+          <parameter type-id='type-id-1003' is-artificial='yes'/>
+          <parameter type-id='type-id-1002'/>
           <return type-id='type-id-56'/>
         </function-decl>
       </member-function>
     </class-decl>
-    <typedef-decl name='timer_t' type-id='type-id-1010' filepath='/usr/include/time.h' line='104' column='1' id='type-id-1008'/>
-    <typedef-decl name='__timer_t' type-id='type-id-53' filepath='/usr/include/bits/types.h' line='161' column='1' id='type-id-1010'/>
-    <class-decl name='ProfileHandler' size-in-bits='448' visibility='default' filepath='src/profile-handler.cc' line='84' column='1' id='type-id-1011'>
+    <typedef-decl name='timer_t' type-id='type-id-1004' filepath='/usr/include/time.h' line='104' column='1' id='type-id-1002'/>
+    <typedef-decl name='__timer_t' type-id='type-id-53' filepath='/usr/include/bits/types.h' line='161' column='1' id='type-id-1004'/>
+    <class-decl name='ProfileHandler' size-in-bits='448' visibility='default' filepath='src/profile-handler.cc' line='84' column='1' id='type-id-1005'>
       <member-type access='private'>
-        <enum-decl name='__anonymous_enum__' is-anonymous='yes' filepath='src/profile-handler.cc' line='166' column='1' id='type-id-1012'>
+        <enum-decl name='__anonymous_enum__' is-anonymous='yes' filepath='src/profile-handler.cc' line='166' column='1' id='type-id-1006'>
           <underlying-type type-id='type-id-133'/>
           <enumerator name='TIMERS_UNTOUCHED' value='0'/>
           <enumerator name='TIMERS_ONE_SET' value='1'/>
@@ -16782,22 +16527,22 @@
         </enum-decl>
       </member-type>
       <member-type access='private'>
-        <typedef-decl name='CallbackList' type-id='type-id-1014' filepath='src/profile-handler.cc' line='199' column='1' id='type-id-1013'/>
+        <typedef-decl name='CallbackList' type-id='type-id-1008' filepath='src/profile-handler.cc' line='199' column='1' id='type-id-1007'/>
       </member-type>
       <member-type access='private'>
-        <typedef-decl name='CallbackIterator' type-id='type-id-1016' filepath='src/profile-handler.cc' line='200' column='1' id='type-id-1015'/>
+        <typedef-decl name='CallbackIterator' type-id='type-id-1010' filepath='src/profile-handler.cc' line='200' column='1' id='type-id-1009'/>
       </member-type>
       <data-member access='private' static='yes'>
-        <var-decl name='kMaxFrequency' type-id='type-id-1017' mangled-name='_ZN14ProfileHandler13kMaxFrequencyE' visibility='default' filepath='src/profile-handler.cc' line='128' column='1' elf-symbol-id='_ZN14ProfileHandler13kMaxFrequencyE'/>
+        <var-decl name='kMaxFrequency' type-id='type-id-1011' mangled-name='_ZN14ProfileHandler13kMaxFrequencyE' visibility='default' filepath='src/profile-handler.cc' line='128' column='1' elf-symbol-id='_ZN14ProfileHandler13kMaxFrequencyE'/>
       </data-member>
       <data-member access='private' static='yes'>
-        <var-decl name='kDefaultFrequency' type-id='type-id-1017' mangled-name='_ZN14ProfileHandler17kDefaultFrequencyE' visibility='default' filepath='src/profile-handler.cc' line='130' column='1' elf-symbol-id='_ZN14ProfileHandler17kDefaultFrequencyE'/>
+        <var-decl name='kDefaultFrequency' type-id='type-id-1011' mangled-name='_ZN14ProfileHandler17kDefaultFrequencyE' visibility='default' filepath='src/profile-handler.cc' line='130' column='1' elf-symbol-id='_ZN14ProfileHandler17kDefaultFrequencyE'/>
       </data-member>
       <data-member access='private' static='yes'>
-        <var-decl name='instance_' type-id='type-id-1018' mangled-name='_ZN14ProfileHandler9instance_E' visibility='default' filepath='src/profile-handler.cc' line='133' column='1' elf-symbol-id='_ZN14ProfileHandler9instance_E'/>
+        <var-decl name='instance_' type-id='type-id-1012' mangled-name='_ZN14ProfileHandler9instance_E' visibility='default' filepath='src/profile-handler.cc' line='133' column='1' elf-symbol-id='_ZN14ProfileHandler9instance_E'/>
       </data-member>
       <data-member access='private' static='yes'>
-        <var-decl name='once_' type-id='type-id-955' mangled-name='_ZN14ProfileHandler5once_E' visibility='default' filepath='src/profile-handler.cc' line='136' column='1' elf-symbol-id='_ZN14ProfileHandler5once_E'/>
+        <var-decl name='once_' type-id='type-id-948' mangled-name='_ZN14ProfileHandler5once_E' visibility='default' filepath='src/profile-handler.cc' line='136' column='1' elf-symbol-id='_ZN14ProfileHandler5once_E'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='0'>
         <var-decl name='interrupts_' type-id='type-id-76' visibility='default' filepath='src/profile-handler.cc' line='142' column='1'/>
@@ -16818,10 +16563,10 @@
         <var-decl name='per_thread_timer_enabled_' type-id='type-id-55' visibility='default' filepath='src/profile-handler.cc' line='156' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='192'>
-        <var-decl name='thread_timer_key' type-id='type-id-953' visibility='default' filepath='src/profile-handler.cc' line='161' column='1'/>
+        <var-decl name='thread_timer_key' type-id='type-id-946' visibility='default' filepath='src/profile-handler.cc' line='161' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='224'>
-        <var-decl name='timer_sharing_' type-id='type-id-1012' visibility='default' filepath='src/profile-handler.cc' line='175' column='1'/>
+        <var-decl name='timer_sharing_' type-id='type-id-1006' visibility='default' filepath='src/profile-handler.cc' line='175' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='256'>
         <var-decl name='control_lock_' type-id='type-id-176' visibility='default' filepath='src/profile-handler.cc' line='183' column='1'/>
@@ -16830,56 +16575,56 @@
         <var-decl name='signal_lock_' type-id='type-id-176' visibility='default' filepath='src/profile-handler.cc' line='184' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='320'>
-        <var-decl name='callbacks_' type-id='type-id-1013' visibility='default' filepath='src/profile-handler.cc' line='201' column='1'/>
+        <var-decl name='callbacks_' type-id='type-id-1007' visibility='default' filepath='src/profile-handler.cc' line='201' column='1'/>
       </data-member>
       <member-function access='private'>
         <function-decl name='RegisterThread' mangled-name='_ZN14ProfileHandler14RegisterThreadEv' filepath='src/profile-handler.cc' line='98' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN14ProfileHandler14RegisterThreadEv'>
-          <parameter type-id='type-id-1018' is-artificial='yes'/>
+          <parameter type-id='type-id-1012' is-artificial='yes'/>
           <return type-id='type-id-56'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
         <function-decl name='RegisterCallback' mangled-name='_ZN14ProfileHandler16RegisterCallbackEPFviP7siginfoPvS2_ES2_' filepath='src/profile-handler.cc' line='104' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN14ProfileHandler16RegisterCallbackEPFviP7siginfoPvS2_ES2_'>
-          <parameter type-id='type-id-1018' is-artificial='yes'/>
-          <parameter type-id='type-id-1006'/>
+          <parameter type-id='type-id-1012' is-artificial='yes'/>
+          <parameter type-id='type-id-1000'/>
           <parameter type-id='type-id-53'/>
-          <return type-id='type-id-1019'/>
+          <return type-id='type-id-1013'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
         <function-decl name='UnregisterCallback' mangled-name='_ZN14ProfileHandler18UnregisterCallbackEP19ProfileHandlerToken' filepath='src/profile-handler.cc' line='110' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN14ProfileHandler18UnregisterCallbackEP19ProfileHandlerToken'>
-          <parameter type-id='type-id-1018' is-artificial='yes'/>
-          <parameter type-id='type-id-1019'/>
+          <parameter type-id='type-id-1012' is-artificial='yes'/>
+          <parameter type-id='type-id-1013'/>
           <return type-id='type-id-56'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
         <function-decl name='Reset' mangled-name='_ZN14ProfileHandler5ResetEv' filepath='src/profile-handler.cc' line='115' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN14ProfileHandler5ResetEv'>
-          <parameter type-id='type-id-1018' is-artificial='yes'/>
+          <parameter type-id='type-id-1012' is-artificial='yes'/>
           <return type-id='type-id-56'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
         <function-decl name='GetState' mangled-name='_ZN14ProfileHandler8GetStateEP19ProfileHandlerState' filepath='src/profile-handler.cc' line='118' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN14ProfileHandler8GetStateEP19ProfileHandlerState'>
-          <parameter type-id='type-id-1018' is-artificial='yes'/>
-          <parameter type-id='type-id-1020'/>
+          <parameter type-id='type-id-1012' is-artificial='yes'/>
+          <parameter type-id='type-id-1014'/>
           <return type-id='type-id-56'/>
         </function-decl>
       </member-function>
       <member-function access='private' static='yes'>
         <function-decl name='Instance' mangled-name='_ZN14ProfileHandler8InstanceEv' filepath='src/profile-handler.cc' line='121' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN14ProfileHandler8InstanceEv'>
-          <return type-id='type-id-1018'/>
+          <return type-id='type-id-1012'/>
         </function-decl>
       </member-function>
       <member-function access='private' constructor='yes'>
         <function-decl name='ProfileHandler' mangled-name='_ZN14ProfileHandlerC1Ev' filepath='src/profile-handler.cc' line='124' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN14ProfileHandlerC1Ev'>
-          <parameter type-id='type-id-1018' is-artificial='yes'/>
+          <parameter type-id='type-id-1012' is-artificial='yes'/>
           <return type-id='type-id-56'/>
         </function-decl>
       </member-function>
       <member-function access='private' destructor='yes'>
         <function-decl name='~ProfileHandler' mangled-name='_ZN14ProfileHandlerD1Ev' filepath='src/profile-handler.cc' line='125' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN14ProfileHandlerD1Ev'>
-          <parameter type-id='type-id-1018' is-artificial='yes'/>
+          <parameter type-id='type-id-1012' is-artificial='yes'/>
           <parameter type-id='type-id-1' is-artificial='yes'/>
           <return type-id='type-id-56'/>
         </function-decl>
@@ -16891,65 +16636,65 @@
       </member-function>
       <member-function access='private'>
         <function-decl name='StartTimer' mangled-name='_ZN14ProfileHandler10StartTimerEv' filepath='src/profile-handler.cc' line='206' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN14ProfileHandler10StartTimerEv'>
-          <parameter type-id='type-id-1018' is-artificial='yes'/>
+          <parameter type-id='type-id-1012' is-artificial='yes'/>
           <return type-id='type-id-56'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
         <function-decl name='StopTimer' mangled-name='_ZN14ProfileHandler9StopTimerEv' filepath='src/profile-handler.cc' line='211' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN14ProfileHandler9StopTimerEv'>
-          <parameter type-id='type-id-1018' is-artificial='yes'/>
+          <parameter type-id='type-id-1012' is-artificial='yes'/>
           <return type-id='type-id-56'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
         <function-decl name='IsTimerRunning' mangled-name='_ZN14ProfileHandler14IsTimerRunningEv' filepath='src/profile-handler.cc' line='216' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN14ProfileHandler14IsTimerRunningEv'>
-          <parameter type-id='type-id-1018' is-artificial='yes'/>
+          <parameter type-id='type-id-1012' is-artificial='yes'/>
           <return type-id='type-id-55'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
         <function-decl name='EnableHandler' mangled-name='_ZN14ProfileHandler13EnableHandlerEv' filepath='src/profile-handler.cc' line='219' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN14ProfileHandler13EnableHandlerEv'>
-          <parameter type-id='type-id-1018' is-artificial='yes'/>
+          <parameter type-id='type-id-1012' is-artificial='yes'/>
           <return type-id='type-id-56'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
         <function-decl name='DisableHandler' mangled-name='_ZN14ProfileHandler14DisableHandlerEv' filepath='src/profile-handler.cc' line='222' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN14ProfileHandler14DisableHandlerEv'>
-          <parameter type-id='type-id-1018' is-artificial='yes'/>
+          <parameter type-id='type-id-1012' is-artificial='yes'/>
           <return type-id='type-id-56'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
         <function-decl name='IsSignalHandlerAvailable' mangled-name='_ZN14ProfileHandler24IsSignalHandlerAvailableEv' filepath='src/profile-handler.cc' line='226' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN14ProfileHandler24IsSignalHandlerAvailableEv'>
-          <parameter type-id='type-id-1018' is-artificial='yes'/>
+          <parameter type-id='type-id-1012' is-artificial='yes'/>
           <return type-id='type-id-55'/>
         </function-decl>
       </member-function>
       <member-function access='private' static='yes'>
         <function-decl name='SignalHandler' mangled-name='_ZN14ProfileHandler13SignalHandlerEiP7siginfoPv' filepath='src/profile-handler.cc' line='229' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN14ProfileHandler13SignalHandlerEiP7siginfoPv'>
           <parameter type-id='type-id-1'/>
-          <parameter type-id='type-id-1021'/>
+          <parameter type-id='type-id-1015'/>
           <parameter type-id='type-id-53'/>
           <return type-id='type-id-56'/>
         </function-decl>
       </member-function>
       <member-function access='private' constructor='yes'>
         <function-decl name='ProfileHandler' filepath='src/profile-handler.cc' line='231' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-1018' is-artificial='yes'/>
-          <parameter type-id='type-id-1022'/>
+          <parameter type-id='type-id-1012' is-artificial='yes'/>
+          <parameter type-id='type-id-1016'/>
           <return type-id='type-id-56'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
         <function-decl name='operator=' mangled-name='_ZN14ProfileHandleraSERKS_' filepath='src/profile-handler.cc' line='231' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-1018' is-artificial='yes'/>
-          <parameter type-id='type-id-1022'/>
+          <parameter type-id='type-id-1012' is-artificial='yes'/>
+          <parameter type-id='type-id-1016'/>
           <return type-id='type-id-56'/>
         </function-decl>
       </member-function>
     </class-decl>
-    <typedef-decl name='pthread_once_t' type-id='type-id-1' filepath='/usr/include/bits/pthreadtypes.h' line='144' column='1' id='type-id-955'/>
-    <class-decl name='ProfileHandlerState' size-in-bits='192' is-struct='yes' visibility='default' filepath='src/profile-handler.h' line='137' column='1' id='type-id-1023'>
+    <typedef-decl name='pthread_once_t' type-id='type-id-1' filepath='/usr/include/bits/pthreadtypes.h' line='144' column='1' id='type-id-948'/>
+    <class-decl name='ProfileHandlerState' size-in-bits='192' is-struct='yes' visibility='default' filepath='src/profile-handler.h' line='137' column='1' id='type-id-1017'>
       <data-member access='public' layout-offset-in-bits='0'>
         <var-decl name='frequency' type-id='type-id-65' visibility='default' filepath='src/profile-handler.h' line='138' column='1'/>
       </data-member>
@@ -16963,825 +16708,825 @@
         <var-decl name='allowed' type-id='type-id-55' visibility='default' filepath='src/profile-handler.h' line='141' column='1'/>
       </data-member>
     </class-decl>
-    <pointer-type-def type-id='type-id-1011' size-in-bits='64' id='type-id-1018'/>
-    <pointer-type-def type-id='type-id-1023' size-in-bits='64' id='type-id-1020'/>
-    <qualified-type-def type-id='type-id-1019' const='yes' id='type-id-1024'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1024' size-in-bits='64' id='type-id-1025'/>
-    <pointer-type-def type-id='type-id-1024' size-in-bits='64' id='type-id-1026'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1019' size-in-bits='64' id='type-id-1027'/>
-    <pointer-type-def type-id='type-id-1019' size-in-bits='64' id='type-id-1028'/>
-    <pointer-type-def type-id='type-id-1029' size-in-bits='64' id='type-id-1030'/>
-    <pointer-type-def type-id='type-id-1031' size-in-bits='64' id='type-id-1032'/>
-    <qualified-type-def type-id='type-id-1011' const='yes' id='type-id-1033'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1033' size-in-bits='64' id='type-id-1022'/>
-    <qualified-type-def type-id='type-id-1029' const='yes' id='type-id-1034'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1034' size-in-bits='64' id='type-id-1035'/>
-    <pointer-type-def type-id='type-id-1034' size-in-bits='64' id='type-id-1036'/>
-    <qualified-type-def type-id='type-id-1031' const='yes' id='type-id-1037'/>
+    <pointer-type-def type-id='type-id-1005' size-in-bits='64' id='type-id-1012'/>
+    <pointer-type-def type-id='type-id-1017' size-in-bits='64' id='type-id-1014'/>
+    <qualified-type-def type-id='type-id-1013' const='yes' id='type-id-1018'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1018' size-in-bits='64' id='type-id-1019'/>
+    <pointer-type-def type-id='type-id-1018' size-in-bits='64' id='type-id-1020'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1013' size-in-bits='64' id='type-id-1021'/>
+    <pointer-type-def type-id='type-id-1013' size-in-bits='64' id='type-id-1022'/>
+    <pointer-type-def type-id='type-id-1023' size-in-bits='64' id='type-id-1024'/>
+    <pointer-type-def type-id='type-id-1025' size-in-bits='64' id='type-id-1026'/>
+    <qualified-type-def type-id='type-id-1005' const='yes' id='type-id-1027'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1027' size-in-bits='64' id='type-id-1016'/>
+    <qualified-type-def type-id='type-id-1023' const='yes' id='type-id-1028'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1028' size-in-bits='64' id='type-id-1029'/>
+    <pointer-type-def type-id='type-id-1028' size-in-bits='64' id='type-id-1030'/>
+    <qualified-type-def type-id='type-id-1025' const='yes' id='type-id-1031'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1031' size-in-bits='64' id='type-id-1032'/>
+    <pointer-type-def type-id='type-id-1031' size-in-bits='64' id='type-id-1033'/>
+    <qualified-type-def type-id='type-id-65' const='yes' id='type-id-1011'/>
+    <qualified-type-def type-id='type-id-1034' const='yes' id='type-id-1035'/>
+    <pointer-type-def type-id='type-id-1035' size-in-bits='64' id='type-id-1036'/>
+    <qualified-type-def type-id='type-id-1010' const='yes' id='type-id-1037'/>
     <reference-type-def kind='lvalue' type-id='type-id-1037' size-in-bits='64' id='type-id-1038'/>
     <pointer-type-def type-id='type-id-1037' size-in-bits='64' id='type-id-1039'/>
-    <qualified-type-def type-id='type-id-65' const='yes' id='type-id-1017'/>
     <qualified-type-def type-id='type-id-1040' const='yes' id='type-id-1041'/>
-    <pointer-type-def type-id='type-id-1041' size-in-bits='64' id='type-id-1042'/>
-    <qualified-type-def type-id='type-id-1016' const='yes' id='type-id-1043'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1043' size-in-bits='64' id='type-id-1044'/>
-    <pointer-type-def type-id='type-id-1043' size-in-bits='64' id='type-id-1045'/>
-    <qualified-type-def type-id='type-id-1046' const='yes' id='type-id-1047'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1047' size-in-bits='64' id='type-id-1048'/>
-    <pointer-type-def type-id='type-id-1047' size-in-bits='64' id='type-id-1049'/>
-    <qualified-type-def type-id='type-id-1050' const='yes' id='type-id-1051'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1051' size-in-bits='64' id='type-id-1052'/>
-    <qualified-type-def type-id='type-id-1053' const='yes' id='type-id-1054'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1054' size-in-bits='64' id='type-id-1055'/>
-    <qualified-type-def type-id='type-id-1014' const='yes' id='type-id-1056'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1056' size-in-bits='64' id='type-id-1057'/>
-    <pointer-type-def type-id='type-id-1056' size-in-bits='64' id='type-id-1058'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1041' size-in-bits='64' id='type-id-1042'/>
+    <pointer-type-def type-id='type-id-1041' size-in-bits='64' id='type-id-1043'/>
+    <qualified-type-def type-id='type-id-1044' const='yes' id='type-id-1045'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1045' size-in-bits='64' id='type-id-1046'/>
+    <qualified-type-def type-id='type-id-1047' const='yes' id='type-id-1048'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1048' size-in-bits='64' id='type-id-1049'/>
+    <qualified-type-def type-id='type-id-1008' const='yes' id='type-id-1050'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1050' size-in-bits='64' id='type-id-1051'/>
+    <pointer-type-def type-id='type-id-1050' size-in-bits='64' id='type-id-1052'/>
+    <pointer-type-def type-id='type-id-1034' size-in-bits='64' id='type-id-1053'/>
+    <pointer-type-def type-id='type-id-1054' size-in-bits='64' id='type-id-1055'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1010' size-in-bits='64' id='type-id-1056'/>
+    <pointer-type-def type-id='type-id-1010' size-in-bits='64' id='type-id-1057'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1040' size-in-bits='64' id='type-id-1058'/>
     <pointer-type-def type-id='type-id-1040' size-in-bits='64' id='type-id-1059'/>
-    <pointer-type-def type-id='type-id-1060' size-in-bits='64' id='type-id-1061'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1016' size-in-bits='64' id='type-id-1062'/>
-    <pointer-type-def type-id='type-id-1016' size-in-bits='64' id='type-id-1063'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1046' size-in-bits='64' id='type-id-1064'/>
-    <pointer-type-def type-id='type-id-1046' size-in-bits='64' id='type-id-1065'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1066' size-in-bits='64' id='type-id-1067'/>
-    <pointer-type-def type-id='type-id-1066' size-in-bits='64' id='type-id-1068'/>
-    <pointer-type-def type-id='type-id-1050' size-in-bits='64' id='type-id-1069'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1053' size-in-bits='64' id='type-id-1070'/>
-    <pointer-type-def type-id='type-id-1053' size-in-bits='64' id='type-id-1071'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1014' size-in-bits='64' id='type-id-1072'/>
-    <pointer-type-def type-id='type-id-1014' size-in-bits='64' id='type-id-1073'/>
-    <pointer-type-def type-id='type-id-1007' size-in-bits='64' id='type-id-1009'/>
-    <pointer-type-def type-id='type-id-1074' size-in-bits='64' id='type-id-1005'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1060' size-in-bits='64' id='type-id-1061'/>
+    <pointer-type-def type-id='type-id-1060' size-in-bits='64' id='type-id-1062'/>
+    <pointer-type-def type-id='type-id-1044' size-in-bits='64' id='type-id-1063'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1047' size-in-bits='64' id='type-id-1064'/>
+    <pointer-type-def type-id='type-id-1047' size-in-bits='64' id='type-id-1065'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1008' size-in-bits='64' id='type-id-1066'/>
+    <pointer-type-def type-id='type-id-1008' size-in-bits='64' id='type-id-1067'/>
+    <pointer-type-def type-id='type-id-1001' size-in-bits='64' id='type-id-1003'/>
+    <pointer-type-def type-id='type-id-1068' size-in-bits='64' id='type-id-999'/>
     <namespace-decl name='std'>
-      <class-decl name='_List_iterator&lt;ProfileHandlerToken*&gt;' size-in-bits='64' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_list.h' line='114' column='1' id='type-id-1016'>
+      <class-decl name='_List_iterator&lt;ProfileHandlerToken*&gt;' size-in-bits='64' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_list.h' line='114' column='1' id='type-id-1010'>
         <data-member access='public' layout-offset-in-bits='0'>
-          <var-decl name='_M_node' type-id='type-id-1068' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_list.h' line='179' column='1'/>
+          <var-decl name='_M_node' type-id='type-id-1062' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_list.h' line='179' column='1'/>
         </data-member>
         <member-function access='public'>
           <function-decl name='_List_iterator' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_list.h' line='124' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1063' is-artificial='yes'/>
+            <parameter type-id='type-id-1057' is-artificial='yes'/>
             <return type-id='type-id-56'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_List_iterator' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_list.h' line='128' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1063' is-artificial='yes'/>
-            <parameter type-id='type-id-1068'/>
+            <parameter type-id='type-id-1057' is-artificial='yes'/>
+            <parameter type-id='type-id-1062'/>
             <return type-id='type-id-56'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='operator*' mangled-name='_ZNKSt14_List_iteratorIP19ProfileHandlerTokenEdeEv' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_list.h' line='133' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1045' is-artificial='yes'/>
-            <return type-id='type-id-1027'/>
+            <parameter type-id='type-id-1039' is-artificial='yes'/>
+            <return type-id='type-id-1021'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='operator-&gt;' mangled-name='_ZNKSt14_List_iteratorIP19ProfileHandlerTokenEptEv' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_list.h' line='137' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1045' is-artificial='yes'/>
-            <return type-id='type-id-1028'/>
+            <parameter type-id='type-id-1039' is-artificial='yes'/>
+            <return type-id='type-id-1022'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='operator++' mangled-name='_ZNSt14_List_iteratorIP19ProfileHandlerTokenEppEv' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_list.h' line='141' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1063' is-artificial='yes'/>
-            <return type-id='type-id-1062'/>
+            <parameter type-id='type-id-1057' is-artificial='yes'/>
+            <return type-id='type-id-1056'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='operator++' mangled-name='_ZNSt14_List_iteratorIP19ProfileHandlerTokenEppEi' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_list.h' line='148' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1063' is-artificial='yes'/>
+            <parameter type-id='type-id-1057' is-artificial='yes'/>
             <parameter type-id='type-id-1'/>
-            <return type-id='type-id-1016'/>
+            <return type-id='type-id-1010'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='operator--' mangled-name='_ZNSt14_List_iteratorIP19ProfileHandlerTokenEmmEv' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_list.h' line='156' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1063' is-artificial='yes'/>
-            <return type-id='type-id-1062'/>
+            <parameter type-id='type-id-1057' is-artificial='yes'/>
+            <return type-id='type-id-1056'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='operator--' mangled-name='_ZNSt14_List_iteratorIP19ProfileHandlerTokenEmmEi' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_list.h' line='163' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1063' is-artificial='yes'/>
+            <parameter type-id='type-id-1057' is-artificial='yes'/>
             <parameter type-id='type-id-1'/>
-            <return type-id='type-id-1016'/>
+            <return type-id='type-id-1010'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='operator==' mangled-name='_ZNKSt14_List_iteratorIP19ProfileHandlerTokenEeqERKS2_' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_list.h' line='171' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1045' is-artificial='yes'/>
-            <parameter type-id='type-id-1044'/>
+            <parameter type-id='type-id-1039' is-artificial='yes'/>
+            <parameter type-id='type-id-1038'/>
             <return type-id='type-id-55'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='operator!=' mangled-name='_ZNKSt14_List_iteratorIP19ProfileHandlerTokenEneERKS2_' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_list.h' line='175' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1045' is-artificial='yes'/>
-            <parameter type-id='type-id-1044'/>
+            <parameter type-id='type-id-1039' is-artificial='yes'/>
+            <parameter type-id='type-id-1038'/>
             <return type-id='type-id-55'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='_List_node_base' size-in-bits='128' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_list.h' line='72' column='1' id='type-id-1066'>
+      <class-decl name='_List_node_base' size-in-bits='128' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_list.h' line='72' column='1' id='type-id-1060'>
         <data-member access='public' layout-offset-in-bits='0'>
-          <var-decl name='_M_next' type-id='type-id-1068' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_list.h' line='73' column='1'/>
+          <var-decl name='_M_next' type-id='type-id-1062' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_list.h' line='73' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='64'>
-          <var-decl name='_M_prev' type-id='type-id-1068' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_list.h' line='74' column='1'/>
+          <var-decl name='_M_prev' type-id='type-id-1062' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_list.h' line='74' column='1'/>
         </data-member>
         <member-function access='public' static='yes'>
           <function-decl name='swap' mangled-name='_ZNSt15_List_node_base4swapERS_S0_' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_list.h' line='77' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1067'/>
-            <parameter type-id='type-id-1067'/>
+            <parameter type-id='type-id-1061'/>
+            <parameter type-id='type-id-1061'/>
             <return type-id='type-id-56'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='transfer' mangled-name='_ZNSt15_List_node_base8transferEPS_S0_' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_list.h' line='80' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1068' is-artificial='yes'/>
-            <parameter type-id='type-id-1068'/>
-            <parameter type-id='type-id-1068'/>
+            <parameter type-id='type-id-1062' is-artificial='yes'/>
+            <parameter type-id='type-id-1062'/>
+            <parameter type-id='type-id-1062'/>
             <return type-id='type-id-56'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='reverse' mangled-name='_ZNSt15_List_node_base7reverseEv' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_list.h' line='84' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1068' is-artificial='yes'/>
+            <parameter type-id='type-id-1062' is-artificial='yes'/>
             <return type-id='type-id-56'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='hook' mangled-name='_ZNSt15_List_node_base4hookEPS_' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_list.h' line='87' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1068' is-artificial='yes'/>
-            <parameter type-id='type-id-1068'/>
+            <parameter type-id='type-id-1062' is-artificial='yes'/>
+            <parameter type-id='type-id-1062'/>
             <return type-id='type-id-56'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='unhook' mangled-name='_ZNSt15_List_node_base6unhookEv' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_list.h' line='90' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1068' is-artificial='yes'/>
+            <parameter type-id='type-id-1062' is-artificial='yes'/>
             <return type-id='type-id-56'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='list&lt;ProfileHandlerToken*, std::allocator&lt;ProfileHandlerToken*&gt; &gt;' size-in-bits='128' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_list.h' line='418' column='1' id='type-id-1014'>
-        <base-class access='protected' layout-offset-in-bits='0' type-id='type-id-1040'/>
+      <class-decl name='list&lt;ProfileHandlerToken*, std::allocator&lt;ProfileHandlerToken*&gt; &gt;' size-in-bits='128' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_list.h' line='418' column='1' id='type-id-1008'>
+        <base-class access='protected' layout-offset-in-bits='0' type-id='type-id-1034'/>
         <member-function access='protected'>
           <function-decl name='_M_create_node' mangled-name='_ZNSt4listIP19ProfileHandlerTokenSaIS1_EE14_M_create_nodeERKS1_' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_list.h' line='459' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1073' is-artificial='yes'/>
-            <parameter type-id='type-id-1025'/>
-            <return type-id='type-id-1065'/>
+            <parameter type-id='type-id-1067' is-artificial='yes'/>
+            <parameter type-id='type-id-1019'/>
+            <return type-id='type-id-1059'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='list' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_list.h' line='499' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1073' is-artificial='yes'/>
+            <parameter type-id='type-id-1067' is-artificial='yes'/>
             <return type-id='type-id-56'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='list' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_list.h' line='507' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1073' is-artificial='yes'/>
-            <parameter type-id='type-id-1052'/>
+            <parameter type-id='type-id-1067' is-artificial='yes'/>
+            <parameter type-id='type-id-1046'/>
             <return type-id='type-id-56'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='list' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_list.h' line='519' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1073' is-artificial='yes'/>
+            <parameter type-id='type-id-1067' is-artificial='yes'/>
             <parameter type-id='type-id-5'/>
-            <parameter type-id='type-id-1025'/>
-            <parameter type-id='type-id-1052'/>
+            <parameter type-id='type-id-1019'/>
+            <parameter type-id='type-id-1046'/>
             <return type-id='type-id-56'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='list' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_list.h' line='531' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1073' is-artificial='yes'/>
-            <parameter type-id='type-id-1057'/>
+            <parameter type-id='type-id-1067' is-artificial='yes'/>
+            <parameter type-id='type-id-1051'/>
             <return type-id='type-id-56'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='operator=' mangled-name='_ZNSt4listIP19ProfileHandlerTokenSaIS1_EEaSERKS3_' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/list.tcc' line='132' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1073' is-artificial='yes'/>
-            <parameter type-id='type-id-1057'/>
-            <return type-id='type-id-1072'/>
+            <parameter type-id='type-id-1067' is-artificial='yes'/>
+            <parameter type-id='type-id-1051'/>
+            <return type-id='type-id-1066'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='assign' mangled-name='_ZNSt4listIP19ProfileHandlerTokenSaIS1_EE6assignEmRKS1_' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_list.h' line='641' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1073' is-artificial='yes'/>
+            <parameter type-id='type-id-1067' is-artificial='yes'/>
             <parameter type-id='type-id-5'/>
-            <parameter type-id='type-id-1025'/>
+            <parameter type-id='type-id-1019'/>
             <return type-id='type-id-56'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='get_allocator' mangled-name='_ZNKSt4listIP19ProfileHandlerTokenSaIS1_EE13get_allocatorEv' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_list.h' line='680' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1058' is-artificial='yes'/>
-            <return type-id='type-id-1050'/>
+            <parameter type-id='type-id-1052' is-artificial='yes'/>
+            <return type-id='type-id-1044'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='begin' mangled-name='_ZNSt4listIP19ProfileHandlerTokenSaIS1_EE5beginEv' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_list.h' line='689' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1073' is-artificial='yes'/>
-            <return type-id='type-id-1016'/>
+            <parameter type-id='type-id-1067' is-artificial='yes'/>
+            <return type-id='type-id-1010'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='begin' mangled-name='_ZNKSt4listIP19ProfileHandlerTokenSaIS1_EE5beginEv' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_list.h' line='698' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1058' is-artificial='yes'/>
-            <return type-id='type-id-1075'/>
+            <parameter type-id='type-id-1052' is-artificial='yes'/>
+            <return type-id='type-id-1069'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='end' mangled-name='_ZNSt4listIP19ProfileHandlerTokenSaIS1_EE3endEv' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_list.h' line='707' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1073' is-artificial='yes'/>
-            <return type-id='type-id-1016'/>
+            <parameter type-id='type-id-1067' is-artificial='yes'/>
+            <return type-id='type-id-1010'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='end' mangled-name='_ZNKSt4listIP19ProfileHandlerTokenSaIS1_EE3endEv' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_list.h' line='716' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1058' is-artificial='yes'/>
-            <return type-id='type-id-1075'/>
+            <parameter type-id='type-id-1052' is-artificial='yes'/>
+            <return type-id='type-id-1069'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='rbegin' mangled-name='_ZNSt4listIP19ProfileHandlerTokenSaIS1_EE6rbeginEv' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_list.h' line='725' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1073' is-artificial='yes'/>
-            <return type-id='type-id-1076'/>
+            <parameter type-id='type-id-1067' is-artificial='yes'/>
+            <return type-id='type-id-1070'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='rbegin' mangled-name='_ZNKSt4listIP19ProfileHandlerTokenSaIS1_EE6rbeginEv' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_list.h' line='734' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1058' is-artificial='yes'/>
-            <return type-id='type-id-1077'/>
+            <parameter type-id='type-id-1052' is-artificial='yes'/>
+            <return type-id='type-id-1071'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='rend' mangled-name='_ZNSt4listIP19ProfileHandlerTokenSaIS1_EE4rendEv' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_list.h' line='743' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1073' is-artificial='yes'/>
-            <return type-id='type-id-1076'/>
+            <parameter type-id='type-id-1067' is-artificial='yes'/>
+            <return type-id='type-id-1070'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='rend' mangled-name='_ZNKSt4listIP19ProfileHandlerTokenSaIS1_EE4rendEv' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_list.h' line='752' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1058' is-artificial='yes'/>
-            <return type-id='type-id-1077'/>
+            <parameter type-id='type-id-1052' is-artificial='yes'/>
+            <return type-id='type-id-1071'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='empty' mangled-name='_ZNKSt4listIP19ProfileHandlerTokenSaIS1_EE5emptyEv' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_list.h' line='799' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1058' is-artificial='yes'/>
+            <parameter type-id='type-id-1052' is-artificial='yes'/>
             <return type-id='type-id-55'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='size' mangled-name='_ZNKSt4listIP19ProfileHandlerTokenSaIS1_EE4sizeEv' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_list.h' line='804' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1058' is-artificial='yes'/>
+            <parameter type-id='type-id-1052' is-artificial='yes'/>
             <return type-id='type-id-57'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='max_size' mangled-name='_ZNKSt4listIP19ProfileHandlerTokenSaIS1_EE8max_sizeEv' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_list.h' line='809' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1058' is-artificial='yes'/>
+            <parameter type-id='type-id-1052' is-artificial='yes'/>
             <return type-id='type-id-57'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='resize' mangled-name='_ZNSt4listIP19ProfileHandlerTokenSaIS1_EE6resizeEmS1_' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/list.tcc' line='117' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1073' is-artificial='yes'/>
+            <parameter type-id='type-id-1067' is-artificial='yes'/>
             <parameter type-id='type-id-5'/>
-            <parameter type-id='type-id-1019'/>
+            <parameter type-id='type-id-1013'/>
             <return type-id='type-id-56'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='front' mangled-name='_ZNSt4listIP19ProfileHandlerTokenSaIS1_EE5frontEv' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_list.h' line='831' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1073' is-artificial='yes'/>
-            <return type-id='type-id-1027'/>
+            <parameter type-id='type-id-1067' is-artificial='yes'/>
+            <return type-id='type-id-1021'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='front' mangled-name='_ZNKSt4listIP19ProfileHandlerTokenSaIS1_EE5frontEv' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_list.h' line='839' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1058' is-artificial='yes'/>
-            <return type-id='type-id-1025'/>
+            <parameter type-id='type-id-1052' is-artificial='yes'/>
+            <return type-id='type-id-1019'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='back' mangled-name='_ZNSt4listIP19ProfileHandlerTokenSaIS1_EE4backEv' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_list.h' line='847' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1073' is-artificial='yes'/>
-            <return type-id='type-id-1027'/>
+            <parameter type-id='type-id-1067' is-artificial='yes'/>
+            <return type-id='type-id-1021'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='back' mangled-name='_ZNKSt4listIP19ProfileHandlerTokenSaIS1_EE4backEv' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_list.h' line='859' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1058' is-artificial='yes'/>
-            <return type-id='type-id-1025'/>
+            <parameter type-id='type-id-1052' is-artificial='yes'/>
+            <return type-id='type-id-1019'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='push_front' mangled-name='_ZNSt4listIP19ProfileHandlerTokenSaIS1_EE10push_frontERKS1_' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_list.h' line='878' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1073' is-artificial='yes'/>
-            <parameter type-id='type-id-1025'/>
+            <parameter type-id='type-id-1067' is-artificial='yes'/>
+            <parameter type-id='type-id-1019'/>
             <return type-id='type-id-56'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='pop_front' mangled-name='_ZNSt4listIP19ProfileHandlerTokenSaIS1_EE9pop_frontEv' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_list.h' line='905' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1073' is-artificial='yes'/>
+            <parameter type-id='type-id-1067' is-artificial='yes'/>
             <return type-id='type-id-56'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='push_back' mangled-name='_ZNSt4listIP19ProfileHandlerTokenSaIS1_EE9push_backERKS1_' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_list.h' line='919' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1073' is-artificial='yes'/>
-            <parameter type-id='type-id-1025'/>
+            <parameter type-id='type-id-1067' is-artificial='yes'/>
+            <parameter type-id='type-id-1019'/>
             <return type-id='type-id-56'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='pop_back' mangled-name='_ZNSt4listIP19ProfileHandlerTokenSaIS1_EE8pop_backEv' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_list.h' line='945' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1073' is-artificial='yes'/>
+            <parameter type-id='type-id-1067' is-artificial='yes'/>
             <return type-id='type-id-56'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='insert' mangled-name='_ZNSt4listIP19ProfileHandlerTokenSaIS1_EE6insertESt14_List_iteratorIS1_ERKS1_' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/list.tcc' line='97' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1073' is-artificial='yes'/>
-            <parameter type-id='type-id-1016'/>
-            <parameter type-id='type-id-1025'/>
-            <return type-id='type-id-1016'/>
+            <parameter type-id='type-id-1067' is-artificial='yes'/>
+            <parameter type-id='type-id-1010'/>
+            <parameter type-id='type-id-1019'/>
+            <return type-id='type-id-1010'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='insert' mangled-name='_ZNSt4listIP19ProfileHandlerTokenSaIS1_EE6insertESt14_List_iteratorIS1_EmRKS1_' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_list.h' line='1027' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1073' is-artificial='yes'/>
-            <parameter type-id='type-id-1016'/>
+            <parameter type-id='type-id-1067' is-artificial='yes'/>
+            <parameter type-id='type-id-1010'/>
             <parameter type-id='type-id-5'/>
-            <parameter type-id='type-id-1025'/>
+            <parameter type-id='type-id-1019'/>
             <return type-id='type-id-56'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='erase' mangled-name='_ZNSt4listIP19ProfileHandlerTokenSaIS1_EE5eraseESt14_List_iteratorIS1_E' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/list.tcc' line='107' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1073' is-artificial='yes'/>
-            <parameter type-id='type-id-1016'/>
-            <return type-id='type-id-1016'/>
+            <parameter type-id='type-id-1067' is-artificial='yes'/>
+            <parameter type-id='type-id-1010'/>
+            <return type-id='type-id-1010'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='erase' mangled-name='_ZNSt4listIP19ProfileHandlerTokenSaIS1_EE5eraseESt14_List_iteratorIS1_ES5_' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_list.h' line='1092' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1073' is-artificial='yes'/>
-            <parameter type-id='type-id-1016'/>
-            <parameter type-id='type-id-1016'/>
-            <return type-id='type-id-1016'/>
+            <parameter type-id='type-id-1067' is-artificial='yes'/>
+            <parameter type-id='type-id-1010'/>
+            <parameter type-id='type-id-1010'/>
+            <return type-id='type-id-1010'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='swap' mangled-name='_ZNSt4listIP19ProfileHandlerTokenSaIS1_EE4swapERS3_' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_list.h' line='1112' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1073' is-artificial='yes'/>
-            <parameter type-id='type-id-1072'/>
+            <parameter type-id='type-id-1067' is-artificial='yes'/>
+            <parameter type-id='type-id-1066'/>
             <return type-id='type-id-56'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='clear' mangled-name='_ZNSt4listIP19ProfileHandlerTokenSaIS1_EE5clearEv' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_list.h' line='1130' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1073' is-artificial='yes'/>
+            <parameter type-id='type-id-1067' is-artificial='yes'/>
             <return type-id='type-id-56'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='splice' mangled-name='_ZNSt4listIP19ProfileHandlerTokenSaIS1_EE6spliceESt14_List_iteratorIS1_ERS3_' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_list.h' line='1152' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1073' is-artificial='yes'/>
-            <parameter type-id='type-id-1016'/>
-            <parameter type-id='type-id-1072'/>
+            <parameter type-id='type-id-1067' is-artificial='yes'/>
+            <parameter type-id='type-id-1010'/>
+            <parameter type-id='type-id-1066'/>
             <return type-id='type-id-56'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='splice' mangled-name='_ZNSt4listIP19ProfileHandlerTokenSaIS1_EE6spliceESt14_List_iteratorIS1_ERS3_S5_' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_list.h' line='1176' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1073' is-artificial='yes'/>
-            <parameter type-id='type-id-1016'/>
-            <parameter type-id='type-id-1072'/>
-            <parameter type-id='type-id-1016'/>
+            <parameter type-id='type-id-1067' is-artificial='yes'/>
+            <parameter type-id='type-id-1010'/>
+            <parameter type-id='type-id-1066'/>
+            <parameter type-id='type-id-1010'/>
             <return type-id='type-id-56'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='splice' mangled-name='_ZNSt4listIP19ProfileHandlerTokenSaIS1_EE6spliceESt14_List_iteratorIS1_ERS3_S5_S5_' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_list.h' line='1207' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1073' is-artificial='yes'/>
-            <parameter type-id='type-id-1016'/>
-            <parameter type-id='type-id-1072'/>
-            <parameter type-id='type-id-1016'/>
-            <parameter type-id='type-id-1016'/>
+            <parameter type-id='type-id-1067' is-artificial='yes'/>
+            <parameter type-id='type-id-1010'/>
+            <parameter type-id='type-id-1066'/>
+            <parameter type-id='type-id-1010'/>
+            <parameter type-id='type-id-1010'/>
             <return type-id='type-id-56'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='remove' mangled-name='_ZNSt4listIP19ProfileHandlerTokenSaIS1_EE6removeERKS1_' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/list.tcc' line='186' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1073' is-artificial='yes'/>
-            <parameter type-id='type-id-1025'/>
+            <parameter type-id='type-id-1067' is-artificial='yes'/>
+            <parameter type-id='type-id-1019'/>
             <return type-id='type-id-56'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='unique' mangled-name='_ZNSt4listIP19ProfileHandlerTokenSaIS1_EE6uniqueEv' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/list.tcc' line='214' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1073' is-artificial='yes'/>
+            <parameter type-id='type-id-1067' is-artificial='yes'/>
             <return type-id='type-id-56'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='merge' mangled-name='_ZNSt4listIP19ProfileHandlerTokenSaIS1_EE5mergeERS3_' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/list.tcc' line='234' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1073' is-artificial='yes'/>
-            <parameter type-id='type-id-1072'/>
+            <parameter type-id='type-id-1067' is-artificial='yes'/>
+            <parameter type-id='type-id-1066'/>
             <return type-id='type-id-56'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='reverse' mangled-name='_ZNSt4listIP19ProfileHandlerTokenSaIS1_EE7reverseEv' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_list.h' line='1320' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1073' is-artificial='yes'/>
+            <parameter type-id='type-id-1067' is-artificial='yes'/>
             <return type-id='type-id-56'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='sort' mangled-name='_ZNSt4listIP19ProfileHandlerTokenSaIS1_EE4sortEv' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/list.tcc' line='301' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1073' is-artificial='yes'/>
+            <parameter type-id='type-id-1067' is-artificial='yes'/>
             <return type-id='type-id-56'/>
           </function-decl>
         </member-function>
         <member-function access='protected'>
           <function-decl name='_M_fill_initialize' mangled-name='_ZNSt4listIP19ProfileHandlerTokenSaIS1_EE18_M_fill_initializeEmRKS1_' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_list.h' line='1367' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1073' is-artificial='yes'/>
+            <parameter type-id='type-id-1067' is-artificial='yes'/>
             <parameter type-id='type-id-5'/>
-            <parameter type-id='type-id-1025'/>
+            <parameter type-id='type-id-1019'/>
             <return type-id='type-id-56'/>
           </function-decl>
         </member-function>
         <member-function access='protected'>
           <function-decl name='_M_fill_assign' mangled-name='_ZNSt4listIP19ProfileHandlerTokenSaIS1_EE14_M_fill_assignEmRKS1_' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/list.tcc' line='154' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1073' is-artificial='yes'/>
+            <parameter type-id='type-id-1067' is-artificial='yes'/>
             <parameter type-id='type-id-5'/>
-            <parameter type-id='type-id-1025'/>
+            <parameter type-id='type-id-1019'/>
             <return type-id='type-id-56'/>
           </function-decl>
         </member-function>
         <member-function access='protected'>
           <function-decl name='_M_transfer' mangled-name='_ZNSt4listIP19ProfileHandlerTokenSaIS1_EE11_M_transferESt14_List_iteratorIS1_ES5_S5_' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_list.h' line='1399' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1073' is-artificial='yes'/>
-            <parameter type-id='type-id-1016'/>
-            <parameter type-id='type-id-1016'/>
-            <parameter type-id='type-id-1016'/>
+            <parameter type-id='type-id-1067' is-artificial='yes'/>
+            <parameter type-id='type-id-1010'/>
+            <parameter type-id='type-id-1010'/>
+            <parameter type-id='type-id-1010'/>
             <return type-id='type-id-56'/>
           </function-decl>
         </member-function>
         <member-function access='protected'>
           <function-decl name='_M_insert' mangled-name='_ZNSt4listIP19ProfileHandlerTokenSaIS1_EE9_M_insertESt14_List_iteratorIS1_ERKS1_' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_list.h' line='1405' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1073' is-artificial='yes'/>
-            <parameter type-id='type-id-1016'/>
-            <parameter type-id='type-id-1025'/>
+            <parameter type-id='type-id-1067' is-artificial='yes'/>
+            <parameter type-id='type-id-1010'/>
+            <parameter type-id='type-id-1019'/>
             <return type-id='type-id-56'/>
           </function-decl>
         </member-function>
         <member-function access='protected'>
           <function-decl name='_M_erase' mangled-name='_ZNSt4listIP19ProfileHandlerTokenSaIS1_EE8_M_eraseESt14_List_iteratorIS1_E' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_list.h' line='1422' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1073' is-artificial='yes'/>
-            <parameter type-id='type-id-1016'/>
+            <parameter type-id='type-id-1067' is-artificial='yes'/>
+            <parameter type-id='type-id-1010'/>
             <return type-id='type-id-56'/>
           </function-decl>
         </member-function>
         <member-function access='protected'>
           <function-decl name='_M_check_equal_allocators' mangled-name='_ZNSt4listIP19ProfileHandlerTokenSaIS1_EE25_M_check_equal_allocatorsERS3_' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_list.h' line='1436' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1073' is-artificial='yes'/>
-            <parameter type-id='type-id-1072'/>
+            <parameter type-id='type-id-1067' is-artificial='yes'/>
+            <parameter type-id='type-id-1066'/>
             <return type-id='type-id-56'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='_List_base&lt;ProfileHandlerToken*, std::allocator&lt;ProfileHandlerToken*&gt; &gt;' size-in-bits='128' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_list.h' line='278' column='1' id='type-id-1040'>
+      <class-decl name='_List_base&lt;ProfileHandlerToken*, std::allocator&lt;ProfileHandlerToken*&gt; &gt;' size-in-bits='128' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_list.h' line='278' column='1' id='type-id-1034'>
         <member-type access='protected'>
-          <class-decl name='_List_impl' size-in-bits='128' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_list.h' line='300' column='1' id='type-id-1060'>
-            <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1053'/>
+          <class-decl name='_List_impl' size-in-bits='128' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_list.h' line='300' column='1' id='type-id-1054'>
+            <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1047'/>
             <data-member access='public' layout-offset-in-bits='0'>
-              <var-decl name='_M_node' type-id='type-id-1066' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_list.h' line='301' column='1'/>
+              <var-decl name='_M_node' type-id='type-id-1060' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_list.h' line='301' column='1'/>
             </data-member>
             <member-function access='public' constructor='yes'>
               <function-decl name='_List_impl' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_list.h' line='303' column='1' visibility='default' binding='global' size-in-bits='64'>
-                <parameter type-id='type-id-1061' is-artificial='yes'/>
+                <parameter type-id='type-id-1055' is-artificial='yes'/>
                 <return type-id='type-id-56'/>
               </function-decl>
             </member-function>
             <member-function access='public' constructor='yes'>
               <function-decl name='_List_impl' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_list.h' line='307' column='1' visibility='default' binding='global' size-in-bits='64'>
-                <parameter type-id='type-id-1061' is-artificial='yes'/>
-                <parameter type-id='type-id-1055'/>
+                <parameter type-id='type-id-1055' is-artificial='yes'/>
+                <parameter type-id='type-id-1049'/>
                 <return type-id='type-id-56'/>
               </function-decl>
             </member-function>
           </class-decl>
         </member-type>
         <data-member access='protected' layout-offset-in-bits='0'>
-          <var-decl name='_M_impl' type-id='type-id-1060' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_list.h' line='312' column='1'/>
+          <var-decl name='_M_impl' type-id='type-id-1054' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_list.h' line='312' column='1'/>
         </data-member>
         <member-function access='protected'>
           <function-decl name='_M_get_node' mangled-name='_ZNSt10_List_baseIP19ProfileHandlerTokenSaIS1_EE11_M_get_nodeEv' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_list.h' line='315' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1059' is-artificial='yes'/>
-            <return type-id='type-id-1065'/>
+            <parameter type-id='type-id-1053' is-artificial='yes'/>
+            <return type-id='type-id-1059'/>
           </function-decl>
         </member-function>
         <member-function access='protected'>
           <function-decl name='_M_put_node' mangled-name='_ZNSt10_List_baseIP19ProfileHandlerTokenSaIS1_EE11_M_put_nodeEPSt10_List_nodeIS1_E' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_list.h' line='319' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1059' is-artificial='yes'/>
-            <parameter type-id='type-id-1065'/>
+            <parameter type-id='type-id-1053' is-artificial='yes'/>
+            <parameter type-id='type-id-1059'/>
             <return type-id='type-id-56'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='_M_get_Node_allocator' mangled-name='_ZNSt10_List_baseIP19ProfileHandlerTokenSaIS1_EE21_M_get_Node_allocatorEv' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_list.h' line='326' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1059' is-artificial='yes'/>
-            <return type-id='type-id-1070'/>
+            <parameter type-id='type-id-1053' is-artificial='yes'/>
+            <return type-id='type-id-1064'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='_M_get_Node_allocator' mangled-name='_ZNKSt10_List_baseIP19ProfileHandlerTokenSaIS1_EE21_M_get_Node_allocatorEv' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_list.h' line='330' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1042' is-artificial='yes'/>
-            <return type-id='type-id-1055'/>
+            <parameter type-id='type-id-1036' is-artificial='yes'/>
+            <return type-id='type-id-1049'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='_M_get_Tp_allocator' mangled-name='_ZNKSt10_List_baseIP19ProfileHandlerTokenSaIS1_EE19_M_get_Tp_allocatorEv' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_list.h' line='334' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1042' is-artificial='yes'/>
-            <return type-id='type-id-1050'/>
+            <parameter type-id='type-id-1036' is-artificial='yes'/>
+            <return type-id='type-id-1044'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='get_allocator' mangled-name='_ZNKSt10_List_baseIP19ProfileHandlerTokenSaIS1_EE13get_allocatorEv' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_list.h' line='338' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1042' is-artificial='yes'/>
-            <return type-id='type-id-1050'/>
+            <parameter type-id='type-id-1036' is-artificial='yes'/>
+            <return type-id='type-id-1044'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='_List_base' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_list.h' line='341' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1059' is-artificial='yes'/>
+            <parameter type-id='type-id-1053' is-artificial='yes'/>
             <return type-id='type-id-56'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='_List_base' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_list.h' line='345' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1059' is-artificial='yes'/>
-            <parameter type-id='type-id-1052'/>
+            <parameter type-id='type-id-1053' is-artificial='yes'/>
+            <parameter type-id='type-id-1046'/>
             <return type-id='type-id-56'/>
           </function-decl>
         </member-function>
         <member-function access='private' destructor='yes'>
           <function-decl name='~_List_base' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_list.h' line='359' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1059' is-artificial='yes'/>
+            <parameter type-id='type-id-1053' is-artificial='yes'/>
             <parameter type-id='type-id-1' is-artificial='yes'/>
             <return type-id='type-id-56'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='_M_clear' mangled-name='_ZNSt10_List_baseIP19ProfileHandlerTokenSaIS1_EE8_M_clearEv' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/list.tcc' line='64' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1059' is-artificial='yes'/>
+            <parameter type-id='type-id-1053' is-artificial='yes'/>
             <return type-id='type-id-56'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='_M_init' mangled-name='_ZNSt10_List_baseIP19ProfileHandlerTokenSaIS1_EE7_M_initEv' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_list.h' line='366' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1059' is-artificial='yes'/>
+            <parameter type-id='type-id-1053' is-artificial='yes'/>
             <return type-id='type-id-56'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='allocator&lt;std::_List_node&lt;ProfileHandlerToken*&gt; &gt;' size-in-bits='8' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/allocator.h' line='87' column='1' id='type-id-1053'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1031'/>
+      <class-decl name='allocator&lt;std::_List_node&lt;ProfileHandlerToken*&gt; &gt;' size-in-bits='8' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/allocator.h' line='87' column='1' id='type-id-1047'>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1025'/>
         <member-function access='private'>
           <function-decl name='allocator' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/allocator.h' line='101' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1071' is-artificial='yes'/>
+            <parameter type-id='type-id-1065' is-artificial='yes'/>
             <return type-id='type-id-56'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='allocator' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/allocator.h' line='103' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1071' is-artificial='yes'/>
-            <parameter type-id='type-id-1055'/>
+            <parameter type-id='type-id-1065' is-artificial='yes'/>
+            <parameter type-id='type-id-1049'/>
             <return type-id='type-id-56'/>
           </function-decl>
         </member-function>
         <member-function access='private' destructor='yes'>
           <function-decl name='~allocator' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/allocator.h' line='109' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1071' is-artificial='yes'/>
+            <parameter type-id='type-id-1065' is-artificial='yes'/>
             <parameter type-id='type-id-1' is-artificial='yes'/>
             <return type-id='type-id-56'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='_List_node&lt;ProfileHandlerToken*&gt;' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-1046'/>
-      <class-decl name='allocator&lt;ProfileHandlerToken*&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-1050'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1029'/>
+      <class-decl name='_List_node&lt;ProfileHandlerToken*&gt;' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-1040'/>
+      <class-decl name='allocator&lt;ProfileHandlerToken*&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-1044'>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1023'/>
         <member-function access='private'>
           <function-decl name='allocator' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/allocator.h' line='101' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1069' is-artificial='yes'/>
+            <parameter type-id='type-id-1063' is-artificial='yes'/>
             <return type-id='type-id-56'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='allocator' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/allocator.h' line='103' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1069' is-artificial='yes'/>
-            <parameter type-id='type-id-1052'/>
+            <parameter type-id='type-id-1063' is-artificial='yes'/>
+            <parameter type-id='type-id-1046'/>
             <return type-id='type-id-56'/>
           </function-decl>
         </member-function>
         <member-function access='private' destructor='yes'>
           <function-decl name='~allocator' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/allocator.h' line='109' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1069' is-artificial='yes'/>
+            <parameter type-id='type-id-1063' is-artificial='yes'/>
             <parameter type-id='type-id-1' is-artificial='yes'/>
             <return type-id='type-id-56'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='allocator&lt;std::_List_node&lt;ProfileHandlerToken*&gt; &gt;' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/allocator.h' line='107' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1069' is-artificial='yes'/>
-            <parameter type-id='type-id-1055'/>
+            <parameter type-id='type-id-1063' is-artificial='yes'/>
+            <parameter type-id='type-id-1049'/>
             <return type-id='type-id-56'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='_List_const_iterator&lt;ProfileHandlerToken*&gt;' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-1075'/>
-      <class-decl name='reverse_iterator&lt;std::_List_iterator&lt;ProfileHandlerToken*&gt; &gt;' visibility='default' is-declaration-only='yes' id='type-id-1076'/>
-      <class-decl name='reverse_iterator&lt;std::_List_const_iterator&lt;ProfileHandlerToken*&gt; &gt;' visibility='default' is-declaration-only='yes' id='type-id-1077'/>
+      <class-decl name='_List_const_iterator&lt;ProfileHandlerToken*&gt;' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-1069'/>
+      <class-decl name='reverse_iterator&lt;std::_List_iterator&lt;ProfileHandlerToken*&gt; &gt;' visibility='default' is-declaration-only='yes' id='type-id-1070'/>
+      <class-decl name='reverse_iterator&lt;std::_List_const_iterator&lt;ProfileHandlerToken*&gt; &gt;' visibility='default' is-declaration-only='yes' id='type-id-1071'/>
     </namespace-decl>
     <namespace-decl name='__gnu_cxx'>
-      <class-decl name='new_allocator&lt;std::_List_node&lt;ProfileHandlerToken*&gt; &gt;' size-in-bits='8' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/ext/new_allocator.h' line='52' column='1' id='type-id-1031'>
+      <class-decl name='new_allocator&lt;std::_List_node&lt;ProfileHandlerToken*&gt; &gt;' size-in-bits='8' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/ext/new_allocator.h' line='52' column='1' id='type-id-1025'>
         <member-function access='private'>
           <function-decl name='new_allocator' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/ext/new_allocator.h' line='66' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1032' is-artificial='yes'/>
+            <parameter type-id='type-id-1026' is-artificial='yes'/>
             <return type-id='type-id-56'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='new_allocator' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/ext/new_allocator.h' line='68' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1032' is-artificial='yes'/>
-            <parameter type-id='type-id-1038'/>
+            <parameter type-id='type-id-1026' is-artificial='yes'/>
+            <parameter type-id='type-id-1032'/>
             <return type-id='type-id-56'/>
           </function-decl>
         </member-function>
         <member-function access='private' destructor='yes'>
           <function-decl name='~new_allocator' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/ext/new_allocator.h' line='73' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1032' is-artificial='yes'/>
+            <parameter type-id='type-id-1026' is-artificial='yes'/>
             <parameter type-id='type-id-1' is-artificial='yes'/>
             <return type-id='type-id-56'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='address' mangled-name='_ZNK9__gnu_cxx13new_allocatorISt10_List_nodeIP19ProfileHandlerTokenEE7addressERS4_' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/ext/new_allocator.h' line='76' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1039' is-artificial='yes'/>
-            <parameter type-id='type-id-1064'/>
-            <return type-id='type-id-1065'/>
+            <parameter type-id='type-id-1033' is-artificial='yes'/>
+            <parameter type-id='type-id-1058'/>
+            <return type-id='type-id-1059'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='address' mangled-name='_ZNK9__gnu_cxx13new_allocatorISt10_List_nodeIP19ProfileHandlerTokenEE7addressERKS4_' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/ext/new_allocator.h' line='79' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1039' is-artificial='yes'/>
-            <parameter type-id='type-id-1048'/>
-            <return type-id='type-id-1049'/>
+            <parameter type-id='type-id-1033' is-artificial='yes'/>
+            <parameter type-id='type-id-1042'/>
+            <return type-id='type-id-1043'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='allocate' mangled-name='_ZN9__gnu_cxx13new_allocatorISt10_List_nodeIP19ProfileHandlerTokenEE8allocateEmPKv' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/ext/new_allocator.h' line='84' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1032' is-artificial='yes'/>
+            <parameter type-id='type-id-1026' is-artificial='yes'/>
             <parameter type-id='type-id-5'/>
             <parameter type-id='type-id-53'/>
-            <return type-id='type-id-1065'/>
+            <return type-id='type-id-1059'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='deallocate' mangled-name='_ZN9__gnu_cxx13new_allocatorISt10_List_nodeIP19ProfileHandlerTokenEE10deallocateEPS4_m' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/ext/new_allocator.h' line='94' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1032' is-artificial='yes'/>
-            <parameter type-id='type-id-1065'/>
+            <parameter type-id='type-id-1026' is-artificial='yes'/>
+            <parameter type-id='type-id-1059'/>
             <parameter type-id='type-id-5'/>
             <return type-id='type-id-56'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='max_size' mangled-name='_ZNK9__gnu_cxx13new_allocatorISt10_List_nodeIP19ProfileHandlerTokenEE8max_sizeEv' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/ext/new_allocator.h' line='98' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1039' is-artificial='yes'/>
+            <parameter type-id='type-id-1033' is-artificial='yes'/>
             <return type-id='type-id-57'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='construct' mangled-name='_ZN9__gnu_cxx13new_allocatorISt10_List_nodeIP19ProfileHandlerTokenEE9constructEPS4_RKS4_' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/ext/new_allocator.h' line='104' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1032' is-artificial='yes'/>
-            <parameter type-id='type-id-1065'/>
-            <parameter type-id='type-id-1048'/>
+            <parameter type-id='type-id-1026' is-artificial='yes'/>
+            <parameter type-id='type-id-1059'/>
+            <parameter type-id='type-id-1042'/>
             <return type-id='type-id-56'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='destroy' mangled-name='_ZN9__gnu_cxx13new_allocatorISt10_List_nodeIP19ProfileHandlerTokenEE7destroyEPS4_' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/ext/new_allocator.h' line='115' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1032' is-artificial='yes'/>
-            <parameter type-id='type-id-1065'/>
+            <parameter type-id='type-id-1026' is-artificial='yes'/>
+            <parameter type-id='type-id-1059'/>
             <return type-id='type-id-56'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='new_allocator&lt;ProfileHandlerToken*&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-1029'>
+      <class-decl name='new_allocator&lt;ProfileHandlerToken*&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-1023'>
         <member-function access='private'>
           <function-decl name='new_allocator' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/ext/new_allocator.h' line='66' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1030' is-artificial='yes'/>
+            <parameter type-id='type-id-1024' is-artificial='yes'/>
             <return type-id='type-id-56'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='new_allocator' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/ext/new_allocator.h' line='68' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1030' is-artificial='yes'/>
-            <parameter type-id='type-id-1035'/>
+            <parameter type-id='type-id-1024' is-artificial='yes'/>
+            <parameter type-id='type-id-1029'/>
             <return type-id='type-id-56'/>
           </function-decl>
         </member-function>
         <member-function access='private' destructor='yes'>
           <function-decl name='~new_allocator' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/ext/new_allocator.h' line='73' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1030' is-artificial='yes'/>
+            <parameter type-id='type-id-1024' is-artificial='yes'/>
             <parameter type-id='type-id-1' is-artificial='yes'/>
             <return type-id='type-id-56'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='address' mangled-name='_ZNK9__gnu_cxx13new_allocatorIP19ProfileHandlerTokenE7addressERS2_' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/ext/new_allocator.h' line='76' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1036' is-artificial='yes'/>
-            <parameter type-id='type-id-1027'/>
-            <return type-id='type-id-1028'/>
+            <parameter type-id='type-id-1030' is-artificial='yes'/>
+            <parameter type-id='type-id-1021'/>
+            <return type-id='type-id-1022'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='address' mangled-name='_ZNK9__gnu_cxx13new_allocatorIP19ProfileHandlerTokenE7addressERKS2_' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/ext/new_allocator.h' line='79' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1036' is-artificial='yes'/>
-            <parameter type-id='type-id-1025'/>
-            <return type-id='type-id-1026'/>
+            <parameter type-id='type-id-1030' is-artificial='yes'/>
+            <parameter type-id='type-id-1019'/>
+            <return type-id='type-id-1020'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='allocate' mangled-name='_ZN9__gnu_cxx13new_allocatorIP19ProfileHandlerTokenE8allocateEmPKv' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/ext/new_allocator.h' line='84' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1030' is-artificial='yes'/>
+            <parameter type-id='type-id-1024' is-artificial='yes'/>
             <parameter type-id='type-id-5'/>
             <parameter type-id='type-id-53'/>
-            <return type-id='type-id-1028'/>
+            <return type-id='type-id-1022'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='deallocate' mangled-name='_ZN9__gnu_cxx13new_allocatorIP19ProfileHandlerTokenE10deallocateEPS2_m' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/ext/new_allocator.h' line='94' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1030' is-artificial='yes'/>
-            <parameter type-id='type-id-1028'/>
+            <parameter type-id='type-id-1024' is-artificial='yes'/>
+            <parameter type-id='type-id-1022'/>
             <parameter type-id='type-id-5'/>
             <return type-id='type-id-56'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='max_size' mangled-name='_ZNK9__gnu_cxx13new_allocatorIP19ProfileHandlerTokenE8max_sizeEv' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/ext/new_allocator.h' line='98' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1036' is-artificial='yes'/>
+            <parameter type-id='type-id-1030' is-artificial='yes'/>
             <return type-id='type-id-57'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='construct' mangled-name='_ZN9__gnu_cxx13new_allocatorIP19ProfileHandlerTokenE9constructEPS2_RKS2_' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/ext/new_allocator.h' line='104' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1030' is-artificial='yes'/>
-            <parameter type-id='type-id-1028'/>
-            <parameter type-id='type-id-1025'/>
+            <parameter type-id='type-id-1024' is-artificial='yes'/>
+            <parameter type-id='type-id-1022'/>
+            <parameter type-id='type-id-1019'/>
             <return type-id='type-id-56'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='destroy' mangled-name='_ZN9__gnu_cxx13new_allocatorIP19ProfileHandlerTokenE7destroyEPS2_' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/ext/new_allocator.h' line='115' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1030' is-artificial='yes'/>
-            <parameter type-id='type-id-1028'/>
+            <parameter type-id='type-id-1024' is-artificial='yes'/>
+            <parameter type-id='type-id-1022'/>
             <return type-id='type-id-56'/>
           </function-decl>
         </member-function>
       </class-decl>
     </namespace-decl>
     <function-decl name='ProfileHandlerGetState' mangled-name='ProfileHandlerGetState' filepath='src/profile-handler.cc' line='658' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='ProfileHandlerGetState'>
-      <parameter type-id='type-id-1020' name='state' filepath='src/profile-handler.cc' line='658' column='1'/>
+      <parameter type-id='type-id-1014' name='state' filepath='src/profile-handler.cc' line='658' column='1'/>
       <return type-id='type-id-56'/>
     </function-decl>
     <function-decl name='ProfileHandlerReset' mangled-name='ProfileHandlerReset' filepath='src/profile-handler.cc' line='654' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='ProfileHandlerReset'>
       <return type-id='type-id-56'/>
     </function-decl>
     <function-decl name='ProfileHandlerUnregisterCallback' mangled-name='ProfileHandlerUnregisterCallback' filepath='src/profile-handler.cc' line='650' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='ProfileHandlerUnregisterCallback'>
-      <parameter type-id='type-id-1019' name='token' filepath='src/profile-handler.cc' line='650' column='1'/>
+      <parameter type-id='type-id-1013' name='token' filepath='src/profile-handler.cc' line='650' column='1'/>
       <return type-id='type-id-56'/>
     </function-decl>
     <function-decl name='ProfileHandlerRegisterCallback' mangled-name='ProfileHandlerRegisterCallback' filepath='src/profile-handler.cc' line='645' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='ProfileHandlerRegisterCallback'>
-      <parameter type-id='type-id-1006' name='callback' filepath='src/profile-handler.cc' line='646' column='1'/>
+      <parameter type-id='type-id-1000' name='callback' filepath='src/profile-handler.cc' line='646' column='1'/>
       <parameter type-id='type-id-53' name='callback_arg' filepath='src/profile-handler.cc' line='646' column='1'/>
-      <return type-id='type-id-1019'/>
+      <return type-id='type-id-1013'/>
     </function-decl>
     <function-decl name='ProfileHandlerRegisterThread' mangled-name='ProfileHandlerRegisterThread' filepath='src/profile-handler.cc' line='641' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='ProfileHandlerRegisterThread'>
       <return type-id='type-id-56'/>
     </function-decl>
-    <function-type size-in-bits='64' id='type-id-1074'>
+    <function-type size-in-bits='64' id='type-id-1068'>
       <parameter type-id='type-id-1'/>
-      <parameter type-id='type-id-1021'/>
+      <parameter type-id='type-id-1015'/>
       <parameter type-id='type-id-53'/>
       <parameter type-id='type-id-53'/>
       <return type-id='type-id-56'/>
@@ -17790,39 +17535,39 @@
   <abi-instr version='1.0' address-size='64' path='src/profiledata.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-kFgaKP/gperftools-2.4' language='LANG_C_plus_plus'>
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='src/profiler.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-kFgaKP/gperftools-2.4' language='LANG_C_plus_plus'>
-    <array-type-def dimensions='1' type-id='type-id-1078' size-in-bits='4096' id='type-id-1079'>
-      <subrange length='64' type-id='type-id-5' id='type-id-1080'/>
+    <array-type-def dimensions='1' type-id='type-id-1072' size-in-bits='4096' id='type-id-1073'>
+      <subrange length='64' type-id='type-id-5' id='type-id-1074'/>
     </array-type-def>
-    <array-type-def dimensions='1' type-id='type-id-1081' size-in-bits='16896' id='type-id-1082'>
+    <array-type-def dimensions='1' type-id='type-id-1075' size-in-bits='16896' id='type-id-1076'>
       <subrange length='4' type-id='type-id-5' id='type-id-126'/>
     </array-type-def>
-    <array-type-def dimensions='1' type-id='type-id-66' size-in-bits='8192' id='type-id-1083'>
-      <subrange length='1024' type-id='type-id-5' id='type-id-1084'/>
+    <array-type-def dimensions='1' type-id='type-id-66' size-in-bits='8192' id='type-id-1077'>
+      <subrange length='1024' type-id='type-id-5' id='type-id-1078'/>
     </array-type-def>
-    <array-type-def dimensions='1' type-id='type-id-1' size-in-bits='896' id='type-id-1085'>
-      <subrange length='28' type-id='type-id-5' id='type-id-1086'/>
+    <array-type-def dimensions='1' type-id='type-id-1' size-in-bits='896' id='type-id-1079'>
+      <subrange length='28' type-id='type-id-5' id='type-id-1080'/>
     </array-type-def>
-    <class-decl name='ProfileData' size-in-bits='448' visibility='default' filepath='src/profiledata.h' line='79' column='1' id='type-id-1087'>
+    <class-decl name='ProfileData' size-in-bits='448' visibility='default' filepath='src/profiledata.h' line='79' column='1' id='type-id-1081'>
       <member-type access='private'>
-        <class-decl name='Options' size-in-bits='32' visibility='default' filepath='src/profiledata.h' line='88' column='1' id='type-id-1088'>
+        <class-decl name='Options' size-in-bits='32' visibility='default' filepath='src/profiledata.h' line='88' column='1' id='type-id-1082'>
           <data-member access='private' layout-offset-in-bits='0'>
             <var-decl name='frequency_' type-id='type-id-1' visibility='default' filepath='src/profiledata.h' line='101' column='1'/>
           </data-member>
           <member-function access='private' constructor='yes'>
             <function-decl name='Options' mangled-name='_ZN11ProfileData7OptionsC1Ev' filepath='src/profiledata.h' line='90' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN11ProfileData7OptionsC1Ev'>
-              <parameter type-id='type-id-1089' is-artificial='yes'/>
+              <parameter type-id='type-id-1083' is-artificial='yes'/>
               <return type-id='type-id-56'/>
             </function-decl>
           </member-function>
           <member-function access='private'>
             <function-decl name='frequency' mangled-name='_ZNK11ProfileData7Options9frequencyEv' filepath='src/profiledata.h' line='93' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-1090' is-artificial='yes'/>
+              <parameter type-id='type-id-1084' is-artificial='yes'/>
               <return type-id='type-id-1'/>
             </function-decl>
           </member-function>
           <member-function access='private'>
             <function-decl name='set_frequency' mangled-name='_ZN11ProfileData7Options13set_frequencyEi' filepath='src/profiledata.h' line='96' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-1089' is-artificial='yes'/>
+              <parameter type-id='type-id-1083' is-artificial='yes'/>
               <parameter type-id='type-id-1'/>
               <return type-id='type-id-56'/>
             </function-decl>
@@ -17830,15 +17575,15 @@
         </class-decl>
       </member-type>
       <member-type access='private'>
-        <class-decl name='State' size-in-bits='8384' is-struct='yes' visibility='default' filepath='src/profiledata.h' line='81' column='1' id='type-id-1091'>
+        <class-decl name='State' size-in-bits='8384' is-struct='yes' visibility='default' filepath='src/profiledata.h' line='81' column='1' id='type-id-1085'>
           <data-member access='public' layout-offset-in-bits='0'>
             <var-decl name='enabled' type-id='type-id-55' visibility='default' filepath='src/profiledata.h' line='82' column='1'/>
           </data-member>
           <data-member access='public' layout-offset-in-bits='64'>
-            <var-decl name='start_time' type-id='type-id-1092' visibility='default' filepath='src/profiledata.h' line='83' column='1'/>
+            <var-decl name='start_time' type-id='type-id-1086' visibility='default' filepath='src/profiledata.h' line='83' column='1'/>
           </data-member>
           <data-member access='public' layout-offset-in-bits='128'>
-            <var-decl name='profile_name' type-id='type-id-1083' visibility='default' filepath='src/profiledata.h' line='84' column='1'/>
+            <var-decl name='profile_name' type-id='type-id-1077' visibility='default' filepath='src/profiledata.h' line='84' column='1'/>
           </data-member>
           <data-member access='public' layout-offset-in-bits='8320'>
             <var-decl name='samples_gathered' type-id='type-id-1' visibility='default' filepath='src/profiledata.h' line='85' column='1'/>
@@ -17846,25 +17591,25 @@
         </class-decl>
       </member-type>
       <member-type access='private'>
-        <class-decl name='Entry' size-in-bits='4224' is-struct='yes' visibility='default' filepath='src/profiledata.h' line='154' column='1' id='type-id-1081'>
+        <class-decl name='Entry' size-in-bits='4224' is-struct='yes' visibility='default' filepath='src/profiledata.h' line='154' column='1' id='type-id-1075'>
           <member-type access='private'>
-            <typedef-decl name='Slot' type-id='type-id-130' filepath='src/profiledata.h' line='151' column='1' id='type-id-1078'/>
+            <typedef-decl name='Slot' type-id='type-id-130' filepath='src/profiledata.h' line='151' column='1' id='type-id-1072'/>
           </member-type>
           <data-member access='public' layout-offset-in-bits='0'>
-            <var-decl name='count' type-id='type-id-1078' visibility='default' filepath='src/profiledata.h' line='155' column='1'/>
+            <var-decl name='count' type-id='type-id-1072' visibility='default' filepath='src/profiledata.h' line='155' column='1'/>
           </data-member>
           <data-member access='public' layout-offset-in-bits='64'>
-            <var-decl name='depth' type-id='type-id-1078' visibility='default' filepath='src/profiledata.h' line='156' column='1'/>
+            <var-decl name='depth' type-id='type-id-1072' visibility='default' filepath='src/profiledata.h' line='156' column='1'/>
           </data-member>
           <data-member access='public' layout-offset-in-bits='128'>
-            <var-decl name='stack' type-id='type-id-1079' visibility='default' filepath='src/profiledata.h' line='157' column='1'/>
+            <var-decl name='stack' type-id='type-id-1073' visibility='default' filepath='src/profiledata.h' line='157' column='1'/>
           </data-member>
         </class-decl>
       </member-type>
       <member-type access='private'>
-        <class-decl name='Bucket' size-in-bits='16896' is-struct='yes' visibility='default' filepath='src/profiledata.h' line='161' column='1' id='type-id-1093'>
+        <class-decl name='Bucket' size-in-bits='16896' is-struct='yes' visibility='default' filepath='src/profiledata.h' line='161' column='1' id='type-id-1087'>
           <data-member access='public' layout-offset-in-bits='0'>
-            <var-decl name='entry' type-id='type-id-1082' visibility='default' filepath='src/profiledata.h' line='162' column='1'/>
+            <var-decl name='entry' type-id='type-id-1076' visibility='default' filepath='src/profiledata.h' line='162' column='1'/>
           </data-member>
         </class-decl>
       </member-type>
@@ -17881,10 +17626,10 @@
         <var-decl name='kBufferLength' type-id='type-id-112' mangled-name='_ZN11ProfileData13kBufferLengthE' visibility='default' filepath='src/profiledata.h' line='148' column='1' elf-symbol-id='_ZN11ProfileData13kBufferLengthE'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='0'>
-        <var-decl name='hash_' type-id='type-id-1094' visibility='default' filepath='src/profiledata.h' line='165' column='1'/>
+        <var-decl name='hash_' type-id='type-id-1088' visibility='default' filepath='src/profiledata.h' line='165' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='64'>
-        <var-decl name='evict_' type-id='type-id-1095' visibility='default' filepath='src/profiledata.h' line='166' column='1'/>
+        <var-decl name='evict_' type-id='type-id-1089' visibility='default' filepath='src/profiledata.h' line='166' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='128'>
         <var-decl name='num_evicted_' type-id='type-id-1' visibility='default' filepath='src/profiledata.h' line='167' column='1'/>
@@ -17905,44 +17650,44 @@
         <var-decl name='fname_' type-id='type-id-90' visibility='default' filepath='src/profiledata.h' line='172' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='384'>
-        <var-decl name='start_time_' type-id='type-id-1092' visibility='default' filepath='src/profiledata.h' line='173' column='1'/>
+        <var-decl name='start_time_' type-id='type-id-1086' visibility='default' filepath='src/profiledata.h' line='173' column='1'/>
       </data-member>
       <member-function access='private' constructor='yes'>
         <function-decl name='ProfileData' mangled-name='_ZN11ProfileDataC1Ev' filepath='src/profiledata.h' line='106' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN11ProfileDataC1Ev'>
-          <parameter type-id='type-id-1096' is-artificial='yes'/>
+          <parameter type-id='type-id-1090' is-artificial='yes'/>
           <return type-id='type-id-56'/>
         </function-decl>
       </member-function>
       <member-function access='private' destructor='yes'>
         <function-decl name='~ProfileData' mangled-name='_ZN11ProfileDataD1Ev' filepath='src/profiledata.h' line='107' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN11ProfileDataD1Ev'>
-          <parameter type-id='type-id-1096' is-artificial='yes'/>
+          <parameter type-id='type-id-1090' is-artificial='yes'/>
           <parameter type-id='type-id-1' is-artificial='yes'/>
           <return type-id='type-id-56'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
         <function-decl name='Start' mangled-name='_ZN11ProfileData5StartEPKcRKNS_7OptionsE' filepath='src/profiledata.h' line='116' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN11ProfileData5StartEPKcRKNS_7OptionsE'>
-          <parameter type-id='type-id-1096' is-artificial='yes'/>
+          <parameter type-id='type-id-1090' is-artificial='yes'/>
           <parameter type-id='type-id-52'/>
-          <parameter type-id='type-id-1097'/>
+          <parameter type-id='type-id-1091'/>
           <return type-id='type-id-55'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
         <function-decl name='Stop' mangled-name='_ZN11ProfileData4StopEv' filepath='src/profiledata.h' line='120' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN11ProfileData4StopEv'>
-          <parameter type-id='type-id-1096' is-artificial='yes'/>
+          <parameter type-id='type-id-1090' is-artificial='yes'/>
           <return type-id='type-id-56'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
         <function-decl name='Reset' mangled-name='_ZN11ProfileData5ResetEv' filepath='src/profiledata.h' line='124' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN11ProfileData5ResetEv'>
-          <parameter type-id='type-id-1096' is-artificial='yes'/>
+          <parameter type-id='type-id-1090' is-artificial='yes'/>
           <return type-id='type-id-56'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
         <function-decl name='Add' mangled-name='_ZN11ProfileData3AddEiPKPKv' filepath='src/profiledata.h' line='133' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN11ProfileData3AddEiPKPKv'>
-          <parameter type-id='type-id-1096' is-artificial='yes'/>
+          <parameter type-id='type-id-1090' is-artificial='yes'/>
           <parameter type-id='type-id-1'/>
           <parameter type-id='type-id-150'/>
           <return type-id='type-id-56'/>
@@ -17950,84 +17695,84 @@
       </member-function>
       <member-function access='private'>
         <function-decl name='FlushTable' mangled-name='_ZN11ProfileData10FlushTableEv' filepath='src/profiledata.h' line='137' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN11ProfileData10FlushTableEv'>
-          <parameter type-id='type-id-1096' is-artificial='yes'/>
+          <parameter type-id='type-id-1090' is-artificial='yes'/>
           <return type-id='type-id-56'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
         <function-decl name='enabled' mangled-name='_ZNK11ProfileData7enabledEv' filepath='src/profiledata.h' line='140' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-1098' is-artificial='yes'/>
+          <parameter type-id='type-id-1092' is-artificial='yes'/>
           <return type-id='type-id-55'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
         <function-decl name='GetCurrentState' mangled-name='_ZNK11ProfileData15GetCurrentStateEPNS_5StateE' filepath='src/profiledata.h' line='143' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNK11ProfileData15GetCurrentStateEPNS_5StateE'>
-          <parameter type-id='type-id-1098' is-artificial='yes'/>
-          <parameter type-id='type-id-1099'/>
+          <parameter type-id='type-id-1092' is-artificial='yes'/>
+          <parameter type-id='type-id-1093'/>
           <return type-id='type-id-56'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
         <function-decl name='Evict' mangled-name='_ZN11ProfileData5EvictERKNS_5EntryE' filepath='src/profiledata.h' line='176' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN11ProfileData5EvictERKNS_5EntryE'>
-          <parameter type-id='type-id-1096' is-artificial='yes'/>
-          <parameter type-id='type-id-1100'/>
+          <parameter type-id='type-id-1090' is-artificial='yes'/>
+          <parameter type-id='type-id-1094'/>
           <return type-id='type-id-56'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
         <function-decl name='FlushEvicted' mangled-name='_ZN11ProfileData12FlushEvictedEv' filepath='src/profiledata.h' line='179' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN11ProfileData12FlushEvictedEv'>
-          <parameter type-id='type-id-1096' is-artificial='yes'/>
+          <parameter type-id='type-id-1090' is-artificial='yes'/>
           <return type-id='type-id-56'/>
         </function-decl>
       </member-function>
       <member-function access='private' constructor='yes'>
         <function-decl name='ProfileData' filepath='src/profiledata.h' line='181' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-1096' is-artificial='yes'/>
-          <parameter type-id='type-id-1101'/>
+          <parameter type-id='type-id-1090' is-artificial='yes'/>
+          <parameter type-id='type-id-1095'/>
           <return type-id='type-id-56'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
         <function-decl name='operator=' mangled-name='_ZN11ProfileDataaSERKS_' filepath='src/profiledata.h' line='181' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-1096' is-artificial='yes'/>
-          <parameter type-id='type-id-1101'/>
+          <parameter type-id='type-id-1090' is-artificial='yes'/>
+          <parameter type-id='type-id-1095'/>
           <return type-id='type-id-56'/>
         </function-decl>
       </member-function>
     </class-decl>
-    <class-decl name='ProfileHandlerToken' size-in-bits='128' is-struct='yes' visibility='default' filepath='src/profile-handler.cc' line='69' column='1' id='type-id-1102'>
+    <class-decl name='ProfileHandlerToken' size-in-bits='128' is-struct='yes' visibility='default' filepath='src/profile-handler.cc' line='69' column='1' id='type-id-1096'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='callback' type-id='type-id-1006' visibility='default' filepath='src/profile-handler.cc' line='77' column='1'/>
+        <var-decl name='callback' type-id='type-id-1000' visibility='default' filepath='src/profile-handler.cc' line='77' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
         <var-decl name='callback_arg' type-id='type-id-53' visibility='default' filepath='src/profile-handler.cc' line='79' column='1'/>
       </data-member>
       <member-function access='public' constructor='yes'>
         <function-decl name='ProfileHandlerToken' filepath='src/profile-handler.cc' line='71' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-1019' is-artificial='yes'/>
-          <parameter type-id='type-id-1006'/>
+          <parameter type-id='type-id-1013' is-artificial='yes'/>
+          <parameter type-id='type-id-1000'/>
           <parameter type-id='type-id-53'/>
           <return type-id='type-id-56'/>
         </function-decl>
       </member-function>
     </class-decl>
-    <typedef-decl name='time_t' type-id='type-id-1103' filepath='/usr/include/time.h' line='76' column='1' id='type-id-1092'/>
-    <typedef-decl name='__time_t' type-id='type-id-285' filepath='/usr/include/bits/types.h' line='149' column='1' id='type-id-1103'/>
-    <class-decl name='siginfo' size-in-bits='1024' is-struct='yes' visibility='default' filepath='/usr/include/bits/siginfo.h' line='52' column='1' id='type-id-1104'>
+    <typedef-decl name='time_t' type-id='type-id-1097' filepath='/usr/include/time.h' line='76' column='1' id='type-id-1086'/>
+    <typedef-decl name='__time_t' type-id='type-id-285' filepath='/usr/include/bits/types.h' line='149' column='1' id='type-id-1097'/>
+    <class-decl name='siginfo' size-in-bits='1024' is-struct='yes' visibility='default' filepath='/usr/include/bits/siginfo.h' line='52' column='1' id='type-id-1098'>
       <member-type access='public'>
-        <union-decl name='__anonymous_union__' size-in-bits='896' is-anonymous='yes' visibility='default' filepath='/usr/include/bits/siginfo.h' line='59' column='1' id='type-id-1105'>
+        <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-1099'>
           <member-type access='private'>
-            <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-1106'>
+            <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-1100'>
               <data-member access='public' layout-offset-in-bits='0'>
                 <var-decl name='si_pid' type-id='type-id-60' visibility='default' filepath='/usr/include/bits/siginfo.h' line='65' column='1'/>
               </data-member>
               <data-member access='public' layout-offset-in-bits='32'>
-                <var-decl name='si_uid' type-id='type-id-1107' visibility='default' filepath='/usr/include/bits/siginfo.h' line='66' column='1'/>
+                <var-decl name='si_uid' type-id='type-id-1101' visibility='default' filepath='/usr/include/bits/siginfo.h' line='66' column='1'/>
               </data-member>
             </class-decl>
           </member-type>
           <member-type access='private'>
-            <class-decl name='__anonymous_struct__1' size-in-bits='128' is-struct='yes' is-anonymous='yes' visibility='default' filepath='/usr/include/bits/siginfo.h' line='71' column='1' id='type-id-1108'>
+            <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-1102'>
               <data-member access='public' layout-offset-in-bits='0'>
                 <var-decl name='si_tid' type-id='type-id-1' visibility='default' filepath='/usr/include/bits/siginfo.h' line='72' column='1'/>
               </data-member>
@@ -18035,51 +17780,51 @@
                 <var-decl name='si_overrun' type-id='type-id-1' visibility='default' filepath='/usr/include/bits/siginfo.h' line='73' column='1'/>
               </data-member>
               <data-member access='public' layout-offset-in-bits='64'>
-                <var-decl name='si_sigval' type-id='type-id-1109' visibility='default' filepath='/usr/include/bits/siginfo.h' line='74' column='1'/>
+                <var-decl name='si_sigval' type-id='type-id-1103' visibility='default' filepath='/usr/include/bits/siginfo.h' line='74' column='1'/>
               </data-member>
             </class-decl>
           </member-type>
           <member-type access='private'>
-            <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-1110'>
+            <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-1104'>
               <data-member access='public' layout-offset-in-bits='0'>
                 <var-decl name='si_pid' type-id='type-id-60' visibility='default' filepath='/usr/include/bits/siginfo.h' line='80' column='1'/>
               </data-member>
               <data-member access='public' layout-offset-in-bits='32'>
-                <var-decl name='si_uid' type-id='type-id-1107' visibility='default' filepath='/usr/include/bits/siginfo.h' line='81' column='1'/>
+                <var-decl name='si_uid' type-id='type-id-1101' visibility='default' filepath='/usr/include/bits/siginfo.h' line='81' column='1'/>
               </data-member>
               <data-member access='public' layout-offset-in-bits='64'>
-                <var-decl name='si_sigval' type-id='type-id-1109' visibility='default' filepath='/usr/include/bits/siginfo.h' line='82' column='1'/>
+                <var-decl name='si_sigval' type-id='type-id-1103' visibility='default' filepath='/usr/include/bits/siginfo.h' line='82' column='1'/>
               </data-member>
             </class-decl>
           </member-type>
           <member-type access='private'>
-            <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-1111'>
+            <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-1105'>
               <data-member access='public' layout-offset-in-bits='0'>
                 <var-decl name='si_pid' type-id='type-id-60' visibility='default' filepath='/usr/include/bits/siginfo.h' line='88' column='1'/>
               </data-member>
               <data-member access='public' layout-offset-in-bits='32'>
-                <var-decl name='si_uid' type-id='type-id-1107' visibility='default' filepath='/usr/include/bits/siginfo.h' line='89' column='1'/>
+                <var-decl name='si_uid' type-id='type-id-1101' visibility='default' filepath='/usr/include/bits/siginfo.h' line='89' column='1'/>
               </data-member>
               <data-member access='public' layout-offset-in-bits='64'>
                 <var-decl name='si_status' type-id='type-id-1' visibility='default' filepath='/usr/include/bits/siginfo.h' line='90' column='1'/>
               </data-member>
               <data-member access='public' layout-offset-in-bits='128'>
-                <var-decl name='si_utime' type-id='type-id-1112' visibility='default' filepath='/usr/include/bits/siginfo.h' line='91' column='1'/>
+                <var-decl name='si_utime' type-id='type-id-1106' visibility='default' filepath='/usr/include/bits/siginfo.h' line='91' column='1'/>
               </data-member>
               <data-member access='public' layout-offset-in-bits='192'>
-                <var-decl name='si_stime' type-id='type-id-1112' visibility='default' filepath='/usr/include/bits/siginfo.h' line='92' column='1'/>
+                <var-decl name='si_stime' type-id='type-id-1106' visibility='default' filepath='/usr/include/bits/siginfo.h' line='92' column='1'/>
               </data-member>
             </class-decl>
           </member-type>
           <member-type access='private'>
-            <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-1113'>
+            <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-1107'>
               <data-member access='public' layout-offset-in-bits='0'>
                 <var-decl name='si_addr' type-id='type-id-53' visibility='default' filepath='/usr/include/bits/siginfo.h' line='98' column='1'/>
               </data-member>
             </class-decl>
           </member-type>
           <member-type access='private'>
-            <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-1114'>
+            <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-1108'>
               <data-member access='public' layout-offset-in-bits='0'>
                 <var-decl name='si_band' type-id='type-id-285' visibility='default' filepath='/usr/include/bits/siginfo.h' line='104' column='1'/>
               </data-member>
@@ -18089,25 +17834,25 @@
             </class-decl>
           </member-type>
           <data-member access='private'>
-            <var-decl name='_pad' type-id='type-id-1085' visibility='default' filepath='/usr/include/bits/siginfo.h' line='60' column='1'/>
+            <var-decl name='_pad' type-id='type-id-1079' visibility='default' filepath='/usr/include/bits/siginfo.h' line='60' column='1'/>
           </data-member>
           <data-member access='private'>
-            <var-decl name='_kill' type-id='type-id-1106' visibility='default' filepath='/usr/include/bits/siginfo.h' line='67' column='1'/>
+            <var-decl name='_kill' type-id='type-id-1100' visibility='default' filepath='/usr/include/bits/siginfo.h' line='67' column='1'/>
           </data-member>
           <data-member access='private'>
-            <var-decl name='_timer' type-id='type-id-1108' visibility='default' filepath='/usr/include/bits/siginfo.h' line='75' column='1'/>
+            <var-decl name='_timer' type-id='type-id-1102' visibility='default' filepath='/usr/include/bits/siginfo.h' line='75' column='1'/>
           </data-member>
           <data-member access='private'>
-            <var-decl name='_rt' type-id='type-id-1110' visibility='default' filepath='/usr/include/bits/siginfo.h' line='83' column='1'/>
+            <var-decl name='_rt' type-id='type-id-1104' visibility='default' filepath='/usr/include/bits/siginfo.h' line='83' column='1'/>
           </data-member>
           <data-member access='private'>
-            <var-decl name='_sigchld' type-id='type-id-1111' visibility='default' filepath='/usr/include/bits/siginfo.h' line='93' column='1'/>
+            <var-decl name='_sigchld' type-id='type-id-1105' visibility='default' filepath='/usr/include/bits/siginfo.h' line='93' column='1'/>
           </data-member>
           <data-member access='private'>
-            <var-decl name='_sigfault' type-id='type-id-1113' visibility='default' filepath='/usr/include/bits/siginfo.h' line='99' column='1'/>
+            <var-decl name='_sigfault' type-id='type-id-1107' visibility='default' filepath='/usr/include/bits/siginfo.h' line='99' column='1'/>
           </data-member>
           <data-member access='private'>
-            <var-decl name='_sigpoll' type-id='type-id-1114' visibility='default' filepath='/usr/include/bits/siginfo.h' line='106' column='1'/>
+            <var-decl name='_sigpoll' type-id='type-id-1108' visibility='default' filepath='/usr/include/bits/siginfo.h' line='106' column='1'/>
           </data-member>
         </union-decl>
       </member-type>
@@ -18121,122 +17866,122 @@
         <var-decl name='si_code' type-id='type-id-1' visibility='default' filepath='/usr/include/bits/siginfo.h' line='56' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
-        <var-decl name='_sifields' type-id='type-id-1105' visibility='default' filepath='/usr/include/bits/siginfo.h' line='107' column='1'/>
+        <var-decl name='_sifields' type-id='type-id-1099' visibility='default' filepath='/usr/include/bits/siginfo.h' line='107' column='1'/>
       </data-member>
     </class-decl>
-    <class-decl name='CpuProfiler' size-in-bits='704' visibility='default' filepath='src/profiler.cc' line='89' column='1' id='type-id-1115'>
+    <class-decl name='CpuProfiler' size-in-bits='704' visibility='default' filepath='src/profiler.cc' line='89' column='1' id='type-id-1109'>
       <data-member access='private' static='yes'>
-        <var-decl name='instance_' type-id='type-id-1115' mangled-name='_ZN11CpuProfiler9instance_E' visibility='default' filepath='src/profiler.cc' line='107' column='1' elf-symbol-id='_ZN11CpuProfiler9instance_E'/>
+        <var-decl name='instance_' type-id='type-id-1109' mangled-name='_ZN11CpuProfiler9instance_E' visibility='default' filepath='src/profiler.cc' line='107' column='1' elf-symbol-id='_ZN11CpuProfiler9instance_E'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='0'>
         <var-decl name='lock_' type-id='type-id-176' visibility='default' filepath='src/profiler.cc' line='119' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='64'>
-        <var-decl name='collector_' type-id='type-id-1087' visibility='default' filepath='src/profiler.cc' line='120' column='1'/>
+        <var-decl name='collector_' type-id='type-id-1081' visibility='default' filepath='src/profiler.cc' line='120' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='512'>
-        <var-decl name='filter_' type-id='type-id-1116' visibility='default' filepath='src/profiler.cc' line='125' column='1'/>
+        <var-decl name='filter_' type-id='type-id-1110' visibility='default' filepath='src/profiler.cc' line='125' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='576'>
         <var-decl name='filter_arg_' type-id='type-id-53' visibility='default' filepath='src/profiler.cc' line='126' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='640'>
-        <var-decl name='prof_handler_token_' type-id='type-id-1019' visibility='default' filepath='src/profiler.cc' line='130' column='1'/>
+        <var-decl name='prof_handler_token_' type-id='type-id-1013' visibility='default' filepath='src/profiler.cc' line='130' column='1'/>
       </data-member>
       <member-function access='private' constructor='yes'>
         <function-decl name='CpuProfiler' mangled-name='_ZN11CpuProfilerC1Ev' filepath='src/profiler.cc' line='91' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN11CpuProfilerC1Ev'>
-          <parameter type-id='type-id-1117' is-artificial='yes'/>
+          <parameter type-id='type-id-1111' is-artificial='yes'/>
           <return type-id='type-id-56'/>
         </function-decl>
       </member-function>
       <member-function access='private' destructor='yes'>
         <function-decl name='~CpuProfiler' mangled-name='_ZN11CpuProfilerD1Ev' filepath='src/profiler.cc' line='92' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN11CpuProfilerD1Ev'>
-          <parameter type-id='type-id-1117' is-artificial='yes'/>
+          <parameter type-id='type-id-1111' is-artificial='yes'/>
           <parameter type-id='type-id-1' is-artificial='yes'/>
           <return type-id='type-id-56'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
         <function-decl name='Start' mangled-name='_ZN11CpuProfiler5StartEPKcPK15ProfilerOptions' filepath='src/profiler.cc' line='95' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN11CpuProfiler5StartEPKcPK15ProfilerOptions'>
-          <parameter type-id='type-id-1117' is-artificial='yes'/>
+          <parameter type-id='type-id-1111' is-artificial='yes'/>
           <parameter type-id='type-id-52'/>
-          <parameter type-id='type-id-1118'/>
+          <parameter type-id='type-id-1112'/>
           <return type-id='type-id-55'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
         <function-decl name='Stop' mangled-name='_ZN11CpuProfiler4StopEv' filepath='src/profiler.cc' line='98' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN11CpuProfiler4StopEv'>
-          <parameter type-id='type-id-1117' is-artificial='yes'/>
+          <parameter type-id='type-id-1111' is-artificial='yes'/>
           <return type-id='type-id-56'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
         <function-decl name='FlushTable' mangled-name='_ZN11CpuProfiler10FlushTableEv' filepath='src/profiler.cc' line='101' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN11CpuProfiler10FlushTableEv'>
-          <parameter type-id='type-id-1117' is-artificial='yes'/>
+          <parameter type-id='type-id-1111' is-artificial='yes'/>
           <return type-id='type-id-56'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
         <function-decl name='Enabled' mangled-name='_ZN11CpuProfiler7EnabledEv' filepath='src/profiler.cc' line='103' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN11CpuProfiler7EnabledEv'>
-          <parameter type-id='type-id-1117' is-artificial='yes'/>
+          <parameter type-id='type-id-1111' is-artificial='yes'/>
           <return type-id='type-id-55'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
         <function-decl name='GetCurrentState' mangled-name='_ZN11CpuProfiler15GetCurrentStateEP13ProfilerState' filepath='src/profiler.cc' line='105' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN11CpuProfiler15GetCurrentStateEP13ProfilerState'>
-          <parameter type-id='type-id-1117' is-artificial='yes'/>
-          <parameter type-id='type-id-1119'/>
+          <parameter type-id='type-id-1111' is-artificial='yes'/>
+          <parameter type-id='type-id-1113'/>
           <return type-id='type-id-56'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
         <function-decl name='EnableHandler' mangled-name='_ZN11CpuProfiler13EnableHandlerEv' filepath='src/profiler.cc' line='133' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN11CpuProfiler13EnableHandlerEv'>
-          <parameter type-id='type-id-1117' is-artificial='yes'/>
+          <parameter type-id='type-id-1111' is-artificial='yes'/>
           <return type-id='type-id-56'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
         <function-decl name='DisableHandler' mangled-name='_ZN11CpuProfiler14DisableHandlerEv' filepath='src/profiler.cc' line='136' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN11CpuProfiler14DisableHandlerEv'>
-          <parameter type-id='type-id-1117' is-artificial='yes'/>
+          <parameter type-id='type-id-1111' is-artificial='yes'/>
           <return type-id='type-id-56'/>
         </function-decl>
       </member-function>
       <member-function access='private' static='yes'>
         <function-decl name='prof_handler' mangled-name='_ZN11CpuProfiler12prof_handlerEiP7siginfoPvS2_' filepath='src/profiler.cc' line='139' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN11CpuProfiler12prof_handlerEiP7siginfoPvS2_'>
           <parameter type-id='type-id-1'/>
-          <parameter type-id='type-id-1021'/>
+          <parameter type-id='type-id-1015'/>
           <parameter type-id='type-id-53'/>
           <parameter type-id='type-id-53'/>
           <return type-id='type-id-56'/>
         </function-decl>
       </member-function>
     </class-decl>
-    <class-decl name='ProfilerOptions' size-in-bits='128' is-struct='yes' visibility='default' filepath='./src/gperftools/profiler.h' line='89' column='1' id='type-id-1120'>
+    <class-decl name='ProfilerOptions' size-in-bits='128' is-struct='yes' visibility='default' filepath='./src/gperftools/profiler.h' line='89' column='1' id='type-id-1114'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='filter_in_thread' type-id='type-id-1116' visibility='default' filepath='./src/gperftools/profiler.h' line='108' column='1'/>
+        <var-decl name='filter_in_thread' type-id='type-id-1110' visibility='default' filepath='./src/gperftools/profiler.h' line='108' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
         <var-decl name='filter_in_thread_arg' type-id='type-id-53' visibility='default' filepath='./src/gperftools/profiler.h' line='109' column='1'/>
       </data-member>
     </class-decl>
-    <class-decl name='ProfilerState' size-in-bits='8384' is-struct='yes' visibility='default' filepath='./src/gperftools/profiler.h' line='157' column='1' id='type-id-1121'>
+    <class-decl name='ProfilerState' size-in-bits='8384' is-struct='yes' visibility='default' filepath='./src/gperftools/profiler.h' line='157' column='1' id='type-id-1115'>
       <data-member access='public' layout-offset-in-bits='0'>
         <var-decl name='enabled' type-id='type-id-1' visibility='default' filepath='./src/gperftools/profiler.h' line='158' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
-        <var-decl name='start_time' type-id='type-id-1092' visibility='default' filepath='./src/gperftools/profiler.h' line='159' column='1'/>
+        <var-decl name='start_time' type-id='type-id-1086' visibility='default' filepath='./src/gperftools/profiler.h' line='159' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
-        <var-decl name='profile_name' type-id='type-id-1083' visibility='default' filepath='./src/gperftools/profiler.h' line='160' column='1'/>
+        <var-decl name='profile_name' type-id='type-id-1077' visibility='default' filepath='./src/gperftools/profiler.h' line='160' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='8320'>
         <var-decl name='samples_gathered' type-id='type-id-1' visibility='default' filepath='./src/gperftools/profiler.h' line='161' column='1'/>
       </data-member>
     </class-decl>
-    <typedef-decl name='siginfo_t' type-id='type-id-1104' filepath='/usr/include/bits/siginfo.h' line='108' column='1' id='type-id-1122'/>
-    <typedef-decl name='__uid_t' type-id='type-id-1123' filepath='/usr/include/bits/types.h' line='135' column='1' id='type-id-1107'/>
-    <typedef-decl name='sigval_t' type-id='type-id-1124' filepath='/usr/include/bits/siginfo.h' line='37' column='1' id='type-id-1109'/>
-    <union-decl name='sigval' size-in-bits='64' visibility='default' filepath='/usr/include/bits/siginfo.h' line='34' column='1' id='type-id-1124'>
+    <typedef-decl name='siginfo_t' type-id='type-id-1098' filepath='/usr/include/bits/siginfo.h' line='108' column='1' id='type-id-1116'/>
+    <typedef-decl name='__uid_t' type-id='type-id-1117' filepath='/usr/include/bits/types.h' line='135' column='1' id='type-id-1101'/>
+    <typedef-decl name='sigval_t' type-id='type-id-1118' filepath='/usr/include/bits/siginfo.h' line='37' column='1' id='type-id-1103'/>
+    <union-decl name='sigval' size-in-bits='64' visibility='default' filepath='/usr/include/bits/siginfo.h' line='34' column='1' id='type-id-1118'>
       <data-member access='private'>
         <var-decl name='sival_int' type-id='type-id-1' visibility='default' filepath='/usr/include/bits/siginfo.h' line='35' column='1'/>
       </data-member>
@@ -18244,27 +17989,27 @@
         <var-decl name='sival_ptr' type-id='type-id-53' visibility='default' filepath='/usr/include/bits/siginfo.h' line='36' column='1'/>
       </data-member>
     </union-decl>
-    <typedef-decl name='__clock_t' type-id='type-id-285' filepath='/usr/include/bits/types.h' line='145' column='1' id='type-id-1112'/>
-    <pointer-type-def type-id='type-id-1115' size-in-bits='64' id='type-id-1117'/>
-    <pointer-type-def type-id='type-id-1087' size-in-bits='64' id='type-id-1096'/>
-    <pointer-type-def type-id='type-id-1093' size-in-bits='64' id='type-id-1094'/>
-    <pointer-type-def type-id='type-id-1078' size-in-bits='64' id='type-id-1095'/>
-    <pointer-type-def type-id='type-id-1088' size-in-bits='64' id='type-id-1089'/>
-    <pointer-type-def type-id='type-id-1091' size-in-bits='64' id='type-id-1099'/>
-    <pointer-type-def type-id='type-id-1102' size-in-bits='64' id='type-id-1019'/>
-    <pointer-type-def type-id='type-id-1121' size-in-bits='64' id='type-id-1119'/>
-    <qualified-type-def type-id='type-id-1087' const='yes' id='type-id-1125'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1125' size-in-bits='64' id='type-id-1101'/>
-    <pointer-type-def type-id='type-id-1125' size-in-bits='64' id='type-id-1098'/>
-    <qualified-type-def type-id='type-id-1081' const='yes' id='type-id-1126'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1126' size-in-bits='64' id='type-id-1100'/>
-    <qualified-type-def type-id='type-id-1088' const='yes' id='type-id-1127'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1127' size-in-bits='64' id='type-id-1097'/>
-    <pointer-type-def type-id='type-id-1127' size-in-bits='64' id='type-id-1090'/>
-    <qualified-type-def type-id='type-id-1120' const='yes' id='type-id-1128'/>
-    <pointer-type-def type-id='type-id-1128' size-in-bits='64' id='type-id-1118'/>
-    <pointer-type-def type-id='type-id-1129' size-in-bits='64' id='type-id-1116'/>
-    <pointer-type-def type-id='type-id-1122' size-in-bits='64' id='type-id-1021'/>
+    <typedef-decl name='__clock_t' type-id='type-id-285' filepath='/usr/include/bits/types.h' line='145' column='1' id='type-id-1106'/>
+    <pointer-type-def type-id='type-id-1109' size-in-bits='64' id='type-id-1111'/>
+    <pointer-type-def type-id='type-id-1081' size-in-bits='64' id='type-id-1090'/>
+    <pointer-type-def type-id='type-id-1087' size-in-bits='64' id='type-id-1088'/>
+    <pointer-type-def type-id='type-id-1072' size-in-bits='64' id='type-id-1089'/>
+    <pointer-type-def type-id='type-id-1082' size-in-bits='64' id='type-id-1083'/>
+    <pointer-type-def type-id='type-id-1085' size-in-bits='64' id='type-id-1093'/>
+    <pointer-type-def type-id='type-id-1096' size-in-bits='64' id='type-id-1013'/>
+    <pointer-type-def type-id='type-id-1115' size-in-bits='64' id='type-id-1113'/>
+    <qualified-type-def type-id='type-id-1081' const='yes' id='type-id-1119'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1119' size-in-bits='64' id='type-id-1095'/>
+    <pointer-type-def type-id='type-id-1119' size-in-bits='64' id='type-id-1092'/>
+    <qualified-type-def type-id='type-id-1075' const='yes' id='type-id-1120'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1120' size-in-bits='64' id='type-id-1094'/>
+    <qualified-type-def type-id='type-id-1082' const='yes' id='type-id-1121'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1121' size-in-bits='64' id='type-id-1091'/>
+    <pointer-type-def type-id='type-id-1121' size-in-bits='64' id='type-id-1084'/>
+    <qualified-type-def type-id='type-id-1114' const='yes' id='type-id-1122'/>
+    <pointer-type-def type-id='type-id-1122' size-in-bits='64' id='type-id-1112'/>
+    <pointer-type-def type-id='type-id-1123' size-in-bits='64' id='type-id-1110'/>
+    <pointer-type-def type-id='type-id-1116' size-in-bits='64' id='type-id-1015'/>
     <namespace-decl name='FLAG__namespace_do_not_use_directly_use_DECLARE_bool_instead'>
       <var-decl name='FLAGS_cpu_profiler_unittest' type-id='type-id-55' mangled-name='_ZN60FLAG__namespace_do_not_use_directly_use_DECLARE_bool_instead27FLAGS_cpu_profiler_unittestE' visibility='default' filepath='src/profiler.cc' line='74' column='1' elf-symbol-id='_ZN60FLAG__namespace_do_not_use_directly_use_DECLARE_bool_instead27FLAGS_cpu_profiler_unittestE'/>
       <var-decl name='FLAGS_nocpu_profiler_unittest' type-id='type-id-66' mangled-name='_ZN60FLAG__namespace_do_not_use_directly_use_DECLARE_bool_instead29FLAGS_nocpu_profiler_unittestE' visibility='default' filepath='src/profiler.cc' line='78' column='1' elf-symbol-id='_ZN60FLAG__namespace_do_not_use_directly_use_DECLARE_bool_instead29FLAGS_nocpu_profiler_unittestE'/>
@@ -18288,30 +18033,30 @@
       <return type-id='type-id-56'/>
     </function-decl>
     <function-decl name='ProfilerGetCurrentState' mangled-name='ProfilerGetCurrentState' filepath='src/profiler.cc' line='403' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='ProfilerGetCurrentState'>
-      <parameter type-id='type-id-1119' name='state' filepath='src/profiler.cc' line='404' column='1'/>
+      <parameter type-id='type-id-1113' name='state' filepath='src/profiler.cc' line='404' column='1'/>
       <return type-id='type-id-56'/>
     </function-decl>
     <function-decl name='ProfilerStartWithOptions' mangled-name='ProfilerStartWithOptions' filepath='src/profiler.cc' line='394' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='ProfilerStartWithOptions'>
       <parameter type-id='type-id-52' name='fname' filepath='src/profiler.cc' line='395' column='1'/>
-      <parameter type-id='type-id-1118' name='options' filepath='src/profiler.cc' line='395' column='1'/>
+      <parameter type-id='type-id-1112' name='options' filepath='src/profiler.cc' line='395' column='1'/>
       <return type-id='type-id-1'/>
     </function-decl>
     <function-decl name='ProfilerStart' mangled-name='ProfilerStart' filepath='src/profiler.cc' line='390' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='ProfilerStart'>
       <parameter type-id='type-id-52'/>
       <return type-id='type-id-1'/>
     </function-decl>
-    <function-type size-in-bits='64' id='type-id-1129'>
+    <function-type size-in-bits='64' id='type-id-1123'>
       <parameter type-id='type-id-53'/>
       <return type-id='type-id-1'/>
     </function-type>
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='src/raw_printer.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-kFgaKP/gperftools-2.4' language='LANG_C_plus_plus'>
-    <pointer-type-def type-id='type-id-1130' size-in-bits='64' id='type-id-1131'/>
-    <qualified-type-def type-id='type-id-1130' const='yes' id='type-id-1132'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1132' size-in-bits='64' id='type-id-1133'/>
-    <pointer-type-def type-id='type-id-1132' size-in-bits='64' id='type-id-1134'/>
+    <pointer-type-def type-id='type-id-1124' size-in-bits='64' id='type-id-1125'/>
+    <qualified-type-def type-id='type-id-1124' const='yes' id='type-id-1126'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1126' size-in-bits='64' id='type-id-1127'/>
+    <pointer-type-def type-id='type-id-1126' size-in-bits='64' id='type-id-1128'/>
     <namespace-decl name='base'>
-      <class-decl name='RawPrinter' size-in-bits='192' visibility='default' filepath='src/raw_printer.h' line='51' column='1' id='type-id-1130'>
+      <class-decl name='RawPrinter' size-in-bits='192' visibility='default' filepath='src/raw_printer.h' line='51' column='1' id='type-id-1124'>
         <data-member access='private' layout-offset-in-bits='0'>
           <var-decl name='base_' type-id='type-id-90' visibility='default' filepath='src/raw_printer.h' line='81' column='1'/>
         </data-member>
@@ -18323,7 +18068,7 @@
         </data-member>
         <member-function access='private' constructor='yes'>
           <function-decl name='RawPrinter' mangled-name='_ZN4base10RawPrinterC1EPci' filepath='src/raw_printer.h' line='56' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN4base10RawPrinterC1EPci'>
-            <parameter type-id='type-id-1131' is-artificial='yes'/>
+            <parameter type-id='type-id-1125' is-artificial='yes'/>
             <parameter type-id='type-id-90'/>
             <parameter type-id='type-id-1'/>
             <return type-id='type-id-56'/>
@@ -18331,19 +18076,19 @@
         </member-function>
         <member-function access='private'>
           <function-decl name='length' mangled-name='_ZNK4base10RawPrinter6lengthEv' filepath='src/raw_printer.h' line='60' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1134' is-artificial='yes'/>
+            <parameter type-id='type-id-1128' is-artificial='yes'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='space_left' mangled-name='_ZNK4base10RawPrinter10space_leftEv' filepath='src/raw_printer.h' line='63' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1134' is-artificial='yes'/>
+            <parameter type-id='type-id-1128' is-artificial='yes'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='Printf' mangled-name='_ZN4base10RawPrinter6PrintfEPKcz' filepath='src/raw_printer.h' line='68' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN4base10RawPrinter6PrintfEPKcz'>
-            <parameter type-id='type-id-1131' is-artificial='yes'/>
+            <parameter type-id='type-id-1125' is-artificial='yes'/>
             <parameter type-id='type-id-52'/>
             <parameter is-variadic='yes'/>
             <return type-id='type-id-56'/>
@@ -18351,15 +18096,15 @@
         </member-function>
         <member-function access='private' constructor='yes'>
           <function-decl name='RawPrinter' filepath='src/raw_printer.h' line='85' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1131' is-artificial='yes'/>
-            <parameter type-id='type-id-1133'/>
+            <parameter type-id='type-id-1125' is-artificial='yes'/>
+            <parameter type-id='type-id-1127'/>
             <return type-id='type-id-56'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='operator=' mangled-name='_ZN4base10RawPrinteraSERKS0_' filepath='src/raw_printer.h' line='85' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1131' is-artificial='yes'/>
-            <parameter type-id='type-id-1133'/>
+            <parameter type-id='type-id-1125' is-artificial='yes'/>
+            <parameter type-id='type-id-1127'/>
             <return type-id='type-id-56'/>
           </function-decl>
         </member-function>
@@ -18369,9 +18114,9 @@
   <abi-instr version='1.0' address-size='64' path='src/sampler.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-kFgaKP/gperftools-2.4' language='LANG_C_plus_plus'>
     <namespace-decl name='std'>
       <function-decl name='min&lt;double&gt;' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_algobase.h' line='186' column='1' visibility='default' binding='global' size-in-bits='64'>
-        <parameter type-id='type-id-1135'/>
-        <parameter type-id='type-id-1135'/>
-        <return type-id='type-id-1135'/>
+        <parameter type-id='type-id-1129'/>
+        <parameter type-id='type-id-1129'/>
+        <return type-id='type-id-1129'/>
       </function-decl>
     </namespace-decl>
     <namespace-decl name='FLAG__namespace_do_not_use_directly_use_DECLARE_int64_instead'>
@@ -18382,15 +18127,15 @@
   <abi-instr version='1.0' address-size='64' path='src/span.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-kFgaKP/gperftools-2.4' language='LANG_C_plus_plus'>
     <namespace-decl name='tcmalloc'>
       <function-decl name='DeleteSpan' mangled-name='_ZN8tcmalloc10DeleteSpanEPNS_4SpanE' filepath='src/span.cc' line='65' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN8tcmalloc10DeleteSpanEPNS_4SpanE'>
-        <parameter type-id='type-id-1136'/>
+        <parameter type-id='type-id-1130'/>
         <return type-id='type-id-56'/>
       </function-decl>
       <function-decl name='DLL_Init' mangled-name='_ZN8tcmalloc8DLL_InitEPNS_4SpanE' filepath='src/span.cc' line='73' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN8tcmalloc8DLL_InitEPNS_4SpanE'>
-        <parameter type-id='type-id-1136'/>
+        <parameter type-id='type-id-1130'/>
         <return type-id='type-id-56'/>
       </function-decl>
       <function-decl name='DLL_Remove' mangled-name='_ZN8tcmalloc10DLL_RemoveEPNS_4SpanE' filepath='src/span.cc' line='78' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN8tcmalloc10DLL_RemoveEPNS_4SpanE'>
-        <parameter type-id='type-id-1136'/>
+        <parameter type-id='type-id-1130'/>
         <return type-id='type-id-56'/>
       </function-decl>
       <function-decl name='DLL_Length' mangled-name='_ZN8tcmalloc10DLL_LengthEPKNS_4SpanE' filepath='src/span.cc' line='85' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN8tcmalloc10DLL_LengthEPKNS_4SpanE'>
@@ -18398,50 +18143,50 @@
         <return type-id='type-id-1'/>
       </function-decl>
       <function-decl name='DLL_Prepend' mangled-name='_ZN8tcmalloc11DLL_PrependEPNS_4SpanES1_' filepath='src/span.cc' line='93' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN8tcmalloc11DLL_PrependEPNS_4SpanES1_'>
-        <parameter type-id='type-id-1136'/>
-        <parameter type-id='type-id-1136'/>
+        <parameter type-id='type-id-1130'/>
+        <parameter type-id='type-id-1130'/>
         <return type-id='type-id-56'/>
       </function-decl>
       <function-decl name='NewSpan' mangled-name='_ZN8tcmalloc7NewSpanEmm' filepath='src/span.cc' line='54' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN8tcmalloc7NewSpanEmm'>
-        <parameter type-id='type-id-1137'/>
-        <parameter type-id='type-id-1138'/>
-        <return type-id='type-id-1136'/>
+        <parameter type-id='type-id-1131'/>
+        <parameter type-id='type-id-1132'/>
+        <return type-id='type-id-1130'/>
       </function-decl>
     </namespace-decl>
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='src/stack_trace_table.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-kFgaKP/gperftools-2.4' language='LANG_C_plus_plus'>
+    <qualified-type-def type-id='type-id-1133' const='yes' id='type-id-1134'/>
+    <pointer-type-def type-id='type-id-1134' size-in-bits='64' id='type-id-1135'/>
+    <qualified-type-def type-id='type-id-1136' const='yes' id='type-id-1137'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1137' size-in-bits='64' id='type-id-1138'/>
     <qualified-type-def type-id='type-id-1139' const='yes' id='type-id-1140'/>
     <pointer-type-def type-id='type-id-1140' size-in-bits='64' id='type-id-1141'/>
     <qualified-type-def type-id='type-id-1142' const='yes' id='type-id-1143'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1143' size-in-bits='64' id='type-id-1144'/>
-    <qualified-type-def type-id='type-id-1145' const='yes' id='type-id-1146'/>
+    <pointer-type-def type-id='type-id-1143' size-in-bits='64' id='type-id-1144'/>
+    <pointer-type-def type-id='type-id-1139' size-in-bits='64' id='type-id-1145'/>
+    <pointer-type-def type-id='type-id-1142' size-in-bits='64' id='type-id-1146'/>
     <pointer-type-def type-id='type-id-1146' size-in-bits='64' id='type-id-1147'/>
-    <qualified-type-def type-id='type-id-1148' const='yes' id='type-id-1149'/>
-    <pointer-type-def type-id='type-id-1149' size-in-bits='64' id='type-id-1150'/>
-    <pointer-type-def type-id='type-id-1145' size-in-bits='64' id='type-id-1151'/>
-    <pointer-type-def type-id='type-id-1148' size-in-bits='64' id='type-id-1152'/>
-    <pointer-type-def type-id='type-id-1152' size-in-bits='64' id='type-id-1153'/>
     <namespace-decl name='tcmalloc'>
-      <class-decl name='StackTraceTable' size-in-bits='192' visibility='default' filepath='src/stack_trace_table.h' line='47' column='1' id='type-id-1145'>
+      <class-decl name='StackTraceTable' size-in-bits='192' visibility='default' filepath='src/stack_trace_table.h' line='47' column='1' id='type-id-1139'>
         <member-type access='private'>
-          <class-decl name='Bucket' size-in-bits='2304' is-struct='yes' visibility='default' filepath='src/stack_trace_table.h' line='65' column='1' id='type-id-1148'>
+          <class-decl name='Bucket' size-in-bits='2304' is-struct='yes' visibility='default' filepath='src/stack_trace_table.h' line='65' column='1' id='type-id-1142'>
             <data-member access='public' layout-offset-in-bits='0'>
               <var-decl name='hash' type-id='type-id-130' visibility='default' filepath='src/stack_trace_table.h' line='67' column='1'/>
             </data-member>
             <data-member access='public' layout-offset-in-bits='64'>
-              <var-decl name='trace' type-id='type-id-1142' visibility='default' filepath='src/stack_trace_table.h' line='68' column='1'/>
+              <var-decl name='trace' type-id='type-id-1136' visibility='default' filepath='src/stack_trace_table.h' line='68' column='1'/>
             </data-member>
             <data-member access='public' layout-offset-in-bits='2176'>
               <var-decl name='count' type-id='type-id-1' visibility='default' filepath='src/stack_trace_table.h' line='71' column='1'/>
             </data-member>
             <data-member access='public' layout-offset-in-bits='2240'>
-              <var-decl name='next' type-id='type-id-1152' visibility='default' filepath='src/stack_trace_table.h' line='72' column='1'/>
+              <var-decl name='next' type-id='type-id-1146' visibility='default' filepath='src/stack_trace_table.h' line='72' column='1'/>
             </data-member>
             <member-function access='public'>
               <function-decl name='KeyEqual' mangled-name='_ZNK8tcmalloc15StackTraceTable6Bucket8KeyEqualEmRKNS_10StackTraceE' filepath='src/stack_trace_table.h' line='74' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNK8tcmalloc15StackTraceTable6Bucket8KeyEqualEmRKNS_10StackTraceE'>
-                <parameter type-id='type-id-1150' is-artificial='yes'/>
+                <parameter type-id='type-id-1144' is-artificial='yes'/>
                 <parameter type-id='type-id-130'/>
-                <parameter type-id='type-id-1144'/>
+                <parameter type-id='type-id-1138'/>
                 <return type-id='type-id-55'/>
               </function-decl>
             </member-function>
@@ -18460,43 +18205,43 @@
           <var-decl name='bucket_total_' type-id='type-id-1' visibility='default' filepath='src/stack_trace_table.h' line='86' column='1'/>
         </data-member>
         <data-member access='private' layout-offset-in-bits='128'>
-          <var-decl name='table_' type-id='type-id-1153' visibility='default' filepath='src/stack_trace_table.h' line='87' column='1'/>
+          <var-decl name='table_' type-id='type-id-1147' visibility='default' filepath='src/stack_trace_table.h' line='87' column='1'/>
         </data-member>
         <member-function access='private' constructor='yes'>
           <function-decl name='StackTraceTable' mangled-name='_ZN8tcmalloc15StackTraceTableC2Ev' filepath='src/stack_trace_table.h' line='50' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN8tcmalloc15StackTraceTableC2Ev'>
-            <parameter type-id='type-id-1151' is-artificial='yes'/>
+            <parameter type-id='type-id-1145' is-artificial='yes'/>
             <return type-id='type-id-56'/>
           </function-decl>
         </member-function>
         <member-function access='private' destructor='yes'>
           <function-decl name='~StackTraceTable' mangled-name='_ZN8tcmalloc15StackTraceTableD2Ev' filepath='src/stack_trace_table.h' line='51' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN8tcmalloc15StackTraceTableD2Ev'>
-            <parameter type-id='type-id-1151' is-artificial='yes'/>
+            <parameter type-id='type-id-1145' is-artificial='yes'/>
             <parameter type-id='type-id-1' is-artificial='yes'/>
             <return type-id='type-id-56'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='AddTrace' mangled-name='_ZN8tcmalloc15StackTraceTable8AddTraceERKNS_10StackTraceE' filepath='src/stack_trace_table.h' line='56' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN8tcmalloc15StackTraceTable8AddTraceERKNS_10StackTraceE'>
-            <parameter type-id='type-id-1151' is-artificial='yes'/>
-            <parameter type-id='type-id-1144'/>
+            <parameter type-id='type-id-1145' is-artificial='yes'/>
+            <parameter type-id='type-id-1138'/>
             <return type-id='type-id-56'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='ReadStackTracesAndClear' mangled-name='_ZN8tcmalloc15StackTraceTable23ReadStackTracesAndClearEv' filepath='src/stack_trace_table.h' line='62' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN8tcmalloc15StackTraceTable23ReadStackTracesAndClearEv'>
-            <parameter type-id='type-id-1151' is-artificial='yes'/>
+            <parameter type-id='type-id-1145' is-artificial='yes'/>
             <return type-id='type-id-120'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='depth_total' mangled-name='_ZNK8tcmalloc15StackTraceTable11depth_totalEv' filepath='src/stack_trace_table.h' line='78' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1147' is-artificial='yes'/>
+            <parameter type-id='type-id-1141' is-artificial='yes'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='bucket_total' mangled-name='_ZNK8tcmalloc15StackTraceTable12bucket_totalEv' filepath='src/stack_trace_table.h' line='79' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1147' is-artificial='yes'/>
+            <parameter type-id='type-id-1141' is-artificial='yes'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
@@ -18536,114 +18281,114 @@
   <abi-instr version='1.0' address-size='64' path='src/static_vars.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-kFgaKP/gperftools-2.4' language='LANG_C_plus_plus'>
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='src/symbolize.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-kFgaKP/gperftools-2.4' language='LANG_C_plus_plus'>
-    <class-decl name='SymbolTable' size-in-bits='448' visibility='default' filepath='src/symbolize.h' line='50' column='1' id='type-id-1154'>
+    <class-decl name='SymbolTable' size-in-bits='448' visibility='default' filepath='src/symbolize.h' line='50' column='1' id='type-id-1148'>
       <member-type access='private'>
-        <typedef-decl name='SymbolMap' type-id='type-id-1156' filepath='src/symbolize.h' line='72' column='1' id='type-id-1155'/>
+        <typedef-decl name='SymbolMap' type-id='type-id-1150' filepath='src/symbolize.h' line='72' column='1' id='type-id-1149'/>
       </member-type>
       <data-member access='private' static='yes'>
         <var-decl name='kSymbolSize' type-id='type-id-112' visibility='default' filepath='src/symbolize.h' line='75' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='0'>
-        <var-decl name='symbolization_table_' type-id='type-id-1155' visibility='default' filepath='src/symbolize.h' line='78' column='1'/>
+        <var-decl name='symbolization_table_' type-id='type-id-1149' visibility='default' filepath='src/symbolize.h' line='78' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='384'>
         <var-decl name='symbol_buffer_' type-id='type-id-90' visibility='default' filepath='src/symbolize.h' line='81' column='1'/>
       </data-member>
       <member-function access='private' constructor='yes'>
         <function-decl name='SymbolTable' filepath='src/symbolize.h' line='52' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-1157' is-artificial='yes'/>
+          <parameter type-id='type-id-1151' is-artificial='yes'/>
           <return type-id='type-id-56'/>
         </function-decl>
       </member-function>
       <member-function access='private' destructor='yes'>
         <function-decl name='~SymbolTable' filepath='src/symbolize.h' line='54' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-1157' is-artificial='yes'/>
+          <parameter type-id='type-id-1151' is-artificial='yes'/>
           <parameter type-id='type-id-1' is-artificial='yes'/>
           <return type-id='type-id-56'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
         <function-decl name='Add' mangled-name='_ZN11SymbolTable3AddEPKv' filepath='src/symbolize.h' line='60' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN11SymbolTable3AddEPKv'>
-          <parameter type-id='type-id-1157' is-artificial='yes'/>
+          <parameter type-id='type-id-1151' is-artificial='yes'/>
           <parameter type-id='type-id-53'/>
           <return type-id='type-id-56'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
         <function-decl name='GetSymbol' mangled-name='_ZN11SymbolTable9GetSymbolEPKv' filepath='src/symbolize.h' line='65' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN11SymbolTable9GetSymbolEPKv'>
-          <parameter type-id='type-id-1157' is-artificial='yes'/>
+          <parameter type-id='type-id-1151' is-artificial='yes'/>
           <parameter type-id='type-id-53'/>
           <return type-id='type-id-52'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
         <function-decl name='Symbolize' mangled-name='_ZN11SymbolTable9SymbolizeEv' filepath='src/symbolize.h' line='69' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN11SymbolTable9SymbolizeEv'>
-          <parameter type-id='type-id-1157' is-artificial='yes'/>
+          <parameter type-id='type-id-1151' is-artificial='yes'/>
           <return type-id='type-id-1'/>
         </function-decl>
       </member-function>
     </class-decl>
-    <pointer-type-def type-id='type-id-1154' size-in-bits='64' id='type-id-1157'/>
-    <pointer-type-def type-id='type-id-1158' size-in-bits='64' id='type-id-1159'/>
-    <pointer-type-def type-id='type-id-1160' size-in-bits='64' id='type-id-1161'/>
-    <qualified-type-def type-id='type-id-1158' const='yes' id='type-id-1162'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1162' size-in-bits='64' id='type-id-1163'/>
-    <pointer-type-def type-id='type-id-1162' size-in-bits='64' id='type-id-1164'/>
-    <qualified-type-def type-id='type-id-1160' const='yes' id='type-id-1165'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1165' size-in-bits='64' id='type-id-1166'/>
-    <pointer-type-def type-id='type-id-1165' size-in-bits='64' id='type-id-1167'/>
-    <reference-type-def kind='lvalue' type-id='type-id-52' size-in-bits='64' id='type-id-1168'/>
-    <qualified-type-def type-id='type-id-1169' const='yes' id='type-id-1170'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1170' size-in-bits='64' id='type-id-1171'/>
-    <pointer-type-def type-id='type-id-1170' size-in-bits='64' id='type-id-1172'/>
-    <qualified-type-def type-id='type-id-1173' const='yes' id='type-id-1174'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1174' size-in-bits='64' id='type-id-1175'/>
-    <pointer-type-def type-id='type-id-1174' size-in-bits='64' id='type-id-1176'/>
-    <qualified-type-def type-id='type-id-1177' const='yes' id='type-id-1178'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1178' size-in-bits='64' id='type-id-1179'/>
-    <pointer-type-def type-id='type-id-1178' size-in-bits='64' id='type-id-1180'/>
-    <qualified-type-def type-id='type-id-1181' const='yes' id='type-id-1182'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1182' size-in-bits='64' id='type-id-1183'/>
-    <pointer-type-def type-id='type-id-1182' size-in-bits='64' id='type-id-1184'/>
+    <pointer-type-def type-id='type-id-1148' size-in-bits='64' id='type-id-1151'/>
+    <pointer-type-def type-id='type-id-1152' size-in-bits='64' id='type-id-1153'/>
+    <pointer-type-def type-id='type-id-1154' size-in-bits='64' id='type-id-1155'/>
+    <qualified-type-def type-id='type-id-1152' const='yes' id='type-id-1156'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1156' size-in-bits='64' id='type-id-1157'/>
+    <pointer-type-def type-id='type-id-1156' size-in-bits='64' id='type-id-1158'/>
+    <qualified-type-def type-id='type-id-1154' const='yes' id='type-id-1159'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1159' size-in-bits='64' id='type-id-1160'/>
+    <pointer-type-def type-id='type-id-1159' size-in-bits='64' id='type-id-1161'/>
+    <reference-type-def kind='lvalue' type-id='type-id-52' size-in-bits='64' id='type-id-1162'/>
+    <qualified-type-def type-id='type-id-1163' const='yes' id='type-id-1164'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1164' size-in-bits='64' id='type-id-1165'/>
+    <pointer-type-def type-id='type-id-1164' size-in-bits='64' id='type-id-1166'/>
+    <qualified-type-def type-id='type-id-1167' const='yes' id='type-id-1168'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1168' size-in-bits='64' id='type-id-1169'/>
+    <pointer-type-def type-id='type-id-1168' size-in-bits='64' id='type-id-1170'/>
+    <qualified-type-def type-id='type-id-1171' const='yes' id='type-id-1172'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1172' size-in-bits='64' id='type-id-1173'/>
+    <pointer-type-def type-id='type-id-1172' size-in-bits='64' id='type-id-1174'/>
+    <qualified-type-def type-id='type-id-1175' const='yes' id='type-id-1176'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1176' size-in-bits='64' id='type-id-1177'/>
+    <pointer-type-def type-id='type-id-1176' size-in-bits='64' id='type-id-1178'/>
+    <qualified-type-def type-id='type-id-1179' const='yes' id='type-id-1180'/>
+    <pointer-type-def type-id='type-id-1180' size-in-bits='64' id='type-id-1181'/>
+    <qualified-type-def type-id='type-id-1182' const='yes' id='type-id-1183'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1183' size-in-bits='64' id='type-id-1184'/>
     <qualified-type-def type-id='type-id-1185' const='yes' id='type-id-1186'/>
-    <pointer-type-def type-id='type-id-1186' size-in-bits='64' id='type-id-1187'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1186' size-in-bits='64' id='type-id-1187'/>
     <qualified-type-def type-id='type-id-1188' const='yes' id='type-id-1189'/>
     <reference-type-def kind='lvalue' type-id='type-id-1189' size-in-bits='64' id='type-id-1190'/>
-    <qualified-type-def type-id='type-id-1191' const='yes' id='type-id-1192'/>
+    <pointer-type-def type-id='type-id-1189' size-in-bits='64' id='type-id-1191'/>
+    <qualified-type-def type-id='type-id-1150' const='yes' id='type-id-1192'/>
     <reference-type-def kind='lvalue' type-id='type-id-1192' size-in-bits='64' id='type-id-1193'/>
-    <qualified-type-def type-id='type-id-1194' const='yes' id='type-id-1195'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1195' size-in-bits='64' id='type-id-1196'/>
-    <pointer-type-def type-id='type-id-1195' size-in-bits='64' id='type-id-1197'/>
-    <qualified-type-def type-id='type-id-1156' const='yes' id='type-id-1198'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1198' size-in-bits='64' id='type-id-1199'/>
-    <pointer-type-def type-id='type-id-1198' size-in-bits='64' id='type-id-1200'/>
-    <qualified-type-def type-id='type-id-1201' const='yes' id='type-id-1202'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1202' size-in-bits='64' id='type-id-1203'/>
-    <pointer-type-def type-id='type-id-1202' size-in-bits='64' id='type-id-1204'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1169' size-in-bits='64' id='type-id-1205'/>
-    <pointer-type-def type-id='type-id-1169' size-in-bits='64' id='type-id-1206'/>
-    <pointer-type-def type-id='type-id-1207' size-in-bits='64' id='type-id-1208'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1173' size-in-bits='64' id='type-id-1209'/>
-    <pointer-type-def type-id='type-id-1173' size-in-bits='64' id='type-id-1210'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1177' size-in-bits='64' id='type-id-1211'/>
-    <pointer-type-def type-id='type-id-1177' size-in-bits='64' id='type-id-1212'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1181' size-in-bits='64' id='type-id-1213'/>
-    <pointer-type-def type-id='type-id-1181' size-in-bits='64' id='type-id-1214'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1188' size-in-bits='64' id='type-id-1215'/>
-    <pointer-type-def type-id='type-id-1188' size-in-bits='64' id='type-id-1216'/>
-    <pointer-type-def type-id='type-id-1191' size-in-bits='64' id='type-id-1217'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1156' size-in-bits='64' id='type-id-1218'/>
-    <pointer-type-def type-id='type-id-1156' size-in-bits='64' id='type-id-1219'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1201' size-in-bits='64' id='type-id-1220'/>
-    <pointer-type-def type-id='type-id-1201' size-in-bits='64' id='type-id-1221'/>
-    <pointer-type-def type-id='type-id-1222' size-in-bits='64' id='type-id-1223'/>
+    <pointer-type-def type-id='type-id-1192' size-in-bits='64' id='type-id-1194'/>
+    <qualified-type-def type-id='type-id-1195' const='yes' id='type-id-1196'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1196' size-in-bits='64' id='type-id-1197'/>
+    <pointer-type-def type-id='type-id-1196' size-in-bits='64' id='type-id-1198'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1163' size-in-bits='64' id='type-id-1199'/>
+    <pointer-type-def type-id='type-id-1163' size-in-bits='64' id='type-id-1200'/>
+    <pointer-type-def type-id='type-id-1201' size-in-bits='64' id='type-id-1202'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1167' size-in-bits='64' id='type-id-1203'/>
+    <pointer-type-def type-id='type-id-1167' size-in-bits='64' id='type-id-1204'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1171' size-in-bits='64' id='type-id-1205'/>
+    <pointer-type-def type-id='type-id-1171' size-in-bits='64' id='type-id-1206'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1175' size-in-bits='64' id='type-id-1207'/>
+    <pointer-type-def type-id='type-id-1175' size-in-bits='64' id='type-id-1208'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1182' size-in-bits='64' id='type-id-1209'/>
+    <pointer-type-def type-id='type-id-1182' size-in-bits='64' id='type-id-1210'/>
+    <pointer-type-def type-id='type-id-1185' size-in-bits='64' id='type-id-1211'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1150' size-in-bits='64' id='type-id-1212'/>
+    <pointer-type-def type-id='type-id-1150' size-in-bits='64' id='type-id-1213'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1195' size-in-bits='64' id='type-id-1214'/>
+    <pointer-type-def type-id='type-id-1195' size-in-bits='64' id='type-id-1215'/>
+    <pointer-type-def type-id='type-id-1216' size-in-bits='64' id='type-id-1217'/>
     <namespace-decl name='std'>
-      <class-decl name='_Rb_tree&lt;const void*, std::pair&lt;const void* const, const char*&gt;, std::_Select1st&lt;std::pair&lt;const void* const, const char*&gt; &gt;, std::less&lt;const void*&gt;, std::allocator&lt;std::pair&lt;const void* const, const char*&gt; &gt; &gt;' size-in-bits='384' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='323' column='1' id='type-id-1169'>
+      <class-decl name='_Rb_tree&lt;const void*, std::pair&lt;const void* const, const char*&gt;, std::_Select1st&lt;std::pair&lt;const void* const, const char*&gt; &gt;, std::less&lt;const void*&gt;, std::allocator&lt;std::pair&lt;const void* const, const char*&gt; &gt; &gt;' size-in-bits='384' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='323' column='1' id='type-id-1163'>
         <member-type access='protected'>
-          <class-decl name='_Rb_tree_impl&lt;std::less&lt;const void*&gt;, false&gt;' size-in-bits='384' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='427' column='1' id='type-id-1207'>
-            <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1188'/>
+          <class-decl name='_Rb_tree_impl&lt;std::less&lt;const void*&gt;, false&gt;' size-in-bits='384' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='427' column='1' id='type-id-1201'>
+            <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1182'/>
             <data-member access='public' layout-offset-in-bits='0'>
-              <var-decl name='_M_key_compare' type-id='type-id-1194' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='428' column='1'/>
+              <var-decl name='_M_key_compare' type-id='type-id-1188' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='428' column='1'/>
             </data-member>
             <data-member access='public' layout-offset-in-bits='64'>
               <var-decl name='_M_header' type-id='type-id-531' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='429' column='1'/>
@@ -18653,181 +18398,181 @@
             </data-member>
             <member-function access='public'>
               <function-decl name='_Rb_tree_impl' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='432' column='1' visibility='default' binding='global' size-in-bits='64'>
-                <parameter type-id='type-id-1208' is-artificial='yes'/>
+                <parameter type-id='type-id-1202' is-artificial='yes'/>
                 <return type-id='type-id-56'/>
               </function-decl>
             </member-function>
             <member-function access='public'>
               <function-decl name='_Rb_tree_impl' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='437' column='1' visibility='default' binding='global' size-in-bits='64'>
-                <parameter type-id='type-id-1208' is-artificial='yes'/>
-                <parameter type-id='type-id-1196'/>
+                <parameter type-id='type-id-1202' is-artificial='yes'/>
                 <parameter type-id='type-id-1190'/>
+                <parameter type-id='type-id-1184'/>
                 <return type-id='type-id-56'/>
               </function-decl>
             </member-function>
             <member-function access='private'>
               <function-decl name='_M_initialize' mangled-name='_ZNSt8_Rb_treeIPKvSt4pairIKS1_PKcESt10_Select1stIS6_ESt4lessIS1_ESaIS6_EE13_Rb_tree_implISA_Lb0EE13_M_initializeEv' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='444' column='1' visibility='default' binding='global' size-in-bits='64'>
-                <parameter type-id='type-id-1208' is-artificial='yes'/>
+                <parameter type-id='type-id-1202' is-artificial='yes'/>
                 <return type-id='type-id-56'/>
               </function-decl>
             </member-function>
           </class-decl>
         </member-type>
         <data-member access='protected' layout-offset-in-bits='0'>
-          <var-decl name='_M_impl' type-id='type-id-1207' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='453' column='1'/>
+          <var-decl name='_M_impl' type-id='type-id-1201' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='453' column='1'/>
         </data-member>
         <member-function access='private'>
           <function-decl name='_M_get_Node_allocator' mangled-name='_ZNSt8_Rb_treeIPKvSt4pairIKS1_PKcESt10_Select1stIS6_ESt4lessIS1_ESaIS6_EE21_M_get_Node_allocatorEv' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='345' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1206' is-artificial='yes'/>
-            <return type-id='type-id-1215'/>
+            <parameter type-id='type-id-1200' is-artificial='yes'/>
+            <return type-id='type-id-1209'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='_M_get_Node_allocator' mangled-name='_ZNKSt8_Rb_treeIPKvSt4pairIKS1_PKcESt10_Select1stIS6_ESt4lessIS1_ESaIS6_EE21_M_get_Node_allocatorEv' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='349' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1172' is-artificial='yes'/>
-            <return type-id='type-id-1190'/>
+            <parameter type-id='type-id-1166' is-artificial='yes'/>
+            <return type-id='type-id-1184'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='get_allocator' mangled-name='_ZNKSt8_Rb_treeIPKvSt4pairIKS1_PKcESt10_Select1stIS6_ESt4lessIS1_ESaIS6_EE13get_allocatorEv' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='353' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1172' is-artificial='yes'/>
-            <return type-id='type-id-1191'/>
+            <parameter type-id='type-id-1166' is-artificial='yes'/>
+            <return type-id='type-id-1185'/>
           </function-decl>
         </member-function>
         <member-function access='protected'>
           <function-decl name='_M_get_node' mangled-name='_ZNSt8_Rb_treeIPKvSt4pairIKS1_PKcESt10_Select1stIS6_ESt4lessIS1_ESaIS6_EE11_M_get_nodeEv' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='358' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1206' is-artificial='yes'/>
-            <return type-id='type-id-1214'/>
+            <parameter type-id='type-id-1200' is-artificial='yes'/>
+            <return type-id='type-id-1208'/>
           </function-decl>
         </member-function>
         <member-function access='protected'>
           <function-decl name='_M_put_node' mangled-name='_ZNSt8_Rb_treeIPKvSt4pairIKS1_PKcESt10_Select1stIS6_ESt4lessIS1_ESaIS6_EE11_M_put_nodeEPSt13_Rb_tree_nodeIS6_E' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='362' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1206' is-artificial='yes'/>
-            <parameter type-id='type-id-1214'/>
+            <parameter type-id='type-id-1200' is-artificial='yes'/>
+            <parameter type-id='type-id-1208'/>
             <return type-id='type-id-56'/>
           </function-decl>
         </member-function>
         <member-function access='protected'>
           <function-decl name='_M_create_node' mangled-name='_ZNSt8_Rb_treeIPKvSt4pairIKS1_PKcESt10_Select1stIS6_ESt4lessIS1_ESaIS6_EE14_M_create_nodeERKS6_' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='367' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1206' is-artificial='yes'/>
-            <parameter type-id='type-id-1203'/>
-            <return type-id='type-id-1214'/>
+            <parameter type-id='type-id-1200' is-artificial='yes'/>
+            <parameter type-id='type-id-1197'/>
+            <return type-id='type-id-1208'/>
           </function-decl>
         </member-function>
         <member-function access='protected'>
           <function-decl name='_M_destroy_node' mangled-name='_ZNSt8_Rb_treeIPKvSt4pairIKS1_PKcESt10_Select1stIS6_ESt4lessIS1_ESaIS6_EE15_M_destroy_nodeEPSt13_Rb_tree_nodeIS6_E' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='381' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1206' is-artificial='yes'/>
-            <parameter type-id='type-id-1214'/>
+            <parameter type-id='type-id-1200' is-artificial='yes'/>
+            <parameter type-id='type-id-1208'/>
             <return type-id='type-id-56'/>
           </function-decl>
         </member-function>
         <member-function access='protected'>
           <function-decl name='_M_clone_node' mangled-name='_ZNSt8_Rb_treeIPKvSt4pairIKS1_PKcESt10_Select1stIS6_ESt4lessIS1_ESaIS6_EE13_M_clone_nodeEPKSt13_Rb_tree_nodeIS6_E' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='414' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1206' is-artificial='yes'/>
-            <parameter type-id='type-id-1184'/>
-            <return type-id='type-id-1214'/>
+            <parameter type-id='type-id-1200' is-artificial='yes'/>
+            <parameter type-id='type-id-1178'/>
+            <return type-id='type-id-1208'/>
           </function-decl>
         </member-function>
         <member-function access='protected'>
           <function-decl name='_M_root' mangled-name='_ZNSt8_Rb_treeIPKvSt4pairIKS1_PKcESt10_Select1stIS6_ESt4lessIS1_ESaIS6_EE7_M_rootEv' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='457' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1206' is-artificial='yes'/>
+            <parameter type-id='type-id-1200' is-artificial='yes'/>
             <return type-id='type-id-651'/>
           </function-decl>
         </member-function>
         <member-function access='protected'>
           <function-decl name='_M_root' mangled-name='_ZNKSt8_Rb_treeIPKvSt4pairIKS1_PKcESt10_Select1stIS6_ESt4lessIS1_ESaIS6_EE7_M_rootEv' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='461' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1172' is-artificial='yes'/>
+            <parameter type-id='type-id-1166' is-artificial='yes'/>
             <return type-id='type-id-533'/>
           </function-decl>
         </member-function>
         <member-function access='protected'>
           <function-decl name='_M_leftmost' mangled-name='_ZNSt8_Rb_treeIPKvSt4pairIKS1_PKcESt10_Select1stIS6_ESt4lessIS1_ESaIS6_EE11_M_leftmostEv' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='465' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1206' is-artificial='yes'/>
+            <parameter type-id='type-id-1200' is-artificial='yes'/>
             <return type-id='type-id-651'/>
           </function-decl>
         </member-function>
         <member-function access='protected'>
           <function-decl name='_M_leftmost' mangled-name='_ZNKSt8_Rb_treeIPKvSt4pairIKS1_PKcESt10_Select1stIS6_ESt4lessIS1_ESaIS6_EE11_M_leftmostEv' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='469' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1172' is-artificial='yes'/>
+            <parameter type-id='type-id-1166' is-artificial='yes'/>
             <return type-id='type-id-533'/>
           </function-decl>
         </member-function>
         <member-function access='protected'>
           <function-decl name='_M_rightmost' mangled-name='_ZNSt8_Rb_treeIPKvSt4pairIKS1_PKcESt10_Select1stIS6_ESt4lessIS1_ESaIS6_EE12_M_rightmostEv' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='473' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1206' is-artificial='yes'/>
+            <parameter type-id='type-id-1200' is-artificial='yes'/>
             <return type-id='type-id-651'/>
           </function-decl>
         </member-function>
         <member-function access='protected'>
           <function-decl name='_M_rightmost' mangled-name='_ZNKSt8_Rb_treeIPKvSt4pairIKS1_PKcESt10_Select1stIS6_ESt4lessIS1_ESaIS6_EE12_M_rightmostEv' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='477' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1172' is-artificial='yes'/>
+            <parameter type-id='type-id-1166' is-artificial='yes'/>
             <return type-id='type-id-533'/>
           </function-decl>
         </member-function>
         <member-function access='protected'>
           <function-decl name='_M_begin' mangled-name='_ZNSt8_Rb_treeIPKvSt4pairIKS1_PKcESt10_Select1stIS6_ESt4lessIS1_ESaIS6_EE8_M_beginEv' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='481' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1206' is-artificial='yes'/>
-            <return type-id='type-id-1214'/>
+            <parameter type-id='type-id-1200' is-artificial='yes'/>
+            <return type-id='type-id-1208'/>
           </function-decl>
         </member-function>
         <member-function access='protected'>
           <function-decl name='_M_begin' mangled-name='_ZNKSt8_Rb_treeIPKvSt4pairIKS1_PKcESt10_Select1stIS6_ESt4lessIS1_ESaIS6_EE8_M_beginEv' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='485' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1172' is-artificial='yes'/>
-            <return type-id='type-id-1184'/>
+            <parameter type-id='type-id-1166' is-artificial='yes'/>
+            <return type-id='type-id-1178'/>
           </function-decl>
         </member-function>
         <member-function access='protected'>
           <function-decl name='_M_end' mangled-name='_ZNSt8_Rb_treeIPKvSt4pairIKS1_PKcESt10_Select1stIS6_ESt4lessIS1_ESaIS6_EE6_M_endEv' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='492' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1206' is-artificial='yes'/>
-            <return type-id='type-id-1214'/>
+            <parameter type-id='type-id-1200' is-artificial='yes'/>
+            <return type-id='type-id-1208'/>
           </function-decl>
         </member-function>
         <member-function access='protected'>
           <function-decl name='_M_end' mangled-name='_ZNKSt8_Rb_treeIPKvSt4pairIKS1_PKcESt10_Select1stIS6_ESt4lessIS1_ESaIS6_EE6_M_endEv' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='496' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1172' is-artificial='yes'/>
-            <return type-id='type-id-1184'/>
+            <parameter type-id='type-id-1166' is-artificial='yes'/>
+            <return type-id='type-id-1178'/>
           </function-decl>
         </member-function>
         <member-function access='protected' static='yes'>
           <function-decl name='_S_value' mangled-name='_ZNSt8_Rb_treeIPKvSt4pairIKS1_PKcESt10_Select1stIS6_ESt4lessIS1_ESaIS6_EE8_S_valueEPKSt13_Rb_tree_nodeIS6_E' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='500' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1184'/>
-            <return type-id='type-id-1203'/>
+            <parameter type-id='type-id-1178'/>
+            <return type-id='type-id-1197'/>
           </function-decl>
         </member-function>
         <member-function access='protected' static='yes'>
           <function-decl name='_S_key' mangled-name='_ZNSt8_Rb_treeIPKvSt4pairIKS1_PKcESt10_Select1stIS6_ESt4lessIS1_ESaIS6_EE6_S_keyEPKSt13_Rb_tree_nodeIS6_E' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='504' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1184'/>
+            <parameter type-id='type-id-1178'/>
             <return type-id='type-id-149'/>
           </function-decl>
         </member-function>
         <member-function access='protected' static='yes'>
           <function-decl name='_S_left' mangled-name='_ZNSt8_Rb_treeIPKvSt4pairIKS1_PKcESt10_Select1stIS6_ESt4lessIS1_ESaIS6_EE7_S_leftEPSt18_Rb_tree_node_base' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='508' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-650'/>
-            <return type-id='type-id-1214'/>
+            <return type-id='type-id-1208'/>
           </function-decl>
         </member-function>
         <member-function access='protected' static='yes'>
           <function-decl name='_S_left' mangled-name='_ZNSt8_Rb_treeIPKvSt4pairIKS1_PKcESt10_Select1stIS6_ESt4lessIS1_ESaIS6_EE7_S_leftEPKSt18_Rb_tree_node_base' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='512' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-533'/>
-            <return type-id='type-id-1184'/>
+            <return type-id='type-id-1178'/>
           </function-decl>
         </member-function>
         <member-function access='protected' static='yes'>
           <function-decl name='_S_right' mangled-name='_ZNSt8_Rb_treeIPKvSt4pairIKS1_PKcESt10_Select1stIS6_ESt4lessIS1_ESaIS6_EE8_S_rightEPSt18_Rb_tree_node_base' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='516' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-650'/>
-            <return type-id='type-id-1214'/>
+            <return type-id='type-id-1208'/>
           </function-decl>
         </member-function>
         <member-function access='protected' static='yes'>
           <function-decl name='_S_right' mangled-name='_ZNSt8_Rb_treeIPKvSt4pairIKS1_PKcESt10_Select1stIS6_ESt4lessIS1_ESaIS6_EE8_S_rightEPKSt18_Rb_tree_node_base' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='520' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-533'/>
-            <return type-id='type-id-1184'/>
+            <return type-id='type-id-1178'/>
           </function-decl>
         </member-function>
         <member-function access='protected' static='yes'>
           <function-decl name='_S_value' mangled-name='_ZNSt8_Rb_treeIPKvSt4pairIKS1_PKcESt10_Select1stIS6_ESt4lessIS1_ESaIS6_EE8_S_valueEPKSt18_Rb_tree_node_base' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='524' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-533'/>
-            <return type-id='type-id-1203'/>
+            <return type-id='type-id-1197'/>
           </function-decl>
         </member-function>
         <member-function access='protected' static='yes'>
@@ -18862,264 +18607,264 @@
         </member-function>
         <member-function access='private'>
           <function-decl name='_M_insert_' mangled-name='_ZNSt8_Rb_treeIPKvSt4pairIKS1_PKcESt10_Select1stIS6_ESt4lessIS1_ESaIS6_EE10_M_insert_EPKSt18_Rb_tree_node_baseSF_RKS6_' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='874' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt8_Rb_treeIPKvSt4pairIKS1_PKcESt10_Select1stIS6_ESt4lessIS1_ESaIS6_EE10_M_insert_EPKSt18_Rb_tree_node_baseSF_RKS6_'>
-            <parameter type-id='type-id-1206' is-artificial='yes'/>
+            <parameter type-id='type-id-1200' is-artificial='yes'/>
             <parameter type-id='type-id-533'/>
             <parameter type-id='type-id-533'/>
-            <parameter type-id='type-id-1203'/>
-            <return type-id='type-id-1177'/>
+            <parameter type-id='type-id-1197'/>
+            <return type-id='type-id-1171'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='_M_insert_lower' mangled-name='_ZNSt8_Rb_treeIPKvSt4pairIKS1_PKcESt10_Select1stIS6_ESt4lessIS1_ESaIS6_EE15_M_insert_lowerEPSt18_Rb_tree_node_baseSE_RKS6_' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='893' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1206' is-artificial='yes'/>
+            <parameter type-id='type-id-1200' is-artificial='yes'/>
             <parameter type-id='type-id-650'/>
             <parameter type-id='type-id-650'/>
-            <parameter type-id='type-id-1203'/>
-            <return type-id='type-id-1177'/>
+            <parameter type-id='type-id-1197'/>
+            <return type-id='type-id-1171'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='_M_insert_equal_lower' mangled-name='_ZNSt8_Rb_treeIPKvSt4pairIKS1_PKcESt10_Select1stIS6_ESt4lessIS1_ESaIS6_EE21_M_insert_equal_lowerERKS6_' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='911' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1206' is-artificial='yes'/>
-            <parameter type-id='type-id-1203'/>
-            <return type-id='type-id-1177'/>
+            <parameter type-id='type-id-1200' is-artificial='yes'/>
+            <parameter type-id='type-id-1197'/>
+            <return type-id='type-id-1171'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='_M_copy' mangled-name='_ZNSt8_Rb_treeIPKvSt4pairIKS1_PKcESt10_Select1stIS6_ESt4lessIS1_ESaIS6_EE7_M_copyEPKSt13_Rb_tree_nodeIS6_EPSE_' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='928' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1206' is-artificial='yes'/>
-            <parameter type-id='type-id-1184'/>
-            <parameter type-id='type-id-1214'/>
-            <return type-id='type-id-1214'/>
+            <parameter type-id='type-id-1200' is-artificial='yes'/>
+            <parameter type-id='type-id-1178'/>
+            <parameter type-id='type-id-1208'/>
+            <return type-id='type-id-1208'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='_M_erase' mangled-name='_ZNSt8_Rb_treeIPKvSt4pairIKS1_PKcESt10_Select1stIS6_ESt4lessIS1_ESaIS6_EE8_M_eraseEPSt13_Rb_tree_nodeIS6_E' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='964' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt8_Rb_treeIPKvSt4pairIKS1_PKcESt10_Select1stIS6_ESt4lessIS1_ESaIS6_EE8_M_eraseEPSt13_Rb_tree_nodeIS6_E'>
-            <parameter type-id='type-id-1206' is-artificial='yes'/>
-            <parameter type-id='type-id-1214'/>
+            <parameter type-id='type-id-1200' is-artificial='yes'/>
+            <parameter type-id='type-id-1208'/>
             <return type-id='type-id-56'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='_M_lower_bound' mangled-name='_ZNSt8_Rb_treeIPKvSt4pairIKS1_PKcESt10_Select1stIS6_ESt4lessIS1_ESaIS6_EE14_M_lower_boundEPSt13_Rb_tree_nodeIS6_ESF_RS3_' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='981' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1206' is-artificial='yes'/>
-            <parameter type-id='type-id-1214'/>
-            <parameter type-id='type-id-1214'/>
+            <parameter type-id='type-id-1200' is-artificial='yes'/>
+            <parameter type-id='type-id-1208'/>
+            <parameter type-id='type-id-1208'/>
             <parameter type-id='type-id-149'/>
-            <return type-id='type-id-1177'/>
+            <return type-id='type-id-1171'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='_M_lower_bound' mangled-name='_ZNKSt8_Rb_treeIPKvSt4pairIKS1_PKcESt10_Select1stIS6_ESt4lessIS1_ESaIS6_EE14_M_lower_boundEPKSt13_Rb_tree_nodeIS6_ESG_RS3_' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='997' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1172' is-artificial='yes'/>
-            <parameter type-id='type-id-1184'/>
-            <parameter type-id='type-id-1184'/>
+            <parameter type-id='type-id-1166' is-artificial='yes'/>
+            <parameter type-id='type-id-1178'/>
+            <parameter type-id='type-id-1178'/>
             <parameter type-id='type-id-149'/>
-            <return type-id='type-id-1173'/>
+            <return type-id='type-id-1167'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='_M_upper_bound' mangled-name='_ZNSt8_Rb_treeIPKvSt4pairIKS1_PKcESt10_Select1stIS6_ESt4lessIS1_ESaIS6_EE14_M_upper_boundEPSt13_Rb_tree_nodeIS6_ESF_RS3_' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='1013' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1206' is-artificial='yes'/>
-            <parameter type-id='type-id-1214'/>
-            <parameter type-id='type-id-1214'/>
+            <parameter type-id='type-id-1200' is-artificial='yes'/>
+            <parameter type-id='type-id-1208'/>
+            <parameter type-id='type-id-1208'/>
             <parameter type-id='type-id-149'/>
-            <return type-id='type-id-1177'/>
+            <return type-id='type-id-1171'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='_M_upper_bound' mangled-name='_ZNKSt8_Rb_treeIPKvSt4pairIKS1_PKcESt10_Select1stIS6_ESt4lessIS1_ESaIS6_EE14_M_upper_boundEPKSt13_Rb_tree_nodeIS6_ESG_RS3_' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='1029' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1172' is-artificial='yes'/>
-            <parameter type-id='type-id-1184'/>
-            <parameter type-id='type-id-1184'/>
+            <parameter type-id='type-id-1166' is-artificial='yes'/>
+            <parameter type-id='type-id-1178'/>
+            <parameter type-id='type-id-1178'/>
             <parameter type-id='type-id-149'/>
-            <return type-id='type-id-1173'/>
+            <return type-id='type-id-1167'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='_Rb_tree' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='591' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1206' is-artificial='yes'/>
+            <parameter type-id='type-id-1200' is-artificial='yes'/>
             <return type-id='type-id-56'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='_Rb_tree' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='593' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1206' is-artificial='yes'/>
-            <parameter type-id='type-id-1196'/>
-            <parameter type-id='type-id-1193'/>
+            <parameter type-id='type-id-1200' is-artificial='yes'/>
+            <parameter type-id='type-id-1190'/>
+            <parameter type-id='type-id-1187'/>
             <return type-id='type-id-56'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='_Rb_tree' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='597' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1206' is-artificial='yes'/>
-            <parameter type-id='type-id-1171'/>
+            <parameter type-id='type-id-1200' is-artificial='yes'/>
+            <parameter type-id='type-id-1165'/>
             <return type-id='type-id-56'/>
           </function-decl>
         </member-function>
         <member-function access='private' destructor='yes'>
           <function-decl name='~_Rb_tree' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='613' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1206' is-artificial='yes'/>
+            <parameter type-id='type-id-1200' is-artificial='yes'/>
             <parameter type-id='type-id-1' is-artificial='yes'/>
             <return type-id='type-id-56'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='operator=' mangled-name='_ZNSt8_Rb_treeIPKvSt4pairIKS1_PKcESt10_Select1stIS6_ESt4lessIS1_ESaIS6_EEaSERKSC_' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='852' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1206' is-artificial='yes'/>
-            <parameter type-id='type-id-1171'/>
-            <return type-id='type-id-1205'/>
+            <parameter type-id='type-id-1200' is-artificial='yes'/>
+            <parameter type-id='type-id-1165'/>
+            <return type-id='type-id-1199'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='key_comp' mangled-name='_ZNKSt8_Rb_treeIPKvSt4pairIKS1_PKcESt10_Select1stIS6_ESt4lessIS1_ESaIS6_EE8key_compEv' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='621' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1172' is-artificial='yes'/>
-            <return type-id='type-id-1194'/>
+            <parameter type-id='type-id-1166' is-artificial='yes'/>
+            <return type-id='type-id-1188'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='begin' mangled-name='_ZNSt8_Rb_treeIPKvSt4pairIKS1_PKcESt10_Select1stIS6_ESt4lessIS1_ESaIS6_EE5beginEv' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='625' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1206' is-artificial='yes'/>
-            <return type-id='type-id-1177'/>
+            <parameter type-id='type-id-1200' is-artificial='yes'/>
+            <return type-id='type-id-1171'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='begin' mangled-name='_ZNKSt8_Rb_treeIPKvSt4pairIKS1_PKcESt10_Select1stIS6_ESt4lessIS1_ESaIS6_EE5beginEv' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='632' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1172' is-artificial='yes'/>
-            <return type-id='type-id-1173'/>
+            <parameter type-id='type-id-1166' is-artificial='yes'/>
+            <return type-id='type-id-1167'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='end' mangled-name='_ZNSt8_Rb_treeIPKvSt4pairIKS1_PKcESt10_Select1stIS6_ESt4lessIS1_ESaIS6_EE3endEv' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='639' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1206' is-artificial='yes'/>
-            <return type-id='type-id-1177'/>
+            <parameter type-id='type-id-1200' is-artificial='yes'/>
+            <return type-id='type-id-1171'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='end' mangled-name='_ZNKSt8_Rb_treeIPKvSt4pairIKS1_PKcESt10_Select1stIS6_ESt4lessIS1_ESaIS6_EE3endEv' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='643' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1172' is-artificial='yes'/>
-            <return type-id='type-id-1173'/>
+            <parameter type-id='type-id-1166' is-artificial='yes'/>
+            <return type-id='type-id-1167'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='rbegin' mangled-name='_ZNSt8_Rb_treeIPKvSt4pairIKS1_PKcESt10_Select1stIS6_ESt4lessIS1_ESaIS6_EE6rbeginEv' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='650' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1206' is-artificial='yes'/>
-            <return type-id='type-id-1224'/>
+            <parameter type-id='type-id-1200' is-artificial='yes'/>
+            <return type-id='type-id-1218'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='rbegin' mangled-name='_ZNKSt8_Rb_treeIPKvSt4pairIKS1_PKcESt10_Select1stIS6_ESt4lessIS1_ESaIS6_EE6rbeginEv' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='654' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1172' is-artificial='yes'/>
-            <return type-id='type-id-1225'/>
+            <parameter type-id='type-id-1166' is-artificial='yes'/>
+            <return type-id='type-id-1219'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='rend' mangled-name='_ZNSt8_Rb_treeIPKvSt4pairIKS1_PKcESt10_Select1stIS6_ESt4lessIS1_ESaIS6_EE4rendEv' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='658' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1206' is-artificial='yes'/>
-            <return type-id='type-id-1224'/>
+            <parameter type-id='type-id-1200' is-artificial='yes'/>
+            <return type-id='type-id-1218'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='rend' mangled-name='_ZNKSt8_Rb_treeIPKvSt4pairIKS1_PKcESt10_Select1stIS6_ESt4lessIS1_ESaIS6_EE4rendEv' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='662' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1172' is-artificial='yes'/>
-            <return type-id='type-id-1225'/>
+            <parameter type-id='type-id-1166' is-artificial='yes'/>
+            <return type-id='type-id-1219'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='empty' mangled-name='_ZNKSt8_Rb_treeIPKvSt4pairIKS1_PKcESt10_Select1stIS6_ESt4lessIS1_ESaIS6_EE5emptyEv' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='666' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1172' is-artificial='yes'/>
+            <parameter type-id='type-id-1166' is-artificial='yes'/>
             <return type-id='type-id-55'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='size' mangled-name='_ZNKSt8_Rb_treeIPKvSt4pairIKS1_PKcESt10_Select1stIS6_ESt4lessIS1_ESaIS6_EE4sizeEv' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='670' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1172' is-artificial='yes'/>
+            <parameter type-id='type-id-1166' is-artificial='yes'/>
             <return type-id='type-id-57'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='max_size' mangled-name='_ZNKSt8_Rb_treeIPKvSt4pairIKS1_PKcESt10_Select1stIS6_ESt4lessIS1_ESaIS6_EE8max_sizeEv' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='674' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1172' is-artificial='yes'/>
+            <parameter type-id='type-id-1166' is-artificial='yes'/>
             <return type-id='type-id-57'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='swap' mangled-name='_ZNSt8_Rb_treeIPKvSt4pairIKS1_PKcESt10_Select1stIS6_ESt4lessIS1_ESaIS6_EE4swapERSC_' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='1106' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1206' is-artificial='yes'/>
-            <parameter type-id='type-id-1205'/>
+            <parameter type-id='type-id-1200' is-artificial='yes'/>
+            <parameter type-id='type-id-1199'/>
             <return type-id='type-id-56'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='_M_insert_unique' mangled-name='_ZNSt8_Rb_treeIPKvSt4pairIKS1_PKcESt10_Select1stIS6_ESt4lessIS1_ESaIS6_EE16_M_insert_uniqueERKS6_' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='1161' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt8_Rb_treeIPKvSt4pairIKS1_PKcESt10_Select1stIS6_ESt4lessIS1_ESaIS6_EE16_M_insert_uniqueERKS6_'>
-            <parameter type-id='type-id-1206' is-artificial='yes'/>
-            <parameter type-id='type-id-1203'/>
-            <return type-id='type-id-1222'/>
+            <parameter type-id='type-id-1200' is-artificial='yes'/>
+            <parameter type-id='type-id-1197'/>
+            <return type-id='type-id-1216'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='_M_insert_equal' mangled-name='_ZNSt8_Rb_treeIPKvSt4pairIKS1_PKcESt10_Select1stIS6_ESt4lessIS1_ESaIS6_EE15_M_insert_equalERKS6_' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='1189' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1206' is-artificial='yes'/>
-            <parameter type-id='type-id-1203'/>
-            <return type-id='type-id-1177'/>
+            <parameter type-id='type-id-1200' is-artificial='yes'/>
+            <parameter type-id='type-id-1197'/>
+            <return type-id='type-id-1171'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='_M_insert_unique_' mangled-name='_ZNSt8_Rb_treeIPKvSt4pairIKS1_PKcESt10_Select1stIS6_ESt4lessIS1_ESaIS6_EE17_M_insert_unique_ESt23_Rb_tree_const_iteratorIS6_ERKS6_' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='1206' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt8_Rb_treeIPKvSt4pairIKS1_PKcESt10_Select1stIS6_ESt4lessIS1_ESaIS6_EE17_M_insert_unique_ESt23_Rb_tree_const_iteratorIS6_ERKS6_'>
-            <parameter type-id='type-id-1206' is-artificial='yes'/>
-            <parameter type-id='type-id-1173'/>
-            <parameter type-id='type-id-1203'/>
-            <return type-id='type-id-1177'/>
+            <parameter type-id='type-id-1200' is-artificial='yes'/>
+            <parameter type-id='type-id-1167'/>
+            <parameter type-id='type-id-1197'/>
+            <return type-id='type-id-1171'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='_M_insert_equal_' mangled-name='_ZNSt8_Rb_treeIPKvSt4pairIKS1_PKcESt10_Select1stIS6_ESt4lessIS1_ESaIS6_EE16_M_insert_equal_ESt23_Rb_tree_const_iteratorIS6_ERKS6_' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='1265' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1206' is-artificial='yes'/>
-            <parameter type-id='type-id-1173'/>
-            <parameter type-id='type-id-1203'/>
-            <return type-id='type-id-1177'/>
+            <parameter type-id='type-id-1200' is-artificial='yes'/>
+            <parameter type-id='type-id-1167'/>
+            <parameter type-id='type-id-1197'/>
+            <return type-id='type-id-1171'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='erase' mangled-name='_ZNSt8_Rb_treeIPKvSt4pairIKS1_PKcESt10_Select1stIS6_ESt4lessIS1_ESaIS6_EE5eraseESt17_Rb_tree_iteratorIS6_E' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='1341' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1206' is-artificial='yes'/>
-            <parameter type-id='type-id-1177'/>
+            <parameter type-id='type-id-1200' is-artificial='yes'/>
+            <parameter type-id='type-id-1171'/>
             <return type-id='type-id-56'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='erase' mangled-name='_ZNSt8_Rb_treeIPKvSt4pairIKS1_PKcESt10_Select1stIS6_ESt4lessIS1_ESaIS6_EE5eraseESt23_Rb_tree_const_iteratorIS6_E' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='1355' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1206' is-artificial='yes'/>
-            <parameter type-id='type-id-1173'/>
+            <parameter type-id='type-id-1200' is-artificial='yes'/>
+            <parameter type-id='type-id-1167'/>
             <return type-id='type-id-56'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='erase' mangled-name='_ZNSt8_Rb_treeIPKvSt4pairIKS1_PKcESt10_Select1stIS6_ESt4lessIS1_ESaIS6_EE5eraseERS3_' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='1369' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1206' is-artificial='yes'/>
+            <parameter type-id='type-id-1200' is-artificial='yes'/>
             <parameter type-id='type-id-149'/>
             <return type-id='type-id-57'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='erase' mangled-name='_ZNSt8_Rb_treeIPKvSt4pairIKS1_PKcESt10_Select1stIS6_ESt4lessIS1_ESaIS6_EE5eraseESt17_Rb_tree_iteratorIS6_ESE_' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='1381' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1206' is-artificial='yes'/>
-            <parameter type-id='type-id-1177'/>
-            <parameter type-id='type-id-1177'/>
+            <parameter type-id='type-id-1200' is-artificial='yes'/>
+            <parameter type-id='type-id-1171'/>
+            <parameter type-id='type-id-1171'/>
             <return type-id='type-id-56'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='erase' mangled-name='_ZNSt8_Rb_treeIPKvSt4pairIKS1_PKcESt10_Select1stIS6_ESt4lessIS1_ESaIS6_EE5eraseESt23_Rb_tree_const_iteratorIS6_ESE_' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='1394' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1206' is-artificial='yes'/>
-            <parameter type-id='type-id-1173'/>
-            <parameter type-id='type-id-1173'/>
+            <parameter type-id='type-id-1200' is-artificial='yes'/>
+            <parameter type-id='type-id-1167'/>
+            <parameter type-id='type-id-1167'/>
             <return type-id='type-id-56'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='erase' mangled-name='_ZNSt8_Rb_treeIPKvSt4pairIKS1_PKcESt10_Select1stIS6_ESt4lessIS1_ESaIS6_EE5eraseEPS3_SD_' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='1407' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1206' is-artificial='yes'/>
+            <parameter type-id='type-id-1200' is-artificial='yes'/>
             <parameter type-id='type-id-150'/>
             <parameter type-id='type-id-150'/>
             <return type-id='type-id-56'/>
@@ -19127,147 +18872,147 @@
         </member-function>
         <member-function access='private'>
           <function-decl name='clear' mangled-name='_ZNSt8_Rb_treeIPKvSt4pairIKS1_PKcESt10_Select1stIS6_ESt4lessIS1_ESaIS6_EE5clearEv' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='724' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1206' is-artificial='yes'/>
+            <parameter type-id='type-id-1200' is-artificial='yes'/>
             <return type-id='type-id-56'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='find' mangled-name='_ZNSt8_Rb_treeIPKvSt4pairIKS1_PKcESt10_Select1stIS6_ESt4lessIS1_ESaIS6_EE4findERS3_' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='1418' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1206' is-artificial='yes'/>
+            <parameter type-id='type-id-1200' is-artificial='yes'/>
             <parameter type-id='type-id-149'/>
-            <return type-id='type-id-1177'/>
+            <return type-id='type-id-1171'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='find' mangled-name='_ZNKSt8_Rb_treeIPKvSt4pairIKS1_PKcESt10_Select1stIS6_ESt4lessIS1_ESaIS6_EE4findERS3_' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='1431' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1172' is-artificial='yes'/>
+            <parameter type-id='type-id-1166' is-artificial='yes'/>
             <parameter type-id='type-id-149'/>
-            <return type-id='type-id-1173'/>
+            <return type-id='type-id-1167'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='count' mangled-name='_ZNKSt8_Rb_treeIPKvSt4pairIKS1_PKcESt10_Select1stIS6_ESt4lessIS1_ESaIS6_EE5countERS3_' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='1443' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1172' is-artificial='yes'/>
+            <parameter type-id='type-id-1166' is-artificial='yes'/>
             <parameter type-id='type-id-149'/>
             <return type-id='type-id-57'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='lower_bound' mangled-name='_ZNSt8_Rb_treeIPKvSt4pairIKS1_PKcESt10_Select1stIS6_ESt4lessIS1_ESaIS6_EE11lower_boundERS3_' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='744' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1206' is-artificial='yes'/>
+            <parameter type-id='type-id-1200' is-artificial='yes'/>
             <parameter type-id='type-id-149'/>
-            <return type-id='type-id-1177'/>
+            <return type-id='type-id-1171'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='lower_bound' mangled-name='_ZNKSt8_Rb_treeIPKvSt4pairIKS1_PKcESt10_Select1stIS6_ESt4lessIS1_ESaIS6_EE11lower_boundERS3_' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='748' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1172' is-artificial='yes'/>
+            <parameter type-id='type-id-1166' is-artificial='yes'/>
             <parameter type-id='type-id-149'/>
-            <return type-id='type-id-1173'/>
+            <return type-id='type-id-1167'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='upper_bound' mangled-name='_ZNSt8_Rb_treeIPKvSt4pairIKS1_PKcESt10_Select1stIS6_ESt4lessIS1_ESaIS6_EE11upper_boundERS3_' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='752' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1206' is-artificial='yes'/>
+            <parameter type-id='type-id-1200' is-artificial='yes'/>
             <parameter type-id='type-id-149'/>
-            <return type-id='type-id-1177'/>
+            <return type-id='type-id-1171'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='upper_bound' mangled-name='_ZNKSt8_Rb_treeIPKvSt4pairIKS1_PKcESt10_Select1stIS6_ESt4lessIS1_ESaIS6_EE11upper_boundERS3_' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='756' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1172' is-artificial='yes'/>
+            <parameter type-id='type-id-1166' is-artificial='yes'/>
             <parameter type-id='type-id-149'/>
-            <return type-id='type-id-1173'/>
+            <return type-id='type-id-1167'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='equal_range' mangled-name='_ZNSt8_Rb_treeIPKvSt4pairIKS1_PKcESt10_Select1stIS6_ESt4lessIS1_ESaIS6_EE11equal_rangeERS3_' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='1047' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1206' is-artificial='yes'/>
+            <parameter type-id='type-id-1200' is-artificial='yes'/>
             <parameter type-id='type-id-149'/>
-            <return type-id='type-id-1226'/>
+            <return type-id='type-id-1220'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='equal_range' mangled-name='_ZNKSt8_Rb_treeIPKvSt4pairIKS1_PKcESt10_Select1stIS6_ESt4lessIS1_ESaIS6_EE11equal_rangeERS3_' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='1078' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1172' is-artificial='yes'/>
+            <parameter type-id='type-id-1166' is-artificial='yes'/>
             <parameter type-id='type-id-149'/>
-            <return type-id='type-id-1227'/>
+            <return type-id='type-id-1221'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='__rb_verify' mangled-name='_ZNKSt8_Rb_treeIPKvSt4pairIKS1_PKcESt10_Select1stIS6_ESt4lessIS1_ESaIS6_EE11__rb_verifyEv' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='1458' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1172' is-artificial='yes'/>
+            <parameter type-id='type-id-1166' is-artificial='yes'/>
             <return type-id='type-id-55'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='allocator&lt;std::_Rb_tree_node&lt;std::pair&lt;const void* const, const char*&gt; &gt; &gt;' size-in-bits='8' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/allocator.h' line='87' column='1' id='type-id-1188'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1158'/>
+      <class-decl name='allocator&lt;std::_Rb_tree_node&lt;std::pair&lt;const void* const, const char*&gt; &gt; &gt;' size-in-bits='8' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/allocator.h' line='87' column='1' id='type-id-1182'>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1152'/>
         <member-function access='private'>
           <function-decl name='allocator' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/allocator.h' line='101' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1216' is-artificial='yes'/>
+            <parameter type-id='type-id-1210' is-artificial='yes'/>
             <return type-id='type-id-56'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='allocator' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/allocator.h' line='103' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1216' is-artificial='yes'/>
-            <parameter type-id='type-id-1190'/>
+            <parameter type-id='type-id-1210' is-artificial='yes'/>
+            <parameter type-id='type-id-1184'/>
             <return type-id='type-id-56'/>
           </function-decl>
         </member-function>
         <member-function access='private' destructor='yes'>
           <function-decl name='~allocator' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/allocator.h' line='109' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1216' is-artificial='yes'/>
+            <parameter type-id='type-id-1210' is-artificial='yes'/>
             <parameter type-id='type-id-1' is-artificial='yes'/>
             <return type-id='type-id-56'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='_Rb_tree_node&lt;std::pair&lt;const void* const, const char*&gt; &gt;' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-1181'/>
-      <class-decl name='less&lt;const void*&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_function.h' line='227' column='1' id='type-id-1194'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1228'/>
+      <class-decl name='_Rb_tree_node&lt;std::pair&lt;const void* const, const char*&gt; &gt;' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-1175'/>
+      <class-decl name='less&lt;const void*&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_function.h' line='227' column='1' id='type-id-1188'>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1222'/>
         <member-function access='public'>
           <function-decl name='operator()' mangled-name='_ZNKSt4lessIPKvEclERKS1_S4_' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_function.h' line='229' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1197' is-artificial='yes'/>
+            <parameter type-id='type-id-1191' is-artificial='yes'/>
             <parameter type-id='type-id-149'/>
             <parameter type-id='type-id-149'/>
             <return type-id='type-id-55'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='binary_function&lt;const void*, const void*, bool&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_function.h' line='113' column='1' id='type-id-1228'/>
-      <class-decl name='allocator&lt;std::pair&lt;const void* const, const char*&gt; &gt;' size-in-bits='8' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/allocator.h' line='87' column='1' id='type-id-1191'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1160'/>
+      <class-decl name='binary_function&lt;const void*, const void*, bool&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_function.h' line='113' column='1' id='type-id-1222'/>
+      <class-decl name='allocator&lt;std::pair&lt;const void* const, const char*&gt; &gt;' size-in-bits='8' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/allocator.h' line='87' column='1' id='type-id-1185'>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1154'/>
         <member-function access='private'>
           <function-decl name='allocator' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/allocator.h' line='101' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1217' is-artificial='yes'/>
+            <parameter type-id='type-id-1211' is-artificial='yes'/>
             <return type-id='type-id-56'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='allocator' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/allocator.h' line='103' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1217' is-artificial='yes'/>
-            <parameter type-id='type-id-1193'/>
+            <parameter type-id='type-id-1211' is-artificial='yes'/>
+            <parameter type-id='type-id-1187'/>
             <return type-id='type-id-56'/>
           </function-decl>
         </member-function>
         <member-function access='private' destructor='yes'>
           <function-decl name='~allocator' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/allocator.h' line='109' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1217' is-artificial='yes'/>
+            <parameter type-id='type-id-1211' is-artificial='yes'/>
             <parameter type-id='type-id-1' is-artificial='yes'/>
             <return type-id='type-id-56'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='allocator&lt;std::_Rb_tree_node&lt;std::pair&lt;const void* const, const char*&gt; &gt; &gt;' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/allocator.h' line='107' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1217' is-artificial='yes'/>
-            <parameter type-id='type-id-1190'/>
+            <parameter type-id='type-id-1211' is-artificial='yes'/>
+            <parameter type-id='type-id-1184'/>
             <return type-id='type-id-56'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='pair&lt;const void* const, const char*&gt;' size-in-bits='128' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_pair.h' line='68' column='1' id='type-id-1201'>
+      <class-decl name='pair&lt;const void* const, const char*&gt;' size-in-bits='128' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_pair.h' line='68' column='1' id='type-id-1195'>
         <data-member access='public' layout-offset-in-bits='0'>
           <var-decl name='first' type-id='type-id-54' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_pair.h' line='72' column='1'/>
         </data-member>
@@ -19276,608 +19021,608 @@
         </data-member>
         <member-function access='public'>
           <function-decl name='pair' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_pair.h' line='79' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1221' is-artificial='yes'/>
+            <parameter type-id='type-id-1215' is-artificial='yes'/>
             <return type-id='type-id-56'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='pair' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_pair.h' line='83' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1221' is-artificial='yes'/>
+            <parameter type-id='type-id-1215' is-artificial='yes'/>
             <parameter type-id='type-id-149'/>
             <parameter type-id='type-id-461'/>
             <return type-id='type-id-56'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='_Rb_tree_iterator&lt;std::pair&lt;const void* const, const char*&gt; &gt;' size-in-bits='64' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='154' column='1' id='type-id-1177'>
+      <class-decl name='_Rb_tree_iterator&lt;std::pair&lt;const void* const, const char*&gt; &gt;' size-in-bits='64' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='154' column='1' id='type-id-1171'>
         <data-member access='public' layout-offset-in-bits='0'>
           <var-decl name='_M_node' type-id='type-id-730' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='219' column='1'/>
         </data-member>
         <member-function access='public'>
           <function-decl name='_Rb_tree_iterator' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='166' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1212' is-artificial='yes'/>
+            <parameter type-id='type-id-1206' is-artificial='yes'/>
             <return type-id='type-id-56'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Rb_tree_iterator' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='170' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1212' is-artificial='yes'/>
-            <parameter type-id='type-id-1214'/>
+            <parameter type-id='type-id-1206' is-artificial='yes'/>
+            <parameter type-id='type-id-1208'/>
             <return type-id='type-id-56'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='operator*' mangled-name='_ZNKSt17_Rb_tree_iteratorISt4pairIKPKvPKcEEdeEv' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='174' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1180' is-artificial='yes'/>
-            <return type-id='type-id-1220'/>
+            <parameter type-id='type-id-1174' is-artificial='yes'/>
+            <return type-id='type-id-1214'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='operator-&gt;' mangled-name='_ZNKSt17_Rb_tree_iteratorISt4pairIKPKvPKcEEptEv' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='178' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1180' is-artificial='yes'/>
-            <return type-id='type-id-1221'/>
+            <parameter type-id='type-id-1174' is-artificial='yes'/>
+            <return type-id='type-id-1215'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='operator++' mangled-name='_ZNSt17_Rb_tree_iteratorISt4pairIKPKvPKcEEppEv' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='182' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1212' is-artificial='yes'/>
-            <return type-id='type-id-1211'/>
+            <parameter type-id='type-id-1206' is-artificial='yes'/>
+            <return type-id='type-id-1205'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='operator++' mangled-name='_ZNSt17_Rb_tree_iteratorISt4pairIKPKvPKcEEppEi' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='189' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1212' is-artificial='yes'/>
+            <parameter type-id='type-id-1206' is-artificial='yes'/>
             <parameter type-id='type-id-1'/>
-            <return type-id='type-id-1177'/>
+            <return type-id='type-id-1171'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='operator--' mangled-name='_ZNSt17_Rb_tree_iteratorISt4pairIKPKvPKcEEmmEv' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='197' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1212' is-artificial='yes'/>
-            <return type-id='type-id-1211'/>
+            <parameter type-id='type-id-1206' is-artificial='yes'/>
+            <return type-id='type-id-1205'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='operator--' mangled-name='_ZNSt17_Rb_tree_iteratorISt4pairIKPKvPKcEEmmEi' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='204' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1212' is-artificial='yes'/>
+            <parameter type-id='type-id-1206' is-artificial='yes'/>
             <parameter type-id='type-id-1'/>
-            <return type-id='type-id-1177'/>
+            <return type-id='type-id-1171'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='operator==' mangled-name='_ZNKSt17_Rb_tree_iteratorISt4pairIKPKvPKcEEeqERKS7_' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='212' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1180' is-artificial='yes'/>
-            <parameter type-id='type-id-1179'/>
+            <parameter type-id='type-id-1174' is-artificial='yes'/>
+            <parameter type-id='type-id-1173'/>
             <return type-id='type-id-55'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='operator!=' mangled-name='_ZNKSt17_Rb_tree_iteratorISt4pairIKPKvPKcEEneERKS7_' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='216' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1180' is-artificial='yes'/>
-            <parameter type-id='type-id-1179'/>
+            <parameter type-id='type-id-1174' is-artificial='yes'/>
+            <parameter type-id='type-id-1173'/>
             <return type-id='type-id-55'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='_Rb_tree_const_iterator&lt;std::pair&lt;const void* const, const char*&gt; &gt;' size-in-bits='64' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='224' column='1' id='type-id-1173'>
+      <class-decl name='_Rb_tree_const_iterator&lt;std::pair&lt;const void* const, const char*&gt; &gt;' size-in-bits='64' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='224' column='1' id='type-id-1167'>
         <data-member access='public' layout-offset-in-bits='0'>
           <var-decl name='_M_node' type-id='type-id-731' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='294' column='1'/>
         </data-member>
         <member-function access='public'>
           <function-decl name='_Rb_tree_const_iterator' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='238' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1210' is-artificial='yes'/>
+            <parameter type-id='type-id-1204' is-artificial='yes'/>
             <return type-id='type-id-56'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Rb_tree_const_iterator' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='242' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1210' is-artificial='yes'/>
-            <parameter type-id='type-id-1184'/>
+            <parameter type-id='type-id-1204' is-artificial='yes'/>
+            <parameter type-id='type-id-1178'/>
             <return type-id='type-id-56'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Rb_tree_const_iterator' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='245' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1210' is-artificial='yes'/>
-            <parameter type-id='type-id-1179'/>
+            <parameter type-id='type-id-1204' is-artificial='yes'/>
+            <parameter type-id='type-id-1173'/>
             <return type-id='type-id-56'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='operator*' mangled-name='_ZNKSt23_Rb_tree_const_iteratorISt4pairIKPKvPKcEEdeEv' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='249' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1176' is-artificial='yes'/>
-            <return type-id='type-id-1203'/>
+            <parameter type-id='type-id-1170' is-artificial='yes'/>
+            <return type-id='type-id-1197'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='operator-&gt;' mangled-name='_ZNKSt23_Rb_tree_const_iteratorISt4pairIKPKvPKcEEptEv' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='253' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1176' is-artificial='yes'/>
-            <return type-id='type-id-1204'/>
+            <parameter type-id='type-id-1170' is-artificial='yes'/>
+            <return type-id='type-id-1198'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='operator++' mangled-name='_ZNSt23_Rb_tree_const_iteratorISt4pairIKPKvPKcEEppEv' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='257' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1210' is-artificial='yes'/>
-            <return type-id='type-id-1209'/>
+            <parameter type-id='type-id-1204' is-artificial='yes'/>
+            <return type-id='type-id-1203'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='operator++' mangled-name='_ZNSt23_Rb_tree_const_iteratorISt4pairIKPKvPKcEEppEi' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='264' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1210' is-artificial='yes'/>
+            <parameter type-id='type-id-1204' is-artificial='yes'/>
             <parameter type-id='type-id-1'/>
-            <return type-id='type-id-1173'/>
+            <return type-id='type-id-1167'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='operator--' mangled-name='_ZNSt23_Rb_tree_const_iteratorISt4pairIKPKvPKcEEmmEv' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='272' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1210' is-artificial='yes'/>
-            <return type-id='type-id-1209'/>
+            <parameter type-id='type-id-1204' is-artificial='yes'/>
+            <return type-id='type-id-1203'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='operator--' mangled-name='_ZNSt23_Rb_tree_const_iteratorISt4pairIKPKvPKcEEmmEi' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='279' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1210' is-artificial='yes'/>
+            <parameter type-id='type-id-1204' is-artificial='yes'/>
             <parameter type-id='type-id-1'/>
-            <return type-id='type-id-1173'/>
+            <return type-id='type-id-1167'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='operator==' mangled-name='_ZNKSt23_Rb_tree_const_iteratorISt4pairIKPKvPKcEEeqERKS7_' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='287' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1176' is-artificial='yes'/>
-            <parameter type-id='type-id-1175'/>
+            <parameter type-id='type-id-1170' is-artificial='yes'/>
+            <parameter type-id='type-id-1169'/>
             <return type-id='type-id-55'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='operator!=' mangled-name='_ZNKSt23_Rb_tree_const_iteratorISt4pairIKPKvPKcEEneERKS7_' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='291' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1176' is-artificial='yes'/>
-            <parameter type-id='type-id-1175'/>
+            <parameter type-id='type-id-1170' is-artificial='yes'/>
+            <parameter type-id='type-id-1169'/>
             <return type-id='type-id-55'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='reverse_iterator&lt;std::_Rb_tree_iterator&lt;std::pair&lt;const void* const, const char*&gt; &gt; &gt;' visibility='default' is-declaration-only='yes' id='type-id-1224'/>
-      <class-decl name='reverse_iterator&lt;std::_Rb_tree_const_iterator&lt;std::pair&lt;const void* const, const char*&gt; &gt; &gt;' visibility='default' is-declaration-only='yes' id='type-id-1225'/>
-      <class-decl name='pair&lt;std::_Rb_tree_iterator&lt;std::pair&lt;const void* const, const char*&gt; &gt;, bool&gt;' size-in-bits='128' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_pair.h' line='68' column='1' id='type-id-1222'>
+      <class-decl name='reverse_iterator&lt;std::_Rb_tree_iterator&lt;std::pair&lt;const void* const, const char*&gt; &gt; &gt;' visibility='default' is-declaration-only='yes' id='type-id-1218'/>
+      <class-decl name='reverse_iterator&lt;std::_Rb_tree_const_iterator&lt;std::pair&lt;const void* const, const char*&gt; &gt; &gt;' visibility='default' is-declaration-only='yes' id='type-id-1219'/>
+      <class-decl name='pair&lt;std::_Rb_tree_iterator&lt;std::pair&lt;const void* const, const char*&gt; &gt;, bool&gt;' size-in-bits='128' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_pair.h' line='68' column='1' id='type-id-1216'>
         <data-member access='public' layout-offset-in-bits='0'>
-          <var-decl name='first' type-id='type-id-1177' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_pair.h' line='72' column='1'/>
+          <var-decl name='first' type-id='type-id-1171' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_pair.h' line='72' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='64'>
           <var-decl name='second' type-id='type-id-55' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_pair.h' line='73' column='1'/>
         </data-member>
         <member-function access='public'>
           <function-decl name='pair' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_pair.h' line='79' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1223' is-artificial='yes'/>
+            <parameter type-id='type-id-1217' is-artificial='yes'/>
             <return type-id='type-id-56'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='pair' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_pair.h' line='83' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1223' is-artificial='yes'/>
-            <parameter type-id='type-id-1179'/>
+            <parameter type-id='type-id-1217' is-artificial='yes'/>
+            <parameter type-id='type-id-1173'/>
             <parameter type-id='type-id-460'/>
             <return type-id='type-id-56'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='pair&lt;std::_Rb_tree_iterator&lt;std::pair&lt;const void* const, const char*&gt; &gt;, std::_Rb_tree_iterator&lt;std::pair&lt;const void* const, const char*&gt; &gt; &gt;' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-1226'/>
-      <class-decl name='pair&lt;std::_Rb_tree_const_iterator&lt;std::pair&lt;const void* const, const char*&gt; &gt;, std::_Rb_tree_const_iterator&lt;std::pair&lt;const void* const, const char*&gt; &gt; &gt;' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-1227'/>
-      <class-decl name='_Select1st&lt;std::pair&lt;const void* const, const char*&gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_function.h' line='482' column='1' id='type-id-1185'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1229'/>
+      <class-decl name='pair&lt;std::_Rb_tree_iterator&lt;std::pair&lt;const void* const, const char*&gt; &gt;, std::_Rb_tree_iterator&lt;std::pair&lt;const void* const, const char*&gt; &gt; &gt;' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-1220'/>
+      <class-decl name='pair&lt;std::_Rb_tree_const_iterator&lt;std::pair&lt;const void* const, const char*&gt; &gt;, std::_Rb_tree_const_iterator&lt;std::pair&lt;const void* const, const char*&gt; &gt; &gt;' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-1221'/>
+      <class-decl name='_Select1st&lt;std::pair&lt;const void* const, const char*&gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_function.h' line='482' column='1' id='type-id-1179'>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1223'/>
         <member-function access='public'>
           <function-decl name='operator()' mangled-name='_ZNKSt10_Select1stISt4pairIKPKvPKcEEclERS6_' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_function.h' line='484' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1187' is-artificial='yes'/>
-            <parameter type-id='type-id-1220'/>
+            <parameter type-id='type-id-1181' is-artificial='yes'/>
+            <parameter type-id='type-id-1214'/>
             <return type-id='type-id-149'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='operator()' mangled-name='_ZNKSt10_Select1stISt4pairIKPKvPKcEEclERKS6_' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_function.h' line='488' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1187' is-artificial='yes'/>
-            <parameter type-id='type-id-1203'/>
+            <parameter type-id='type-id-1181' is-artificial='yes'/>
+            <parameter type-id='type-id-1197'/>
             <return type-id='type-id-149'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='unary_function&lt;std::pair&lt;const void* const, const char*&gt;, const void* const&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_function.h' line='101' column='1' id='type-id-1229'/>
-      <class-decl name='map&lt;const void*, const char*, std::less&lt;const void*&gt;, std::allocator&lt;std::pair&lt;const void* const, const char*&gt; &gt; &gt;' size-in-bits='384' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_map.h' line='87' column='1' id='type-id-1156'>
+      <class-decl name='unary_function&lt;std::pair&lt;const void* const, const char*&gt;, const void* const&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_function.h' line='101' column='1' id='type-id-1223'/>
+      <class-decl name='map&lt;const void*, const char*, std::less&lt;const void*&gt;, std::allocator&lt;std::pair&lt;const void* const, const char*&gt; &gt; &gt;' size-in-bits='384' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_map.h' line='87' column='1' id='type-id-1150'>
         <member-type access='private'>
-          <class-decl name='value_compare' visibility='default' is-declaration-only='yes' id='type-id-1230'/>
+          <class-decl name='value_compare' visibility='default' is-declaration-only='yes' id='type-id-1224'/>
         </member-type>
         <data-member access='private' layout-offset-in-bits='0'>
-          <var-decl name='_M_t' type-id='type-id-1169' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_map.h' line='128' column='1'/>
+          <var-decl name='_M_t' type-id='type-id-1163' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_map.h' line='128' column='1'/>
         </data-member>
         <member-function access='private'>
           <function-decl name='map' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_map.h' line='150' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1219' is-artificial='yes'/>
+            <parameter type-id='type-id-1213' is-artificial='yes'/>
             <return type-id='type-id-56'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='map' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_map.h' line='159' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1219' is-artificial='yes'/>
-            <parameter type-id='type-id-1196'/>
-            <parameter type-id='type-id-1193'/>
+            <parameter type-id='type-id-1213' is-artificial='yes'/>
+            <parameter type-id='type-id-1190'/>
+            <parameter type-id='type-id-1187'/>
             <return type-id='type-id-56'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='map' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_map.h' line='170' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1219' is-artificial='yes'/>
-            <parameter type-id='type-id-1199'/>
+            <parameter type-id='type-id-1213' is-artificial='yes'/>
+            <parameter type-id='type-id-1193'/>
             <return type-id='type-id-56'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='operator=' mangled-name='_ZNSt3mapIPKvPKcSt4lessIS1_ESaISt4pairIKS1_S3_EEEaSERKSA_' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_map.h' line='251' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1219' is-artificial='yes'/>
-            <parameter type-id='type-id-1199'/>
-            <return type-id='type-id-1218'/>
+            <parameter type-id='type-id-1213' is-artificial='yes'/>
+            <parameter type-id='type-id-1193'/>
+            <return type-id='type-id-1212'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='get_allocator' mangled-name='_ZNKSt3mapIPKvPKcSt4lessIS1_ESaISt4pairIKS1_S3_EEE13get_allocatorEv' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_map.h' line='296' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1200' is-artificial='yes'/>
-            <return type-id='type-id-1191'/>
+            <parameter type-id='type-id-1194' is-artificial='yes'/>
+            <return type-id='type-id-1185'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='begin' mangled-name='_ZNSt3mapIPKvPKcSt4lessIS1_ESaISt4pairIKS1_S3_EEE5beginEv' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_map.h' line='306' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1219' is-artificial='yes'/>
-            <return type-id='type-id-1177'/>
+            <parameter type-id='type-id-1213' is-artificial='yes'/>
+            <return type-id='type-id-1171'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='begin' mangled-name='_ZNKSt3mapIPKvPKcSt4lessIS1_ESaISt4pairIKS1_S3_EEE5beginEv' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_map.h' line='315' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1200' is-artificial='yes'/>
-            <return type-id='type-id-1173'/>
+            <parameter type-id='type-id-1194' is-artificial='yes'/>
+            <return type-id='type-id-1167'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='end' mangled-name='_ZNSt3mapIPKvPKcSt4lessIS1_ESaISt4pairIKS1_S3_EEE3endEv' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_map.h' line='324' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1219' is-artificial='yes'/>
-            <return type-id='type-id-1177'/>
+            <parameter type-id='type-id-1213' is-artificial='yes'/>
+            <return type-id='type-id-1171'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='end' mangled-name='_ZNKSt3mapIPKvPKcSt4lessIS1_ESaISt4pairIKS1_S3_EEE3endEv' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_map.h' line='333' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1200' is-artificial='yes'/>
-            <return type-id='type-id-1173'/>
+            <parameter type-id='type-id-1194' is-artificial='yes'/>
+            <return type-id='type-id-1167'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='rbegin' mangled-name='_ZNSt3mapIPKvPKcSt4lessIS1_ESaISt4pairIKS1_S3_EEE6rbeginEv' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_map.h' line='342' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1219' is-artificial='yes'/>
-            <return type-id='type-id-1224'/>
+            <parameter type-id='type-id-1213' is-artificial='yes'/>
+            <return type-id='type-id-1218'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='rbegin' mangled-name='_ZNKSt3mapIPKvPKcSt4lessIS1_ESaISt4pairIKS1_S3_EEE6rbeginEv' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_map.h' line='351' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1200' is-artificial='yes'/>
-            <return type-id='type-id-1225'/>
+            <parameter type-id='type-id-1194' is-artificial='yes'/>
+            <return type-id='type-id-1219'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='rend' mangled-name='_ZNSt3mapIPKvPKcSt4lessIS1_ESaISt4pairIKS1_S3_EEE4rendEv' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_map.h' line='360' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1219' is-artificial='yes'/>
-            <return type-id='type-id-1224'/>
+            <parameter type-id='type-id-1213' is-artificial='yes'/>
+            <return type-id='type-id-1218'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='rend' mangled-name='_ZNKSt3mapIPKvPKcSt4lessIS1_ESaISt4pairIKS1_S3_EEE4rendEv' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_map.h' line='369' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1200' is-artificial='yes'/>
-            <return type-id='type-id-1225'/>
+            <parameter type-id='type-id-1194' is-artificial='yes'/>
+            <return type-id='type-id-1219'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='empty' mangled-name='_ZNKSt3mapIPKvPKcSt4lessIS1_ESaISt4pairIKS1_S3_EEE5emptyEv' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_map.h' line='415' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1200' is-artificial='yes'/>
+            <parameter type-id='type-id-1194' is-artificial='yes'/>
             <return type-id='type-id-55'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='size' mangled-name='_ZNKSt3mapIPKvPKcSt4lessIS1_ESaISt4pairIKS1_S3_EEE4sizeEv' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_map.h' line='420' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1200' is-artificial='yes'/>
+            <parameter type-id='type-id-1194' is-artificial='yes'/>
             <return type-id='type-id-57'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='max_size' mangled-name='_ZNKSt3mapIPKvPKcSt4lessIS1_ESaISt4pairIKS1_S3_EEE8max_sizeEv' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_map.h' line='425' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1200' is-artificial='yes'/>
+            <parameter type-id='type-id-1194' is-artificial='yes'/>
             <return type-id='type-id-57'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='operator[]' mangled-name='_ZNSt3mapIPKvPKcSt4lessIS1_ESaISt4pairIKS1_S3_EEEixERS7_' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_map.h' line='442' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1219' is-artificial='yes'/>
+            <parameter type-id='type-id-1213' is-artificial='yes'/>
             <parameter type-id='type-id-149'/>
-            <return type-id='type-id-1168'/>
+            <return type-id='type-id-1162'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='at' mangled-name='_ZNSt3mapIPKvPKcSt4lessIS1_ESaISt4pairIKS1_S3_EEE2atERS7_' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_map.h' line='464' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1219' is-artificial='yes'/>
+            <parameter type-id='type-id-1213' is-artificial='yes'/>
             <parameter type-id='type-id-149'/>
-            <return type-id='type-id-1168'/>
+            <return type-id='type-id-1162'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='at' mangled-name='_ZNKSt3mapIPKvPKcSt4lessIS1_ESaISt4pairIKS1_S3_EEE2atERS7_' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_map.h' line='473' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1200' is-artificial='yes'/>
+            <parameter type-id='type-id-1194' is-artificial='yes'/>
             <parameter type-id='type-id-149'/>
             <return type-id='type-id-461'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='insert' mangled-name='_ZNSt3mapIPKvPKcSt4lessIS1_ESaISt4pairIKS1_S3_EEE6insertERKS8_' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_map.h' line='499' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1219' is-artificial='yes'/>
-            <parameter type-id='type-id-1203'/>
-            <return type-id='type-id-1222'/>
+            <parameter type-id='type-id-1213' is-artificial='yes'/>
+            <parameter type-id='type-id-1197'/>
+            <return type-id='type-id-1216'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='insert' mangled-name='_ZNSt3mapIPKvPKcSt4lessIS1_ESaISt4pairIKS1_S3_EEE6insertESt17_Rb_tree_iteratorIS8_ERKS8_' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_map.h' line='539' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1219' is-artificial='yes'/>
-            <parameter type-id='type-id-1177'/>
-            <parameter type-id='type-id-1203'/>
-            <return type-id='type-id-1177'/>
+            <parameter type-id='type-id-1213' is-artificial='yes'/>
+            <parameter type-id='type-id-1171'/>
+            <parameter type-id='type-id-1197'/>
+            <return type-id='type-id-1171'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='erase' mangled-name='_ZNSt3mapIPKvPKcSt4lessIS1_ESaISt4pairIKS1_S3_EEE5eraseESt17_Rb_tree_iteratorIS8_E' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_map.h' line='566' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1219' is-artificial='yes'/>
-            <parameter type-id='type-id-1177'/>
+            <parameter type-id='type-id-1213' is-artificial='yes'/>
+            <parameter type-id='type-id-1171'/>
             <return type-id='type-id-56'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='erase' mangled-name='_ZNSt3mapIPKvPKcSt4lessIS1_ESaISt4pairIKS1_S3_EEE5eraseERS7_' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_map.h' line='581' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1219' is-artificial='yes'/>
+            <parameter type-id='type-id-1213' is-artificial='yes'/>
             <parameter type-id='type-id-149'/>
             <return type-id='type-id-57'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='erase' mangled-name='_ZNSt3mapIPKvPKcSt4lessIS1_ESaISt4pairIKS1_S3_EEE5eraseESt17_Rb_tree_iteratorIS8_ESC_' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_map.h' line='596' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1219' is-artificial='yes'/>
-            <parameter type-id='type-id-1177'/>
-            <parameter type-id='type-id-1177'/>
+            <parameter type-id='type-id-1213' is-artificial='yes'/>
+            <parameter type-id='type-id-1171'/>
+            <parameter type-id='type-id-1171'/>
             <return type-id='type-id-56'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='swap' mangled-name='_ZNSt3mapIPKvPKcSt4lessIS1_ESaISt4pairIKS1_S3_EEE4swapERSA_' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_map.h' line='614' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1219' is-artificial='yes'/>
-            <parameter type-id='type-id-1218'/>
+            <parameter type-id='type-id-1213' is-artificial='yes'/>
+            <parameter type-id='type-id-1212'/>
             <return type-id='type-id-56'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='clear' mangled-name='_ZNSt3mapIPKvPKcSt4lessIS1_ESaISt4pairIKS1_S3_EEE5clearEv' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_map.h' line='625' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1219' is-artificial='yes'/>
+            <parameter type-id='type-id-1213' is-artificial='yes'/>
             <return type-id='type-id-56'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='key_comp' mangled-name='_ZNKSt3mapIPKvPKcSt4lessIS1_ESaISt4pairIKS1_S3_EEE8key_compEv' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_map.h' line='634' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1200' is-artificial='yes'/>
-            <return type-id='type-id-1194'/>
+            <parameter type-id='type-id-1194' is-artificial='yes'/>
+            <return type-id='type-id-1188'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='value_comp' mangled-name='_ZNKSt3mapIPKvPKcSt4lessIS1_ESaISt4pairIKS1_S3_EEE10value_compEv' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_map.h' line='642' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1200' is-artificial='yes'/>
-            <return type-id='type-id-1230'/>
+            <parameter type-id='type-id-1194' is-artificial='yes'/>
+            <return type-id='type-id-1224'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='find' mangled-name='_ZNSt3mapIPKvPKcSt4lessIS1_ESaISt4pairIKS1_S3_EEE4findERS7_' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_map.h' line='658' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1219' is-artificial='yes'/>
+            <parameter type-id='type-id-1213' is-artificial='yes'/>
             <parameter type-id='type-id-149'/>
-            <return type-id='type-id-1177'/>
+            <return type-id='type-id-1171'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='find' mangled-name='_ZNKSt3mapIPKvPKcSt4lessIS1_ESaISt4pairIKS1_S3_EEE4findERS7_' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_map.h' line='673' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1200' is-artificial='yes'/>
+            <parameter type-id='type-id-1194' is-artificial='yes'/>
             <parameter type-id='type-id-149'/>
-            <return type-id='type-id-1173'/>
+            <return type-id='type-id-1167'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='count' mangled-name='_ZNKSt3mapIPKvPKcSt4lessIS1_ESaISt4pairIKS1_S3_EEE5countERS7_' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_map.h' line='685' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1200' is-artificial='yes'/>
+            <parameter type-id='type-id-1194' is-artificial='yes'/>
             <parameter type-id='type-id-149'/>
             <return type-id='type-id-57'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='lower_bound' mangled-name='_ZNSt3mapIPKvPKcSt4lessIS1_ESaISt4pairIKS1_S3_EEE11lower_boundERS7_' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_map.h' line='700' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1219' is-artificial='yes'/>
+            <parameter type-id='type-id-1213' is-artificial='yes'/>
             <parameter type-id='type-id-149'/>
-            <return type-id='type-id-1177'/>
+            <return type-id='type-id-1171'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='lower_bound' mangled-name='_ZNKSt3mapIPKvPKcSt4lessIS1_ESaISt4pairIKS1_S3_EEE11lower_boundERS7_' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_map.h' line='715' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1200' is-artificial='yes'/>
+            <parameter type-id='type-id-1194' is-artificial='yes'/>
             <parameter type-id='type-id-149'/>
-            <return type-id='type-id-1173'/>
+            <return type-id='type-id-1167'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='upper_bound' mangled-name='_ZNSt3mapIPKvPKcSt4lessIS1_ESaISt4pairIKS1_S3_EEE11upper_boundERS7_' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_map.h' line='725' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1219' is-artificial='yes'/>
+            <parameter type-id='type-id-1213' is-artificial='yes'/>
             <parameter type-id='type-id-149'/>
-            <return type-id='type-id-1177'/>
+            <return type-id='type-id-1171'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='upper_bound' mangled-name='_ZNKSt3mapIPKvPKcSt4lessIS1_ESaISt4pairIKS1_S3_EEE11upper_boundERS7_' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_map.h' line='735' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1200' is-artificial='yes'/>
+            <parameter type-id='type-id-1194' is-artificial='yes'/>
             <parameter type-id='type-id-149'/>
-            <return type-id='type-id-1173'/>
+            <return type-id='type-id-1167'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='equal_range' mangled-name='_ZNSt3mapIPKvPKcSt4lessIS1_ESaISt4pairIKS1_S3_EEE11equal_rangeERS7_' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_map.h' line='754' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1219' is-artificial='yes'/>
+            <parameter type-id='type-id-1213' is-artificial='yes'/>
             <parameter type-id='type-id-149'/>
-            <return type-id='type-id-1226'/>
+            <return type-id='type-id-1220'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='equal_range' mangled-name='_ZNKSt3mapIPKvPKcSt4lessIS1_ESaISt4pairIKS1_S3_EEE11equal_rangeERS7_' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_map.h' line='773' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1200' is-artificial='yes'/>
+            <parameter type-id='type-id-1194' is-artificial='yes'/>
             <parameter type-id='type-id-149'/>
-            <return type-id='type-id-1227'/>
+            <return type-id='type-id-1221'/>
           </function-decl>
         </member-function>
       </class-decl>
     </namespace-decl>
     <namespace-decl name='__gnu_cxx'>
-      <class-decl name='new_allocator&lt;std::_Rb_tree_node&lt;std::pair&lt;const void* const, const char*&gt; &gt; &gt;' size-in-bits='8' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/ext/new_allocator.h' line='52' column='1' id='type-id-1158'>
+      <class-decl name='new_allocator&lt;std::_Rb_tree_node&lt;std::pair&lt;const void* const, const char*&gt; &gt; &gt;' size-in-bits='8' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/ext/new_allocator.h' line='52' column='1' id='type-id-1152'>
         <member-function access='private'>
           <function-decl name='new_allocator' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/ext/new_allocator.h' line='66' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1159' is-artificial='yes'/>
+            <parameter type-id='type-id-1153' is-artificial='yes'/>
             <return type-id='type-id-56'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='new_allocator' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/ext/new_allocator.h' line='68' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1159' is-artificial='yes'/>
-            <parameter type-id='type-id-1163'/>
+            <parameter type-id='type-id-1153' is-artificial='yes'/>
+            <parameter type-id='type-id-1157'/>
             <return type-id='type-id-56'/>
           </function-decl>
         </member-function>
         <member-function access='private' destructor='yes'>
           <function-decl name='~new_allocator' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/ext/new_allocator.h' line='73' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1159' is-artificial='yes'/>
+            <parameter type-id='type-id-1153' is-artificial='yes'/>
             <parameter type-id='type-id-1' is-artificial='yes'/>
             <return type-id='type-id-56'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='address' mangled-name='_ZNK9__gnu_cxx13new_allocatorISt13_Rb_tree_nodeISt4pairIKPKvPKcEEE7addressERS9_' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/ext/new_allocator.h' line='76' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1164' is-artificial='yes'/>
-            <parameter type-id='type-id-1213'/>
-            <return type-id='type-id-1214'/>
+            <parameter type-id='type-id-1158' is-artificial='yes'/>
+            <parameter type-id='type-id-1207'/>
+            <return type-id='type-id-1208'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='address' mangled-name='_ZNK9__gnu_cxx13new_allocatorISt13_Rb_tree_nodeISt4pairIKPKvPKcEEE7addressERKS9_' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/ext/new_allocator.h' line='79' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1164' is-artificial='yes'/>
-            <parameter type-id='type-id-1183'/>
-            <return type-id='type-id-1184'/>
+            <parameter type-id='type-id-1158' is-artificial='yes'/>
+            <parameter type-id='type-id-1177'/>
+            <return type-id='type-id-1178'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='allocate' mangled-name='_ZN9__gnu_cxx13new_allocatorISt13_Rb_tree_nodeISt4pairIKPKvPKcEEE8allocateEmS4_' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/ext/new_allocator.h' line='84' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1159' is-artificial='yes'/>
+            <parameter type-id='type-id-1153' is-artificial='yes'/>
             <parameter type-id='type-id-5'/>
             <parameter type-id='type-id-53'/>
-            <return type-id='type-id-1214'/>
+            <return type-id='type-id-1208'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='deallocate' mangled-name='_ZN9__gnu_cxx13new_allocatorISt13_Rb_tree_nodeISt4pairIKPKvPKcEEE10deallocateEPS9_m' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/ext/new_allocator.h' line='94' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1159' is-artificial='yes'/>
-            <parameter type-id='type-id-1214'/>
+            <parameter type-id='type-id-1153' is-artificial='yes'/>
+            <parameter type-id='type-id-1208'/>
             <parameter type-id='type-id-5'/>
             <return type-id='type-id-56'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='max_size' mangled-name='_ZNK9__gnu_cxx13new_allocatorISt13_Rb_tree_nodeISt4pairIKPKvPKcEEE8max_sizeEv' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/ext/new_allocator.h' line='98' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1164' is-artificial='yes'/>
+            <parameter type-id='type-id-1158' is-artificial='yes'/>
             <return type-id='type-id-57'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='construct' mangled-name='_ZN9__gnu_cxx13new_allocatorISt13_Rb_tree_nodeISt4pairIKPKvPKcEEE9constructEPS9_RKS9_' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/ext/new_allocator.h' line='104' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1159' is-artificial='yes'/>
-            <parameter type-id='type-id-1214'/>
-            <parameter type-id='type-id-1183'/>
+            <parameter type-id='type-id-1153' is-artificial='yes'/>
+            <parameter type-id='type-id-1208'/>
+            <parameter type-id='type-id-1177'/>
             <return type-id='type-id-56'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='destroy' mangled-name='_ZN9__gnu_cxx13new_allocatorISt13_Rb_tree_nodeISt4pairIKPKvPKcEEE7destroyEPS9_' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/ext/new_allocator.h' line='115' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1159' is-artificial='yes'/>
-            <parameter type-id='type-id-1214'/>
+            <parameter type-id='type-id-1153' is-artificial='yes'/>
+            <parameter type-id='type-id-1208'/>
             <return type-id='type-id-56'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='new_allocator&lt;std::pair&lt;const void* const, const char*&gt; &gt;' size-in-bits='8' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/ext/new_allocator.h' line='52' column='1' id='type-id-1160'>
+      <class-decl name='new_allocator&lt;std::pair&lt;const void* const, const char*&gt; &gt;' size-in-bits='8' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/ext/new_allocator.h' line='52' column='1' id='type-id-1154'>
         <member-function access='private'>
           <function-decl name='new_allocator' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/ext/new_allocator.h' line='66' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1161' is-artificial='yes'/>
+            <parameter type-id='type-id-1155' is-artificial='yes'/>
             <return type-id='type-id-56'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='new_allocator' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/ext/new_allocator.h' line='68' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1161' is-artificial='yes'/>
-            <parameter type-id='type-id-1166'/>
+            <parameter type-id='type-id-1155' is-artificial='yes'/>
+            <parameter type-id='type-id-1160'/>
             <return type-id='type-id-56'/>
           </function-decl>
         </member-function>
         <member-function access='private' destructor='yes'>
           <function-decl name='~new_allocator' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/ext/new_allocator.h' line='73' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1161' is-artificial='yes'/>
+            <parameter type-id='type-id-1155' is-artificial='yes'/>
             <parameter type-id='type-id-1' is-artificial='yes'/>
             <return type-id='type-id-56'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='address' mangled-name='_ZNK9__gnu_cxx13new_allocatorISt4pairIKPKvPKcEE7addressERS7_' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/ext/new_allocator.h' line='76' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1167' is-artificial='yes'/>
-            <parameter type-id='type-id-1220'/>
-            <return type-id='type-id-1221'/>
+            <parameter type-id='type-id-1161' is-artificial='yes'/>
+            <parameter type-id='type-id-1214'/>
+            <return type-id='type-id-1215'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='address' mangled-name='_ZNK9__gnu_cxx13new_allocatorISt4pairIKPKvPKcEE7addressERKS7_' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/ext/new_allocator.h' line='79' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1167' is-artificial='yes'/>
-            <parameter type-id='type-id-1203'/>
-            <return type-id='type-id-1204'/>
+            <parameter type-id='type-id-1161' is-artificial='yes'/>
+            <parameter type-id='type-id-1197'/>
+            <return type-id='type-id-1198'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='allocate' mangled-name='_ZN9__gnu_cxx13new_allocatorISt4pairIKPKvPKcEE8allocateEmS3_' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/ext/new_allocator.h' line='84' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1161' is-artificial='yes'/>
+            <parameter type-id='type-id-1155' is-artificial='yes'/>
             <parameter type-id='type-id-5'/>
             <parameter type-id='type-id-53'/>
-            <return type-id='type-id-1221'/>
+            <return type-id='type-id-1215'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='deallocate' mangled-name='_ZN9__gnu_cxx13new_allocatorISt4pairIKPKvPKcEE10deallocateEPS7_m' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/ext/new_allocator.h' line='94' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1161' is-artificial='yes'/>
-            <parameter type-id='type-id-1221'/>
+            <parameter type-id='type-id-1155' is-artificial='yes'/>
+            <parameter type-id='type-id-1215'/>
             <parameter type-id='type-id-5'/>
             <return type-id='type-id-56'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='max_size' mangled-name='_ZNK9__gnu_cxx13new_allocatorISt4pairIKPKvPKcEE8max_sizeEv' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/ext/new_allocator.h' line='98' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1167' is-artificial='yes'/>
+            <parameter type-id='type-id-1161' is-artificial='yes'/>
             <return type-id='type-id-57'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='construct' mangled-name='_ZN9__gnu_cxx13new_allocatorISt4pairIKPKvPKcEE9constructEPS7_RKS7_' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/ext/new_allocator.h' line='104' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1161' is-artificial='yes'/>
-            <parameter type-id='type-id-1221'/>
-            <parameter type-id='type-id-1203'/>
+            <parameter type-id='type-id-1155' is-artificial='yes'/>
+            <parameter type-id='type-id-1215'/>
+            <parameter type-id='type-id-1197'/>
             <return type-id='type-id-56'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='destroy' mangled-name='_ZN9__gnu_cxx13new_allocatorISt4pairIKPKvPKcEE7destroyEPS7_' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/ext/new_allocator.h' line='115' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1161' is-artificial='yes'/>
-            <parameter type-id='type-id-1221'/>
+            <parameter type-id='type-id-1155' is-artificial='yes'/>
+            <parameter type-id='type-id-1215'/>
             <return type-id='type-id-56'/>
           </function-decl>
         </member-function>
@@ -19895,26 +19640,26 @@
     </namespace-decl>
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='src/system-alloc.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-kFgaKP/gperftools-2.4' language='LANG_C_plus_plus'>
-    <array-type-def dimensions='1' type-id='type-id-902' size-in-bits='128' id='type-id-1231'>
-      <subrange length='2' type-id='type-id-5' id='type-id-1232'/>
+    <array-type-def dimensions='1' type-id='type-id-952' size-in-bits='128' id='type-id-1225'>
+      <subrange length='2' type-id='type-id-5' id='type-id-1226'/>
     </array-type-def>
-    <array-type-def dimensions='1' type-id='type-id-55' size-in-bits='16' id='type-id-1233'>
-      <subrange length='2' type-id='type-id-5' id='type-id-1232'/>
+    <array-type-def dimensions='1' type-id='type-id-55' size-in-bits='16' id='type-id-1227'>
+      <subrange length='2' type-id='type-id-5' id='type-id-1226'/>
     </array-type-def>
-    <array-type-def dimensions='1' type-id='type-id-52' size-in-bits='128' id='type-id-1234'>
-      <subrange length='2' type-id='type-id-5' id='type-id-1232'/>
+    <array-type-def dimensions='1' type-id='type-id-52' size-in-bits='128' id='type-id-1228'>
+      <subrange length='2' type-id='type-id-5' id='type-id-1226'/>
     </array-type-def>
-    <class-decl name='MmapSysAllocator' size-in-bits='64' visibility='default' filepath='src/system-alloc.cc' line='158' column='1' id='type-id-1235'>
-      <base-class access='public' layout-offset-in-bits='0' type-id='type-id-958'/>
+    <class-decl name='MmapSysAllocator' size-in-bits='64' visibility='default' filepath='src/system-alloc.cc' line='158' column='1' id='type-id-1229'>
+      <base-class access='public' layout-offset-in-bits='0' type-id='type-id-951'/>
       <member-function access='private' constructor='yes'>
         <function-decl name='MmapSysAllocator' filepath='src/system-alloc.cc' line='160' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-1236' is-artificial='yes'/>
+          <parameter type-id='type-id-1230' is-artificial='yes'/>
           <return type-id='type-id-56'/>
         </function-decl>
       </member-function>
       <member-function access='private' vtable-offset='2'>
         <function-decl name='Alloc' mangled-name='_ZN16MmapSysAllocator5AllocEmPmm' filepath='src/system-alloc.cc' line='274' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN16MmapSysAllocator5AllocEmPmm'>
-          <parameter type-id='type-id-1236' is-artificial='yes'/>
+          <parameter type-id='type-id-1230' is-artificial='yes'/>
           <parameter type-id='type-id-57'/>
           <parameter type-id='type-id-230'/>
           <parameter type-id='type-id-57'/>
@@ -19922,17 +19667,17 @@
         </function-decl>
       </member-function>
     </class-decl>
-    <class-decl name='SbrkSysAllocator' size-in-bits='64' visibility='default' filepath='src/system-alloc.cc' line='150' column='1' id='type-id-1237'>
-      <base-class access='public' layout-offset-in-bits='0' type-id='type-id-958'/>
+    <class-decl name='SbrkSysAllocator' size-in-bits='64' visibility='default' filepath='src/system-alloc.cc' line='150' column='1' id='type-id-1231'>
+      <base-class access='public' layout-offset-in-bits='0' type-id='type-id-951'/>
       <member-function access='private' constructor='yes'>
         <function-decl name='SbrkSysAllocator' filepath='src/system-alloc.cc' line='152' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-1238' is-artificial='yes'/>
+          <parameter type-id='type-id-1232' is-artificial='yes'/>
           <return type-id='type-id-56'/>
         </function-decl>
       </member-function>
       <member-function access='private' vtable-offset='2'>
         <function-decl name='Alloc' mangled-name='_ZN16SbrkSysAllocator5AllocEmPmm' filepath='src/system-alloc.cc' line='203' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN16SbrkSysAllocator5AllocEmPmm'>
-          <parameter type-id='type-id-1238' is-artificial='yes'/>
+          <parameter type-id='type-id-1232' is-artificial='yes'/>
           <parameter type-id='type-id-57'/>
           <parameter type-id='type-id-230'/>
           <parameter type-id='type-id-57'/>
@@ -19940,38 +19685,38 @@
         </function-decl>
       </member-function>
     </class-decl>
-    <class-decl name='DefaultSysAllocator' size-in-bits='384' visibility='default' filepath='src/system-alloc.cc' line='173' column='1' id='type-id-1239'>
-      <base-class access='public' layout-offset-in-bits='0' type-id='type-id-958'/>
+    <class-decl name='DefaultSysAllocator' size-in-bits='384' visibility='default' filepath='src/system-alloc.cc' line='173' column='1' id='type-id-1233'>
+      <base-class access='public' layout-offset-in-bits='0' type-id='type-id-951'/>
       <data-member access='private' static='yes'>
         <var-decl name='kMaxAllocators' type-id='type-id-112' visibility='default' filepath='src/system-alloc.cc' line='193' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='64'>
-        <var-decl name='failed_' type-id='type-id-1233' visibility='default' filepath='src/system-alloc.cc' line='194' column='1'/>
+        <var-decl name='failed_' type-id='type-id-1227' visibility='default' filepath='src/system-alloc.cc' line='194' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='128'>
-        <var-decl name='allocs_' type-id='type-id-1231' visibility='default' filepath='src/system-alloc.cc' line='195' column='1'/>
+        <var-decl name='allocs_' type-id='type-id-1225' visibility='default' filepath='src/system-alloc.cc' line='195' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='256'>
-        <var-decl name='names_' type-id='type-id-1234' visibility='default' filepath='src/system-alloc.cc' line='196' column='1'/>
+        <var-decl name='names_' type-id='type-id-1228' visibility='default' filepath='src/system-alloc.cc' line='196' column='1'/>
       </data-member>
       <member-function access='private' constructor='yes'>
         <function-decl name='DefaultSysAllocator' filepath='src/system-alloc.cc' line='175' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-1240' is-artificial='yes'/>
+          <parameter type-id='type-id-1234' is-artificial='yes'/>
           <return type-id='type-id-56'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
         <function-decl name='SetChildAllocator' mangled-name='_ZN19DefaultSysAllocator17SetChildAllocatorEP12SysAllocatorjPKc' filepath='src/system-alloc.cc' line='182' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-1240' is-artificial='yes'/>
-          <parameter type-id='type-id-902'/>
-          <parameter type-id='type-id-1123'/>
+          <parameter type-id='type-id-1234' is-artificial='yes'/>
+          <parameter type-id='type-id-952'/>
+          <parameter type-id='type-id-1117'/>
           <parameter type-id='type-id-52'/>
           <return type-id='type-id-56'/>
         </function-decl>
       </member-function>
       <member-function access='private' vtable-offset='2'>
         <function-decl name='Alloc' mangled-name='_ZN19DefaultSysAllocator5AllocEmPmm' filepath='src/system-alloc.cc' line='431' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN19DefaultSysAllocator5AllocEmPmm'>
-          <parameter type-id='type-id-1240' is-artificial='yes'/>
+          <parameter type-id='type-id-1234' is-artificial='yes'/>
           <parameter type-id='type-id-57'/>
           <parameter type-id='type-id-230'/>
           <parameter type-id='type-id-57'/>
@@ -19979,17 +19724,17 @@
         </function-decl>
       </member-function>
     </class-decl>
-    <class-decl name='DevMemSysAllocator' size-in-bits='64' visibility='default' filepath='src/system-alloc.cc' line='166' column='1' id='type-id-1241'>
-      <base-class access='public' layout-offset-in-bits='0' type-id='type-id-958'/>
+    <class-decl name='DevMemSysAllocator' size-in-bits='64' visibility='default' filepath='src/system-alloc.cc' line='166' column='1' id='type-id-1235'>
+      <base-class access='public' layout-offset-in-bits='0' type-id='type-id-951'/>
       <member-function access='private' constructor='yes'>
         <function-decl name='DevMemSysAllocator' filepath='src/system-alloc.cc' line='168' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-1242' is-artificial='yes'/>
+          <parameter type-id='type-id-1236' is-artificial='yes'/>
           <return type-id='type-id-56'/>
         </function-decl>
       </member-function>
       <member-function access='private' vtable-offset='2'>
         <function-decl name='Alloc' mangled-name='_ZN18DevMemSysAllocator5AllocEmPmm' filepath='src/system-alloc.cc' line='342' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN18DevMemSysAllocator5AllocEmPmm'>
-          <parameter type-id='type-id-1242' is-artificial='yes'/>
+          <parameter type-id='type-id-1236' is-artificial='yes'/>
           <parameter type-id='type-id-57'/>
           <parameter type-id='type-id-230'/>
           <parameter type-id='type-id-57'/>
@@ -19997,10 +19742,10 @@
         </function-decl>
       </member-function>
     </class-decl>
-    <pointer-type-def type-id='type-id-1239' size-in-bits='64' id='type-id-1240'/>
-    <pointer-type-def type-id='type-id-1241' size-in-bits='64' id='type-id-1242'/>
+    <pointer-type-def type-id='type-id-1233' size-in-bits='64' id='type-id-1234'/>
     <pointer-type-def type-id='type-id-1235' size-in-bits='64' id='type-id-1236'/>
-    <pointer-type-def type-id='type-id-1237' size-in-bits='64' id='type-id-1238'/>
+    <pointer-type-def type-id='type-id-1229' size-in-bits='64' id='type-id-1230'/>
+    <pointer-type-def type-id='type-id-1231' size-in-bits='64' id='type-id-1232'/>
     <namespace-decl name='FLAG__namespace_do_not_use_directly_use_DECLARE_int32_instead'>
       <var-decl name='FLAGS_malloc_devmem_start' type-id='type-id-65' mangled-name='_ZN61FLAG__namespace_do_not_use_directly_use_DECLARE_int32_instead25FLAGS_malloc_devmem_startE' visibility='default' filepath='src/system-alloc.cc' line='130' column='1' elf-symbol-id='_ZN61FLAG__namespace_do_not_use_directly_use_DECLARE_int32_instead25FLAGS_malloc_devmem_startE'/>
       <var-decl name='FLAGS_nomalloc_devmem_start' type-id='type-id-66' mangled-name='_ZN61FLAG__namespace_do_not_use_directly_use_DECLARE_int32_instead27FLAGS_nomalloc_devmem_startE' visibility='default' filepath='src/system-alloc.cc' line='133' column='1' elf-symbol-id='_ZN61FLAG__namespace_do_not_use_directly_use_DECLARE_int32_instead27FLAGS_nomalloc_devmem_startE'/>
@@ -20016,8 +19761,8 @@
       <var-decl name='FLAGS_nomalloc_disable_memory_release' type-id='type-id-66' mangled-name='_ZN60FLAG__namespace_do_not_use_directly_use_DECLARE_bool_instead37FLAGS_nomalloc_disable_memory_releaseE' visibility='default' filepath='src/system-alloc.cc' line='147' column='1' elf-symbol-id='_ZN60FLAG__namespace_do_not_use_directly_use_DECLARE_bool_instead37FLAGS_nomalloc_disable_memory_releaseE'/>
     </namespace-decl>
     <function-decl name='tc_get_sysalloc_override' mangled-name='_Z24tc_get_sysalloc_overrideP12SysAllocator' filepath='src/system-alloc.cc' line='451' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z24tc_get_sysalloc_overrideP12SysAllocator'>
-      <parameter type-id='type-id-902' name='def' filepath='src/system-alloc.cc' line='451' column='1'/>
-      <return type-id='type-id-902'/>
+      <parameter type-id='type-id-952' name='def' filepath='src/system-alloc.cc' line='451' column='1'/>
+      <return type-id='type-id-952'/>
     </function-decl>
     <function-decl name='InitSystemAllocators' mangled-name='_Z20InitSystemAllocatorsv' filepath='src/system-alloc.cc' line='457' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z20InitSystemAllocatorsv'>
       <return type-id='type-id-56'/>
@@ -20038,33 +19783,33 @@
       <parameter type-id='type-id-57' name='alignment' filepath='src/system-alloc.cc' line='481' column='1'/>
       <return type-id='type-id-53'/>
     </function-decl>
-    <var-decl name='sys_alloc' type-id='type-id-902' mangled-name='sys_alloc' visibility='default' filepath='src/system-alloc.cc' line='124' column='1' elf-symbol-id='sys_alloc'/>
+    <var-decl name='sys_alloc' type-id='type-id-952' mangled-name='sys_alloc' visibility='default' filepath='src/system-alloc.cc' line='124' column='1' elf-symbol-id='sys_alloc'/>
     <var-decl name='TCMalloc_SystemTaken' type-id='type-id-57' mangled-name='TCMalloc_SystemTaken' visibility='default' filepath='src/system-alloc.cc' line='127' column='1' elf-symbol-id='TCMalloc_SystemTaken'/>
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='src/tcmalloc.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-kFgaKP/gperftools-2.4' language='LANG_C_plus_plus'>
     <array-type-def dimensions='1' type-id='type-id-781' size-in-bits='512' id='type-id-782'>
-      <subrange length='8' type-id='type-id-5' id='type-id-1243'/>
+      <subrange length='8' type-id='type-id-5' id='type-id-1237'/>
     </array-type-def>
     <type-decl name='bool' size-in-bits='8' id='type-id-55'/>
     <type-decl name='char' size-in-bits='8' id='type-id-66'/>
-    <array-type-def dimensions='1' type-id='type-id-66' size-in-bits='8' id='type-id-1244'>
-      <subrange length='1' type-id='type-id-5' id='type-id-1245'/>
+    <array-type-def dimensions='1' type-id='type-id-66' size-in-bits='8' id='type-id-1238'>
+      <subrange length='1' type-id='type-id-5' id='type-id-1239'/>
     </array-type-def>
-    <array-type-def dimensions='1' type-id='type-id-66' size-in-bits='160' id='type-id-1246'>
-      <subrange length='20' type-id='type-id-5' id='type-id-960'/>
+    <array-type-def dimensions='1' type-id='type-id-66' size-in-bits='160' id='type-id-1240'>
+      <subrange length='20' type-id='type-id-5' id='type-id-954'/>
     </array-type-def>
     <array-type-def dimensions='1' type-id='type-id-66' size-in-bits='384' id='type-id-168'>
-      <subrange length='48' type-id='type-id-5' id='type-id-1247'/>
+      <subrange length='48' type-id='type-id-5' id='type-id-1241'/>
     </array-type-def>
-    <array-type-def dimensions='1' type-id='type-id-66' size-in-bits='32' id='type-id-1248'>
+    <array-type-def dimensions='1' type-id='type-id-66' size-in-bits='32' id='type-id-1242'>
       <subrange length='4' type-id='type-id-5' id='type-id-126'/>
     </array-type-def>
-    <class-decl name='typedef __va_list_tag __va_list_tag' size-in-bits='192' is-struct='yes' visibility='default' id='type-id-1249'>
+    <class-decl name='typedef __va_list_tag __va_list_tag' size-in-bits='192' is-struct='yes' visibility='default' id='type-id-1243'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='gp_offset' type-id='type-id-1123' visibility='default'/>
+        <var-decl name='gp_offset' type-id='type-id-1117' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='32'>
-        <var-decl name='fp_offset' type-id='type-id-1123' visibility='default'/>
+        <var-decl name='fp_offset' type-id='type-id-1117' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
         <var-decl name='overflow_arg_area' type-id='type-id-53' visibility='default'/>
@@ -20074,69 +19819,69 @@
       </data-member>
     </class-decl>
     <type-decl name='double' size-in-bits='64' id='type-id-2'/>
-    <array-type-def dimensions='1' type-id='type-id-2' size-in-bits='65536' id='type-id-1250'>
-      <subrange length='1024' type-id='type-id-5' id='type-id-1084'/>
+    <array-type-def dimensions='1' type-id='type-id-2' size-in-bits='65536' id='type-id-1244'>
+      <subrange length='1024' type-id='type-id-5' id='type-id-1078'/>
     </array-type-def>
-    <type-decl name='float' size-in-bits='32' id='type-id-1251'/>
+    <type-decl name='float' size-in-bits='32' id='type-id-1245'/>
     <type-decl name='int' size-in-bits='32' id='type-id-1'/>
-    <array-type-def dimensions='1' type-id='type-id-76' size-in-bits='8192' id='type-id-1252'>
-      <subrange length='128' type-id='type-id-5' id='type-id-1253'/>
+    <array-type-def dimensions='1' type-id='type-id-76' size-in-bits='8192' id='type-id-1246'>
+      <subrange length='128' type-id='type-id-5' id='type-id-1247'/>
     </array-type-def>
-    <array-type-def dimensions='1' type-id='type-id-1' size-in-bits='2816' id='type-id-1254'>
-      <subrange length='88' type-id='type-id-5' id='type-id-1255'/>
+    <array-type-def dimensions='1' type-id='type-id-1' size-in-bits='2816' id='type-id-1248'>
+      <subrange length='88' type-id='type-id-5' id='type-id-1249'/>
     </array-type-def>
-    <type-decl name='long double' size-in-bits='128' id='type-id-1256'/>
+    <type-decl name='long double' size-in-bits='128' id='type-id-1250'/>
     <type-decl name='long int' size-in-bits='64' id='type-id-285'/>
-    <type-decl name='long long int' size-in-bits='64' id='type-id-1257'/>
-    <type-decl name='long long unsigned int' size-in-bits='64' id='type-id-1258'/>
-    <type-decl name='signed char' size-in-bits='8' id='type-id-1259'/>
-    <array-type-def dimensions='1' type-id='type-id-57' size-in-bits='5632' id='type-id-1260'>
-      <subrange length='88' type-id='type-id-5' id='type-id-1255'/>
+    <type-decl name='long long int' size-in-bits='64' id='type-id-1251'/>
+    <type-decl name='long long unsigned int' size-in-bits='64' id='type-id-1252'/>
+    <type-decl name='signed char' size-in-bits='8' id='type-id-1253'/>
+    <array-type-def dimensions='1' type-id='type-id-57' size-in-bits='5632' id='type-id-1254'>
+      <subrange length='88' type-id='type-id-5' id='type-id-1249'/>
     </array-type-def>
-    <array-type-def dimensions='1' type-id='type-id-1261' size-in-bits='8192' id='type-id-1262'>
-      <subrange length='64' type-id='type-id-5' id='type-id-1080'/>
+    <array-type-def dimensions='1' type-id='type-id-1255' size-in-bits='8192' id='type-id-1256'>
+      <subrange length='64' type-id='type-id-5' id='type-id-1074'/>
     </array-type-def>
-    <array-type-def dimensions='1' type-id='type-id-1263' size-in-bits='856064' id='type-id-1264'>
-      <subrange length='88' type-id='type-id-5' id='type-id-1255'/>
+    <array-type-def dimensions='1' type-id='type-id-1257' size-in-bits='856064' id='type-id-1258'>
+      <subrange length='88' type-id='type-id-5' id='type-id-1249'/>
     </array-type-def>
-    <array-type-def dimensions='1' type-id='type-id-1265' size-in-bits='98304' id='type-id-1266'>
-      <subrange length='128' type-id='type-id-5' id='type-id-1253'/>
+    <array-type-def dimensions='1' type-id='type-id-1259' size-in-bits='98304' id='type-id-1260'>
+      <subrange length='128' type-id='type-id-5' id='type-id-1247'/>
     </array-type-def>
-    <array-type-def dimensions='1' type-id='type-id-1267' size-in-bits='16896' id='type-id-1268'>
-      <subrange length='88' type-id='type-id-5' id='type-id-1255'/>
+    <array-type-def dimensions='1' type-id='type-id-1261' size-in-bits='16896' id='type-id-1262'>
+      <subrange length='88' type-id='type-id-5' id='type-id-1249'/>
     </array-type-def>
     <type-decl name='unnamed-enum-underlying-type' is-anonymous='yes' size-in-bits='32' alignment-in-bits='32' id='type-id-133'/>
     <type-decl name='unsigned char' size-in-bits='8' id='type-id-3'/>
-    <array-type-def dimensions='1' type-id='type-id-3' size-in-bits='17352' id='type-id-1269'>
-      <subrange length='2169' type-id='type-id-5' id='type-id-1270'/>
+    <array-type-def dimensions='1' type-id='type-id-3' size-in-bits='17352' id='type-id-1263'>
+      <subrange length='2169' type-id='type-id-5' id='type-id-1264'/>
     </array-type-def>
-    <type-decl name='unsigned int' size-in-bits='32' id='type-id-1123'/>
+    <type-decl name='unsigned int' size-in-bits='32' id='type-id-1117'/>
     <type-decl name='unsigned long int' size-in-bits='64' id='type-id-5'/>
     <type-decl name='unsigned short int' size-in-bits='16' id='type-id-14'/>
     <type-decl name='void' id='type-id-56'/>
-    <array-type-def dimensions='1' type-id='type-id-53' size-in-bits='1984' id='type-id-1271'>
-      <subrange length='31' type-id='type-id-5' id='type-id-1272'/>
+    <array-type-def dimensions='1' type-id='type-id-53' size-in-bits='1984' id='type-id-1265'>
+      <subrange length='31' type-id='type-id-5' id='type-id-1266'/>
     </array-type-def>
-    <array-type-def dimensions='1' type-id='type-id-1273' size-in-bits='4194304' id='type-id-1274'>
-      <subrange length='65536' type-id='type-id-5' id='type-id-1275'/>
+    <array-type-def dimensions='1' type-id='type-id-1267' size-in-bits='4194304' id='type-id-1268'>
+      <subrange length='65536' type-id='type-id-5' id='type-id-1269'/>
     </array-type-def>
-    <type-decl name='wchar_t' size-in-bits='32' id='type-id-1276'/>
+    <type-decl name='wchar_t' size-in-bits='32' id='type-id-1270'/>
     <typedef-decl name='size_t' type-id='type-id-5' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/include/stddef.h' line='211' column='1' id='type-id-57'/>
-    <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-1277'>
+    <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-1271'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='quot' type-id='type-id-1257' visibility='default' filepath='/usr/include/stdlib.h' line='120' column='1'/>
+        <var-decl name='quot' type-id='type-id-1251' visibility='default' filepath='/usr/include/stdlib.h' line='120' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
-        <var-decl name='rem' type-id='type-id-1257' visibility='default' filepath='/usr/include/stdlib.h' line='121' column='1'/>
+        <var-decl name='rem' type-id='type-id-1251' visibility='default' filepath='/usr/include/stdlib.h' line='121' column='1'/>
       </data-member>
     </class-decl>
     <typedef-decl name='ptrdiff_t' type-id='type-id-285' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/include/stddef.h' line='149' column='1' id='type-id-186'/>
-    <class-decl name='TCMalloc_PageMap3&lt;35&gt;' size-in-bits='128' visibility='default' filepath='src/pagemap.h' line='209' column='1' id='type-id-1278'>
+    <class-decl name='TCMalloc_PageMap3&lt;35&gt;' size-in-bits='128' visibility='default' filepath='src/pagemap.h' line='209' column='1' id='type-id-1272'>
       <member-type access='private'>
-        <class-decl name='Node' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-1279'/>
+        <class-decl name='Node' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-1273'/>
       </member-type>
       <member-type access='private'>
-        <class-decl name='Leaf' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-1280'/>
+        <class-decl name='Leaf' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-1274'/>
       </member-type>
       <data-member access='private' static='yes'>
         <var-decl name='INTERIOR_BITS' type-id='type-id-112' visibility='default' filepath='src/pagemap.h' line='212' column='1'/>
@@ -20151,34 +19896,34 @@
         <var-decl name='LEAF_LENGTH' type-id='type-id-112' visibility='default' filepath='src/pagemap.h' line='217' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='0'>
-        <var-decl name='root_' type-id='type-id-1281' visibility='default' filepath='src/pagemap.h' line='229' column='1'/>
+        <var-decl name='root_' type-id='type-id-1275' visibility='default' filepath='src/pagemap.h' line='229' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='64'>
         <var-decl name='allocator_' type-id='type-id-267' visibility='default' filepath='src/pagemap.h' line='230' column='1'/>
       </data-member>
       <member-function access='private'>
         <function-decl name='NewNode' mangled-name='_ZN17TCMalloc_PageMap3ILi35EE7NewNodeEv' filepath='src/pagemap.h' line='232' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-1282' is-artificial='yes'/>
-          <return type-id='type-id-1281'/>
+          <parameter type-id='type-id-1276' is-artificial='yes'/>
+          <return type-id='type-id-1275'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
         <function-decl name='TCMalloc_PageMap3' filepath='src/pagemap.h' line='243' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-1282' is-artificial='yes'/>
+          <parameter type-id='type-id-1276' is-artificial='yes'/>
           <parameter type-id='type-id-267'/>
           <return type-id='type-id-56'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
         <function-decl name='get' mangled-name='_ZNK17TCMalloc_PageMap3ILi35EE3getEm' filepath='src/pagemap.h' line='248' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-1283' is-artificial='yes'/>
+          <parameter type-id='type-id-1277' is-artificial='yes'/>
           <parameter type-id='type-id-5'/>
           <return type-id='type-id-53'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
         <function-decl name='set' mangled-name='_ZN17TCMalloc_PageMap3ILi35EE3setEmPv' filepath='src/pagemap.h' line='259' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-1282' is-artificial='yes'/>
+          <parameter type-id='type-id-1276' is-artificial='yes'/>
           <parameter type-id='type-id-5'/>
           <parameter type-id='type-id-53'/>
           <return type-id='type-id-56'/>
@@ -20186,7 +19931,7 @@
       </member-function>
       <member-function access='private'>
         <function-decl name='Ensure' mangled-name='_ZN17TCMalloc_PageMap3ILi35EE6EnsureEmm' filepath='src/pagemap.h' line='267' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-1282' is-artificial='yes'/>
+          <parameter type-id='type-id-1276' is-artificial='yes'/>
           <parameter type-id='type-id-5'/>
           <parameter type-id='type-id-5'/>
           <return type-id='type-id-55'/>
@@ -20194,20 +19939,20 @@
       </member-function>
       <member-function access='private'>
         <function-decl name='PreallocateMoreMemory' mangled-name='_ZN17TCMalloc_PageMap3ILi35EE21PreallocateMoreMemoryEv' filepath='src/pagemap.h' line='297' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-1282' is-artificial='yes'/>
+          <parameter type-id='type-id-1276' is-artificial='yes'/>
           <return type-id='type-id-56'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
         <function-decl name='Next' mangled-name='_ZNK17TCMalloc_PageMap3ILi35EE4NextEm' filepath='src/pagemap.h' line='300' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-1283' is-artificial='yes'/>
+          <parameter type-id='type-id-1277' is-artificial='yes'/>
           <parameter type-id='type-id-5'/>
           <return type-id='type-id-53'/>
         </function-decl>
       </member-function>
     </class-decl>
-    <typedef-decl name='__compar_fn_t' type-id='type-id-1284' filepath='/usr/include/stdlib.h' line='742' column='1' id='type-id-1285'/>
-    <class-decl name='div_t' size-in-bits='64' is-struct='yes' visibility='default' filepath='/usr/include/stdlib.h' line='99' column='1' id='type-id-1286'>
+    <typedef-decl name='__compar_fn_t' type-id='type-id-1278' filepath='/usr/include/stdlib.h' line='742' column='1' id='type-id-1279'/>
+    <class-decl name='div_t' size-in-bits='64' is-struct='yes' visibility='default' filepath='/usr/include/stdlib.h' line='99' column='1' id='type-id-1280'>
       <data-member access='public' layout-offset-in-bits='0'>
         <var-decl name='quot' type-id='type-id-1' visibility='default' filepath='/usr/include/stdlib.h' line='100' column='1'/>
       </data-member>
@@ -20217,28 +19962,28 @@
     </class-decl>
     <class-decl name='SpinLock' size-in-bits='32' visibility='default' filepath='./src/base/spinlock.h' line='48' column='1' id='type-id-176'>
       <member-type access='private'>
-        <enum-decl name='__anonymous_enum__2' is-anonymous='yes' filepath='./src/base/spinlock.h' line='116' column='1' id='type-id-1287'>
+        <enum-decl name='__anonymous_enum__2' is-anonymous='yes' filepath='./src/base/spinlock.h' line='116' column='1' id='type-id-1281'>
           <underlying-type type-id='type-id-133'/>
           <enumerator name='kSpinLockSleeper' value='2'/>
         </enum-decl>
       </member-type>
       <member-type access='private'>
-        <enum-decl name='__anonymous_enum__' is-anonymous='yes' filepath='src/base/spinlock.h' line='114' column='1' id='type-id-1288'>
+        <enum-decl name='__anonymous_enum__' is-anonymous='yes' filepath='src/base/spinlock.h' line='114' column='1' id='type-id-1282'>
           <underlying-type type-id='type-id-133'/>
           <enumerator name='kSpinLockFree' value='0'/>
         </enum-decl>
       </member-type>
       <member-type access='private'>
-        <enum-decl name='__anonymous_enum__1' is-anonymous='yes' filepath='src/base/spinlock.h' line='115' column='1' id='type-id-1289'>
+        <enum-decl name='__anonymous_enum__1' is-anonymous='yes' filepath='src/base/spinlock.h' line='115' column='1' id='type-id-1283'>
           <underlying-type type-id='type-id-133'/>
           <enumerator name='kSpinLockHeld' value='1'/>
         </enum-decl>
       </member-type>
       <data-member access='private' static='yes'>
-        <var-decl name='LINKER_INITIALIZED' type-id='type-id-1290' mangled-name='_ZN8SpinLock18LINKER_INITIALIZEDE' visibility='default' filepath='src/base/spinlock.h' line='112' column='1' elf-symbol-id='_ZN8SpinLock18LINKER_INITIALIZEDE'/>
+        <var-decl name='LINKER_INITIALIZED' type-id='type-id-1284' mangled-name='_ZN8SpinLock18LINKER_INITIALIZEDE' visibility='default' filepath='src/base/spinlock.h' line='112' column='1' elf-symbol-id='_ZN8SpinLock18LINKER_INITIALIZEDE'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='0'>
-        <var-decl name='lockword_' type-id='type-id-986' visibility='default' filepath='src/base/spinlock.h' line='118' column='1'/>
+        <var-decl name='lockword_' type-id='type-id-980' visibility='default' filepath='src/base/spinlock.h' line='118' column='1'/>
       </data-member>
       <member-function access='private' constructor='yes'>
         <function-decl name='SpinLock' filepath='src/base/spinlock.h' line='50' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -20249,7 +19994,7 @@
       <member-function access='private' constructor='yes'>
         <function-decl name='SpinLock' filepath='src/base/spinlock.h' line='61' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-254' is-artificial='yes'/>
-          <parameter type-id='type-id-1291'/>
+          <parameter type-id='type-id-1285'/>
           <return type-id='type-id-56'/>
         </function-decl>
       </member-function>
@@ -20273,7 +20018,7 @@
       </member-function>
       <member-function access='private'>
         <function-decl name='IsHeld' mangled-name='_ZNK8SpinLock6IsHeldEv' filepath='src/base/spinlock.h' line='108' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-1292' is-artificial='yes'/>
+          <parameter type-id='type-id-1286' is-artificial='yes'/>
           <return type-id='type-id-55'/>
         </function-decl>
       </member-function>
@@ -20294,7 +20039,7 @@
         <function-decl name='SpinLoop' mangled-name='_ZN8SpinLock8SpinLoopElPi' filepath='src/base/spinlock.h' line='122' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN8SpinLock8SpinLoopElPi'>
           <parameter type-id='type-id-254' is-artificial='yes'/>
           <parameter type-id='type-id-76'/>
-          <parameter type-id='type-id-1293'/>
+          <parameter type-id='type-id-1287'/>
           <return type-id='type-id-82'/>
         </function-decl>
       </member-function>
@@ -20308,19 +20053,19 @@
       <member-function access='private' constructor='yes'>
         <function-decl name='SpinLock' filepath='src/base/spinlock.h' line='125' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-254' is-artificial='yes'/>
-          <parameter type-id='type-id-1294'/>
+          <parameter type-id='type-id-1288'/>
           <return type-id='type-id-56'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
         <function-decl name='operator=' mangled-name='_ZN8SpinLockaSERKS_' filepath='src/base/spinlock.h' line='125' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-254' is-artificial='yes'/>
-          <parameter type-id='type-id-1294'/>
+          <parameter type-id='type-id-1288'/>
           <return type-id='type-id-56'/>
         </function-decl>
       </member-function>
     </class-decl>
-    <class-decl name='ldiv_t' size-in-bits='128' is-struct='yes' visibility='default' filepath='/usr/include/stdlib.h' line='107' column='1' id='type-id-1295'>
+    <class-decl name='ldiv_t' size-in-bits='128' is-struct='yes' visibility='default' filepath='/usr/include/stdlib.h' line='107' column='1' id='type-id-1289'>
       <data-member access='public' layout-offset-in-bits='0'>
         <var-decl name='quot' type-id='type-id-285' visibility='default' filepath='/usr/include/stdlib.h' line='108' column='1'/>
       </data-member>
@@ -20328,7 +20073,7 @@
         <var-decl name='rem' type-id='type-id-285' visibility='default' filepath='/usr/include/stdlib.h' line='109' column='1'/>
       </data-member>
     </class-decl>
-    <class-decl name='TCMalloc_Printer' size-in-bits='128' visibility='default' filepath='src/internal_logging.h' line='126' column='1' id='type-id-1296'>
+    <class-decl name='TCMalloc_Printer' size-in-bits='128' visibility='default' filepath='src/internal_logging.h' line='126' column='1' id='type-id-1290'>
       <data-member access='private' layout-offset-in-bits='0'>
         <var-decl name='buf_' type-id='type-id-90' visibility='default' filepath='src/internal_logging.h' line='128' column='1'/>
       </data-member>
@@ -20337,7 +20082,7 @@
       </data-member>
       <member-function access='private' constructor='yes'>
         <function-decl name='TCMalloc_Printer' filepath='src/internal_logging.h' line='133' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-1297' is-artificial='yes'/>
+          <parameter type-id='type-id-1291' is-artificial='yes'/>
           <parameter type-id='type-id-90'/>
           <parameter type-id='type-id-1'/>
           <return type-id='type-id-56'/>
@@ -20345,15 +20090,15 @@
       </member-function>
       <member-function access='private'>
         <function-decl name='printf' mangled-name='_ZN16TCMalloc_Printer6printfEPKcz' filepath='src/internal_logging.h' line='137' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN16TCMalloc_Printer6printfEPKcz'>
-          <parameter type-id='type-id-1297' is-artificial='yes'/>
+          <parameter type-id='type-id-1291' is-artificial='yes'/>
           <parameter type-id='type-id-52'/>
           <parameter is-variadic='yes'/>
           <return type-id='type-id-56'/>
         </function-decl>
       </member-function>
     </class-decl>
-    <typedef-decl name='wint_t' type-id='type-id-1123' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/include/stddef.h' line='352' column='1' id='type-id-1298'/>
-    <class-decl name='PackedCache&lt;35, long unsigned int&gt;' size-in-bits='4194304' visibility='default' filepath='src/packed-cache-inl.h' line='135' column='1' id='type-id-1299'>
+    <typedef-decl name='wint_t' type-id='type-id-1117' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/include/stddef.h' line='352' column='1' id='type-id-1292'/>
+    <class-decl name='PackedCache&lt;35, long unsigned int&gt;' size-in-bits='4194304' visibility='default' filepath='src/packed-cache-inl.h' line='135' column='1' id='type-id-1293'>
       <data-member access='private' static='yes'>
         <var-decl name='kHashbits' type-id='type-id-112' visibility='default' filepath='src/packed-cache-inl.h' line='143' column='1'/>
       </data-member>
@@ -20379,18 +20124,18 @@
         <var-decl name='kValueMask' type-id='type-id-89' visibility='default' filepath='src/packed-cache-inl.h' line='230' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='0'>
-        <var-decl name='array_' type-id='type-id-1274' visibility='default' filepath='src/packed-cache-inl.h' line='234' column='1'/>
+        <var-decl name='array_' type-id='type-id-1268' visibility='default' filepath='src/packed-cache-inl.h' line='234' column='1'/>
       </data-member>
       <member-function access='private'>
         <function-decl name='PackedCache' filepath='src/packed-cache-inl.h' line='148' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-1300' is-artificial='yes'/>
+          <parameter type-id='type-id-1294' is-artificial='yes'/>
           <parameter type-id='type-id-5'/>
           <return type-id='type-id-56'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
         <function-decl name='Put' mangled-name='_ZN11PackedCacheILi35EmE3PutEmm' filepath='src/packed-cache-inl.h' line='157' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-1300' is-artificial='yes'/>
+          <parameter type-id='type-id-1294' is-artificial='yes'/>
           <parameter type-id='type-id-5'/>
           <parameter type-id='type-id-5'/>
           <return type-id='type-id-56'/>
@@ -20398,14 +20143,14 @@
       </member-function>
       <member-function access='private'>
         <function-decl name='Has' mangled-name='_ZNK11PackedCacheILi35EmE3HasEm' filepath='src/packed-cache-inl.h' line='163' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-1301' is-artificial='yes'/>
+          <parameter type-id='type-id-1295' is-artificial='yes'/>
           <parameter type-id='type-id-5'/>
           <return type-id='type-id-55'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
         <function-decl name='GetOrDefault' mangled-name='_ZNK11PackedCacheILi35EmE12GetOrDefaultEmm' filepath='src/packed-cache-inl.h' line='168' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-1301' is-artificial='yes'/>
+          <parameter type-id='type-id-1295' is-artificial='yes'/>
           <parameter type-id='type-id-5'/>
           <parameter type-id='type-id-5'/>
           <return type-id='type-id-57'/>
@@ -20413,7 +20158,7 @@
       </member-function>
       <member-function access='private'>
         <function-decl name='Clear' mangled-name='_ZN11PackedCacheILi35EmE5ClearEm' filepath='src/packed-cache-inl.h' line='178' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-1300' is-artificial='yes'/>
+          <parameter type-id='type-id-1294' is-artificial='yes'/>
           <parameter type-id='type-id-5'/>
           <return type-id='type-id-56'/>
         </function-decl>
@@ -20444,819 +20189,1069 @@
         </function-decl>
       </member-function>
     </class-decl>
-    <typedef-decl name='__FILE' type-id='type-id-1302' filepath='/usr/include/stdio.h' line='65' column='1' id='type-id-1303'/>
-    <class-decl name='_IO_FILE' size-in-bits='1728' is-struct='yes' visibility='default' filepath='/usr/include/libio.h' line='271' column='1' id='type-id-1302'>
-      <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='_flags' type-id='type-id-1' visibility='default' filepath='/usr/include/libio.h' line='272' column='1'/>
-      </data-member>
-      <data-member access='public' layout-offset-in-bits='64'>
-        <var-decl name='_IO_read_ptr' type-id='type-id-90' visibility='default' filepath='/usr/include/libio.h' line='277' column='1'/>
-      </data-member>
-      <data-member access='public' layout-offset-in-bits='128'>
-        <var-decl name='_IO_read_end' type-id='type-id-90' visibility='default' filepath='/usr/include/libio.h' line='278' column='1'/>
-      </data-member>
-      <data-member access='public' layout-offset-in-bits='192'>
-        <var-decl name='_IO_read_base' type-id='type-id-90' visibility='default' filepath='/usr/include/libio.h' line='279' column='1'/>
-      </data-member>
-      <data-member access='public' layout-offset-in-bits='256'>
-        <var-decl name='_IO_write_base' type-id='type-id-90' visibility='default' filepath='/usr/include/libio.h' line='280' column='1'/>
-      </data-member>
-      <data-member access='public' layout-offset-in-bits='320'>
-        <var-decl name='_IO_write_ptr' type-id='type-id-90' visibility='default' filepath='/usr/include/libio.h' line='281' column='1'/>
-      </data-member>
-      <data-member access='public' layout-offset-in-bits='384'>
-        <var-decl name='_IO_write_end' type-id='type-id-90' visibility='default' filepath='/usr/include/libio.h' line='282' column='1'/>
-      </data-member>
-      <data-member access='public' layout-offset-in-bits='448'>
-        <var-decl name='_IO_buf_base' type-id='type-id-90' visibility='default' filepath='/usr/include/libio.h' line='283' column='1'/>
-      </data-member>
-      <data-member access='public' layout-offset-in-bits='512'>
-        <var-decl name='_IO_buf_end' type-id='type-id-90' visibility='default' filepath='/usr/include/libio.h' line='284' column='1'/>
-      </data-member>
-      <data-member access='public' layout-offset-in-bits='576'>
-        <var-decl name='_IO_save_base' type-id='type-id-90' visibility='default' filepath='/usr/include/libio.h' line='286' column='1'/>
-      </data-member>
-      <data-member access='public' layout-offset-in-bits='640'>
-        <var-decl name='_IO_backup_base' type-id='type-id-90' visibility='default' filepath='/usr/include/libio.h' line='287' column='1'/>
-      </data-member>
-      <data-member access='public' layout-offset-in-bits='704'>
-        <var-decl name='_IO_save_end' type-id='type-id-90' visibility='default' filepath='/usr/include/libio.h' line='288' column='1'/>
-      </data-member>
-      <data-member access='public' layout-offset-in-bits='768'>
-        <var-decl name='_markers' type-id='type-id-1304' visibility='default' filepath='/usr/include/libio.h' line='290' column='1'/>
-      </data-member>
-      <data-member access='public' layout-offset-in-bits='832'>
-        <var-decl name='_chain' type-id='type-id-1305' visibility='default' filepath='/usr/include/libio.h' line='292' column='1'/>
-      </data-member>
-      <data-member access='public' layout-offset-in-bits='896'>
-        <var-decl name='_fileno' type-id='type-id-1' visibility='default' filepath='/usr/include/libio.h' line='294' column='1'/>
-      </data-member>
-      <data-member access='public' layout-offset-in-bits='928'>
-        <var-decl name='_flags2' type-id='type-id-1' visibility='default' filepath='/usr/include/libio.h' line='298' column='1'/>
-      </data-member>
-      <data-member access='public' layout-offset-in-bits='960'>
-        <var-decl name='_old_offset' type-id='type-id-287' visibility='default' filepath='/usr/include/libio.h' line='300' column='1'/>
-      </data-member>
-      <data-member access='public' layout-offset-in-bits='1024'>
-        <var-decl name='_cur_column' type-id='type-id-14' visibility='default' filepath='/usr/include/libio.h' line='304' column='1'/>
-      </data-member>
-      <data-member access='public' layout-offset-in-bits='1040'>
-        <var-decl name='_vtable_offset' type-id='type-id-1259' visibility='default' filepath='/usr/include/libio.h' line='305' column='1'/>
-      </data-member>
-      <data-member access='public' layout-offset-in-bits='1048'>
-        <var-decl name='_shortbuf' type-id='type-id-1244' visibility='default' filepath='/usr/include/libio.h' line='306' column='1'/>
-      </data-member>
-      <data-member access='public' layout-offset-in-bits='1088'>
-        <var-decl name='_lock' type-id='type-id-1306' visibility='default' filepath='/usr/include/libio.h' line='310' column='1'/>
-      </data-member>
-      <data-member access='public' layout-offset-in-bits='1152'>
-        <var-decl name='_offset' type-id='type-id-951' visibility='default' filepath='/usr/include/libio.h' line='319' column='1'/>
-      </data-member>
-      <data-member access='public' layout-offset-in-bits='1216'>
-        <var-decl name='__pad1' type-id='type-id-53' visibility='default' filepath='/usr/include/libio.h' line='328' column='1'/>
-      </data-member>
-      <data-member access='public' layout-offset-in-bits='1280'>
-        <var-decl name='__pad2' type-id='type-id-53' visibility='default' filepath='/usr/include/libio.h' line='329' column='1'/>
-      </data-member>
-      <data-member access='public' layout-offset-in-bits='1344'>
-        <var-decl name='__pad3' type-id='type-id-53' visibility='default' filepath='/usr/include/libio.h' line='330' column='1'/>
-      </data-member>
-      <data-member access='public' layout-offset-in-bits='1408'>
-        <var-decl name='__pad4' type-id='type-id-53' visibility='default' filepath='/usr/include/libio.h' line='331' column='1'/>
-      </data-member>
-      <data-member access='public' layout-offset-in-bits='1472'>
-        <var-decl name='__pad5' type-id='type-id-57' visibility='default' filepath='/usr/include/libio.h' line='332' column='1'/>
-      </data-member>
-      <data-member access='public' layout-offset-in-bits='1536'>
-        <var-decl name='_mode' type-id='type-id-1' visibility='default' filepath='/usr/include/libio.h' line='334' column='1'/>
-      </data-member>
-      <data-member access='public' layout-offset-in-bits='1568'>
-        <var-decl name='_unused2' type-id='type-id-1246' visibility='default' filepath='/usr/include/libio.h' line='336' column='1'/>
-      </data-member>
-    </class-decl>
-    <class-decl name='_IO_marker' size-in-bits='192' is-struct='yes' visibility='default' filepath='/usr/include/libio.h' line='186' column='1' id='type-id-1307'>
-      <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='_next' type-id='type-id-1304' visibility='default' filepath='/usr/include/libio.h' line='187' column='1'/>
-      </data-member>
-      <data-member access='public' layout-offset-in-bits='64'>
-        <var-decl name='_sbuf' type-id='type-id-1305' visibility='default' filepath='/usr/include/libio.h' line='188' column='1'/>
-      </data-member>
-      <data-member access='public' layout-offset-in-bits='128'>
-        <var-decl name='_pos' type-id='type-id-1' visibility='default' filepath='/usr/include/libio.h' line='192' column='1'/>
-      </data-member>
-    </class-decl>
-    <typedef-decl name='__off_t' type-id='type-id-285' filepath='/usr/include/bits/types.h' line='141' column='1' id='type-id-287'/>
-    <typedef-decl name='_IO_lock_t' type-id='type-id-56' filepath='/usr/include/libio.h' line='180' column='1' id='type-id-1308'/>
-    <typedef-decl name='__off64_t' type-id='type-id-285' filepath='/usr/include/bits/types.h' line='142' column='1' id='type-id-951'/>
-    <typedef-decl name='mbstate_t' type-id='type-id-1309' filepath='/usr/include/wchar.h' line='106' column='1' id='type-id-1310'/>
-    <class-decl name='__mbstate_t' size-in-bits='64' is-struct='yes' visibility='default' filepath='/usr/include/wchar.h' line='84' column='1' id='type-id-1309'>
-      <member-type access='public'>
-        <union-decl name='__anonymous_union__' size-in-bits='32' is-anonymous='yes' visibility='default' filepath='/usr/include/wchar.h' line='87' column='1' id='type-id-1311'>
-          <data-member access='private'>
-            <var-decl name='__wch' type-id='type-id-1123' visibility='default' filepath='/usr/include/wchar.h' line='89' column='1'/>
-          </data-member>
-          <data-member access='private'>
-            <var-decl name='__wchb' type-id='type-id-1248' visibility='default' filepath='/usr/include/wchar.h' line='93' column='1'/>
-          </data-member>
-        </union-decl>
-      </member-type>
-      <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='__count' type-id='type-id-1' visibility='default' filepath='/usr/include/wchar.h' line='85' column='1'/>
-      </data-member>
-      <data-member access='public' layout-offset-in-bits='32'>
-        <var-decl name='__value' type-id='type-id-1311' visibility='default' filepath='/usr/include/wchar.h' line='94' column='1'/>
-      </data-member>
-    </class-decl>
-    <class-decl name='tm' size-in-bits='448' is-struct='yes' visibility='default' filepath='/usr/include/time.h' line='134' column='1' id='type-id-1312'>
-      <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='tm_sec' type-id='type-id-1' visibility='default' filepath='/usr/include/time.h' line='135' column='1'/>
-      </data-member>
-      <data-member access='public' layout-offset-in-bits='32'>
-        <var-decl name='tm_min' type-id='type-id-1' visibility='default' filepath='/usr/include/time.h' line='136' column='1'/>
-      </data-member>
-      <data-member access='public' layout-offset-in-bits='64'>
-        <var-decl name='tm_hour' type-id='type-id-1' visibility='default' filepath='/usr/include/time.h' line='137' column='1'/>
-      </data-member>
-      <data-member access='public' layout-offset-in-bits='96'>
-        <var-decl name='tm_mday' type-id='type-id-1' visibility='default' filepath='/usr/include/time.h' line='138' column='1'/>
-      </data-member>
-      <data-member access='public' layout-offset-in-bits='128'>
-        <var-decl name='tm_mon' type-id='type-id-1' visibility='default' filepath='/usr/include/time.h' line='139' column='1'/>
-      </data-member>
-      <data-member access='public' layout-offset-in-bits='160'>
-        <var-decl name='tm_year' type-id='type-id-1' visibility='default' filepath='/usr/include/time.h' line='140' column='1'/>
-      </data-member>
-      <data-member access='public' layout-offset-in-bits='192'>
-        <var-decl name='tm_wday' type-id='type-id-1' visibility='default' filepath='/usr/include/time.h' line='141' column='1'/>
-      </data-member>
-      <data-member access='public' layout-offset-in-bits='224'>
-        <var-decl name='tm_yday' type-id='type-id-1' visibility='default' filepath='/usr/include/time.h' line='142' column='1'/>
-      </data-member>
-      <data-member access='public' layout-offset-in-bits='256'>
-        <var-decl name='tm_isdst' type-id='type-id-1' visibility='default' filepath='/usr/include/time.h' line='143' column='1'/>
-      </data-member>
-      <data-member access='public' layout-offset-in-bits='320'>
-        <var-decl name='tm_gmtoff' type-id='type-id-285' visibility='default' filepath='/usr/include/time.h' line='146' column='1'/>
-      </data-member>
-      <data-member access='public' layout-offset-in-bits='384'>
-        <var-decl name='tm_zone' type-id='type-id-52' visibility='default' filepath='/usr/include/time.h' line='147' column='1'/>
-      </data-member>
-    </class-decl>
-    <class-decl name='lconv' size-in-bits='768' is-struct='yes' visibility='default' filepath='/usr/include/locale.h' line='55' column='1' id='type-id-1313'>
-      <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='decimal_point' type-id='type-id-90' visibility='default' filepath='/usr/include/locale.h' line='58' column='1'/>
-      </data-member>
-      <data-member access='public' layout-offset-in-bits='64'>
-        <var-decl name='thousands_sep' type-id='type-id-90' visibility='default' filepath='/usr/include/locale.h' line='59' column='1'/>
-      </data-member>
-      <data-member access='public' layout-offset-in-bits='128'>
-        <var-decl name='grouping' type-id='type-id-90' visibility='default' filepath='/usr/include/locale.h' line='65' column='1'/>
-      </data-member>
-      <data-member access='public' layout-offset-in-bits='192'>
-        <var-decl name='int_curr_symbol' type-id='type-id-90' visibility='default' filepath='/usr/include/locale.h' line='71' column='1'/>
-      </data-member>
-      <data-member access='public' layout-offset-in-bits='256'>
-        <var-decl name='currency_symbol' type-id='type-id-90' visibility='default' filepath='/usr/include/locale.h' line='72' column='1'/>
-      </data-member>
-      <data-member access='public' layout-offset-in-bits='320'>
-        <var-decl name='mon_decimal_point' type-id='type-id-90' visibility='default' filepath='/usr/include/locale.h' line='73' column='1'/>
-      </data-member>
-      <data-member access='public' layout-offset-in-bits='384'>
-        <var-decl name='mon_thousands_sep' type-id='type-id-90' visibility='default' filepath='/usr/include/locale.h' line='74' column='1'/>
-      </data-member>
-      <data-member access='public' layout-offset-in-bits='448'>
-        <var-decl name='mon_grouping' type-id='type-id-90' visibility='default' filepath='/usr/include/locale.h' line='75' column='1'/>
-      </data-member>
-      <data-member access='public' layout-offset-in-bits='512'>
-        <var-decl name='positive_sign' type-id='type-id-90' visibility='default' filepath='/usr/include/locale.h' line='76' column='1'/>
-      </data-member>
-      <data-member access='public' layout-offset-in-bits='576'>
-        <var-decl name='negative_sign' type-id='type-id-90' visibility='default' filepath='/usr/include/locale.h' line='77' column='1'/>
-      </data-member>
-      <data-member access='public' layout-offset-in-bits='640'>
-        <var-decl name='int_frac_digits' type-id='type-id-66' visibility='default' filepath='/usr/include/locale.h' line='78' column='1'/>
-      </data-member>
-      <data-member access='public' layout-offset-in-bits='648'>
-        <var-decl name='frac_digits' type-id='type-id-66' visibility='default' filepath='/usr/include/locale.h' line='79' column='1'/>
-      </data-member>
-      <data-member access='public' layout-offset-in-bits='656'>
-        <var-decl name='p_cs_precedes' type-id='type-id-66' visibility='default' filepath='/usr/include/locale.h' line='81' column='1'/>
-      </data-member>
-      <data-member access='public' layout-offset-in-bits='664'>
-        <var-decl name='p_sep_by_space' type-id='type-id-66' visibility='default' filepath='/usr/include/locale.h' line='83' column='1'/>
-      </data-member>
-      <data-member access='public' layout-offset-in-bits='672'>
-        <var-decl name='n_cs_precedes' type-id='type-id-66' visibility='default' filepath='/usr/include/locale.h' line='85' column='1'/>
-      </data-member>
-      <data-member access='public' layout-offset-in-bits='680'>
-        <var-decl name='n_sep_by_space' type-id='type-id-66' visibility='default' filepath='/usr/include/locale.h' line='87' column='1'/>
-      </data-member>
-      <data-member access='public' layout-offset-in-bits='688'>
-        <var-decl name='p_sign_posn' type-id='type-id-66' visibility='default' filepath='/usr/include/locale.h' line='94' column='1'/>
-      </data-member>
-      <data-member access='public' layout-offset-in-bits='696'>
-        <var-decl name='n_sign_posn' type-id='type-id-66' visibility='default' filepath='/usr/include/locale.h' line='95' column='1'/>
-      </data-member>
-      <data-member access='public' layout-offset-in-bits='704'>
-        <var-decl name='int_p_cs_precedes' type-id='type-id-66' visibility='default' filepath='/usr/include/locale.h' line='98' column='1'/>
-      </data-member>
-      <data-member access='public' layout-offset-in-bits='712'>
-        <var-decl name='int_p_sep_by_space' type-id='type-id-66' visibility='default' filepath='/usr/include/locale.h' line='100' column='1'/>
-      </data-member>
-      <data-member access='public' layout-offset-in-bits='720'>
-        <var-decl name='int_n_cs_precedes' type-id='type-id-66' visibility='default' filepath='/usr/include/locale.h' line='102' column='1'/>
-      </data-member>
-      <data-member access='public' layout-offset-in-bits='728'>
-        <var-decl name='int_n_sep_by_space' type-id='type-id-66' visibility='default' filepath='/usr/include/locale.h' line='104' column='1'/>
-      </data-member>
-      <data-member access='public' layout-offset-in-bits='736'>
-        <var-decl name='int_p_sign_posn' type-id='type-id-66' visibility='default' filepath='/usr/include/locale.h' line='111' column='1'/>
-      </data-member>
-      <data-member access='public' layout-offset-in-bits='744'>
-        <var-decl name='int_n_sign_posn' type-id='type-id-66' visibility='default' filepath='/usr/include/locale.h' line='112' column='1'/>
-      </data-member>
-    </class-decl>
-    <typedef-decl name='Atomic32' type-id='type-id-114' filepath='./src/base/atomicops-internals-x86.h' line='43' column='1' id='type-id-82'/>
-    <typedef-decl name='int32_t' type-id='type-id-1' filepath='/usr/include/stdint.h' line='39' column='1' id='type-id-114'/>
-    <typedef-decl name='int64_t' type-id='type-id-285' filepath='/usr/include/stdint.h' line='41' column='1' id='type-id-1314'/>
-    <typedef-decl name='uint64_t' type-id='type-id-5' filepath='/usr/include/stdint.h' line='56' column='1' id='type-id-15'/>
-    <typedef-decl name='Length' type-id='type-id-130' filepath='src/common.h' line='59' column='1' id='type-id-1138'/>
-    <typedef-decl name='uintptr_t' type-id='type-id-5' filepath='/usr/include/stdint.h' line='123' column='1' id='type-id-130'/>
-    <typedef-decl name='uint64' type-id='type-id-15' filepath='src/base/basictypes.h' line='72' column='1' id='type-id-94'/>
-    <typedef-decl name='int64' type-id='type-id-1314' filepath='src/base/basictypes.h' line='61' column='1' id='type-id-76'/>
-    <typedef-decl name='int32' type-id='type-id-114' filepath='src/base/basictypes.h' line='60' column='1' id='type-id-65'/>
-    <typedef-decl name='PageID' type-id='type-id-130' filepath='src/common.h' line='56' column='1' id='type-id-1137'/>
-    <class-decl name='SpinLockHolder' size-in-bits='64' visibility='default' filepath='src/base/spinlock.h' line='130' column='1' id='type-id-1315'>
-      <data-member access='private' layout-offset-in-bits='0'>
-        <var-decl name='lock_' type-id='type-id-254' visibility='default' filepath='src/base/spinlock.h' line='132' column='1'/>
-      </data-member>
-      <member-function access='private' constructor='yes'>
-        <function-decl name='SpinLockHolder' mangled-name='_ZN14SpinLockHolderC2EP8SpinLock' filepath='src/base/spinlock.h' line='134' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN14SpinLockHolderC2EP8SpinLock'>
-          <parameter type-id='type-id-1316' is-artificial='yes'/>
-          <parameter type-id='type-id-254'/>
-          <return type-id='type-id-56'/>
-        </function-decl>
-      </member-function>
-      <member-function access='private' destructor='yes'>
-        <function-decl name='~SpinLockHolder' mangled-name='_ZN14SpinLockHolderD1Ev' filepath='src/base/spinlock.h' line='140' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN14SpinLockHolderD1Ev'>
-          <parameter type-id='type-id-1316' is-artificial='yes'/>
-          <parameter type-id='type-id-1' is-artificial='yes'/>
-          <return type-id='type-id-56'/>
-        </function-decl>
-      </member-function>
-    </class-decl>
-    <class-decl name='MallocHook' size-in-bits='8' visibility='default' filepath='./src/gperftools/malloc_hook.h' line='98' column='1' id='type-id-1317'>
-      <member-type access='private'>
-        <typedef-decl name='PreMmapHook' type-id='type-id-905' filepath='./src/gperftools/malloc_hook.h' line='126' column='1' id='type-id-1318'/>
-      </member-type>
-      <member-type access='private'>
-        <typedef-decl name='MmapReplacement' type-id='type-id-907' filepath='./src/gperftools/malloc_hook.h' line='150' column='1' id='type-id-1319'/>
-      </member-type>
-      <member-type access='private'>
-        <typedef-decl name='MunmapReplacement' type-id='type-id-909' filepath='./src/gperftools/malloc_hook.h' line='192' column='1' id='type-id-1320'/>
-      </member-type>
-      <member-type access='private'>
-        <typedef-decl name='MunmapHook' type-id='type-id-910' filepath='./src/gperftools/malloc_hook.h' line='204' column='1' id='type-id-1321'/>
-      </member-type>
-      <member-type access='private'>
-        <typedef-decl name='MremapHook' type-id='type-id-912' filepath='./src/gperftools/malloc_hook.h' line='214' column='1' id='type-id-1322'/>
-      </member-type>
-      <member-type access='private'>
-        <typedef-decl name='PreSbrkHook' type-id='type-id-914' filepath='./src/gperftools/malloc_hook.h' line='234' column='1' id='type-id-1323'/>
-      </member-type>
-      <member-type access='private'>
-        <typedef-decl name='NewHook' type-id='type-id-364' filepath='./src/gperftools/malloc_hook.h' line='102' column='1' id='type-id-1324'/>
-      </member-type>
+    <typedef-decl name='__FILE' type-id='type-id-1296' filepath='/usr/include/stdio.h' line='65' column='1' id='type-id-1297'/>
+    <class-decl name='MallocExtension' size-in-bits='64' visibility='default' filepath='src/gperftools/malloc_extension.h' line='90' column='1' id='type-id-894'>
       <member-type access='private'>
-        <typedef-decl name='DeleteHook' type-id='type-id-365' filepath='./src/gperftools/malloc_hook.h' line='113' column='1' id='type-id-1325'/>
+        <enum-decl name='Ownership' filepath='./src/gperftools/malloc_extension.h' line='315' column='1' id='type-id-1298'>
+          <underlying-type type-id='type-id-133'/>
+          <enumerator name='kUnknownOwnership' value='0'/>
+          <enumerator name='kOwned' value='1'/>
+          <enumerator name='kNotOwned' value='2'/>
+        </enum-decl>
       </member-type>
       <member-type access='private'>
-        <typedef-decl name='MmapHook' type-id='type-id-367' filepath='./src/gperftools/malloc_hook.h' line='168' column='1' id='type-id-1326'/>
+        <class-decl name='FreeListInfo' size-in-bits='256' is-struct='yes' visibility='default' filepath='./src/gperftools/malloc_extension.h' line='333' column='1' id='type-id-1299'>
+          <data-member access='public' layout-offset-in-bits='0'>
+            <var-decl name='min_object_size' type-id='type-id-57' visibility='default' filepath='./src/gperftools/malloc_extension.h' line='334' column='1'/>
+          </data-member>
+          <data-member access='public' layout-offset-in-bits='64'>
+            <var-decl name='max_object_size' type-id='type-id-57' visibility='default' filepath='./src/gperftools/malloc_extension.h' line='335' column='1'/>
+          </data-member>
+          <data-member access='public' layout-offset-in-bits='128'>
+            <var-decl name='total_bytes_free' type-id='type-id-57' visibility='default' filepath='./src/gperftools/malloc_extension.h' line='336' column='1'/>
+          </data-member>
+          <data-member access='public' layout-offset-in-bits='192'>
+            <var-decl name='type' type-id='type-id-52' visibility='default' filepath='./src/gperftools/malloc_extension.h' line='337' column='1'/>
+          </data-member>
+        </class-decl>
       </member-type>
       <member-type access='private'>
-        <typedef-decl name='SbrkHook' type-id='type-id-369' filepath='./src/gperftools/malloc_hook.h' line='247' column='1' id='type-id-1327'/>
+        <typedef-decl name='RangeFunction' type-id='type-id-1300' filepath='src/gperftools/malloc_extension.h' line='143' column='1' id='type-id-895'/>
       </member-type>
       <member-function access='private' static='yes'>
-        <function-decl name='InvokeNewHook' mangled-name='_ZN10MallocHook13InvokeNewHookEPKvm' filepath='./src/gperftools/malloc_hook.h' line='109' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-53'/>
-          <parameter type-id='type-id-57'/>
+        <function-decl name='Initialize' mangled-name='_ZN15MallocExtension10InitializeEv' filepath='src/malloc_extension.cc' line='79' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN15MallocExtension10InitializeEv'>
           <return type-id='type-id-56'/>
         </function-decl>
       </member-function>
       <member-function access='private' static='yes'>
-        <function-decl name='InvokeDeleteHook' mangled-name='_ZN10MallocHook16InvokeDeleteHookEPKv' filepath='./src/gperftools/malloc_hook.h' line='120' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-53'/>
+        <function-decl name='instance' mangled-name='_ZN15MallocExtension8instanceEv' filepath='src/malloc_extension.cc' line='212' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN15MallocExtension8instanceEv'>
+          <return type-id='type-id-259'/>
+        </function-decl>
+      </member-function>
+      <member-function access='private'>
+        <function-decl name='Register' mangled-name='_ZN15MallocExtension8RegisterEPS_' filepath='src/malloc_extension.cc' line='217' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN15MallocExtension8RegisterEPS_'>
+          <parameter type-id='type-id-259' is-artificial='yes'/>
           <return type-id='type-id-56'/>
         </function-decl>
       </member-function>
-      <member-function access='private' static='yes'>
-        <function-decl name='AddNewHook' mangled-name='_ZN10MallocHook10AddNewHookEPFvPKvmE' filepath='./src/gperftools/malloc_hook.h' line='103' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-1324'/>
+      <member-function access='private' destructor='yes' vtable-offset='-1'>
+        <function-decl name='~MallocExtension' mangled-name='_ZN15MallocExtensionD1Ev' filepath='src/malloc_extension.cc' line='111' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN15MallocExtensionD1Ev'>
+          <parameter type-id='type-id-259' is-artificial='yes'/>
+          <parameter type-id='type-id-1' is-artificial='yes'/>
+          <return type-id='type-id-56'/>
+        </function-decl>
+      </member-function>
+      <member-function access='private' vtable-offset='2'>
+        <function-decl name='VerifyAllMemory' mangled-name='_ZN15MallocExtension15VerifyAllMemoryEv' filepath='src/malloc_extension.cc' line='112' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN15MallocExtension15VerifyAllMemoryEv'>
+          <parameter type-id='type-id-259' is-artificial='yes'/>
           <return type-id='type-id-55'/>
         </function-decl>
       </member-function>
-      <member-function access='private' static='yes'>
-        <function-decl name='RemoveNewHook' mangled-name='_ZN10MallocHook13RemoveNewHookEPFvPKvmE' filepath='./src/gperftools/malloc_hook.h' line='106' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-1324'/>
+      <member-function access='private' vtable-offset='3'>
+        <function-decl name='VerifyNewMemory' mangled-name='_ZN15MallocExtension15VerifyNewMemoryEPKv' filepath='src/malloc_extension.cc' line='113' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN15MallocExtension15VerifyNewMemoryEPKv'>
+          <parameter type-id='type-id-259' is-artificial='yes'/>
+          <parameter type-id='type-id-53'/>
           <return type-id='type-id-55'/>
         </function-decl>
       </member-function>
-      <member-function access='private' static='yes'>
-        <function-decl name='AddDeleteHook' mangled-name='_ZN10MallocHook13AddDeleteHookEPFvPKvE' filepath='./src/gperftools/malloc_hook.h' line='114' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-1325'/>
+      <member-function access='private' vtable-offset='4'>
+        <function-decl name='VerifyArrayNewMemory' mangled-name='_ZN15MallocExtension20VerifyArrayNewMemoryEPKv' filepath='src/malloc_extension.cc' line='114' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN15MallocExtension20VerifyArrayNewMemoryEPKv'>
+          <parameter type-id='type-id-259' is-artificial='yes'/>
+          <parameter type-id='type-id-53'/>
           <return type-id='type-id-55'/>
         </function-decl>
       </member-function>
-      <member-function access='private' static='yes'>
-        <function-decl name='RemoveDeleteHook' mangled-name='_ZN10MallocHook16RemoveDeleteHookEPFvPKvE' filepath='./src/gperftools/malloc_hook.h' line='117' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-1325'/>
+      <member-function access='private' vtable-offset='5'>
+        <function-decl name='VerifyMallocMemory' mangled-name='_ZN15MallocExtension18VerifyMallocMemoryEPKv' filepath='src/malloc_extension.cc' line='115' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN15MallocExtension18VerifyMallocMemoryEPKv'>
+          <parameter type-id='type-id-259' is-artificial='yes'/>
+          <parameter type-id='type-id-53'/>
           <return type-id='type-id-55'/>
         </function-decl>
       </member-function>
-      <member-function access='private' static='yes'>
-        <function-decl name='GetNewHook' mangled-name='_ZN10MallocHook10GetNewHookEv' filepath='./src/gperftools/malloc_hook.h' line='275' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <return type-id='type-id-1324'/>
+      <member-function access='private' vtable-offset='6'>
+        <function-decl name='MallocMemoryStats' mangled-name='_ZN15MallocExtension17MallocMemoryStatsEPiPmS0_' filepath='src/malloc_extension.cc' line='130' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN15MallocExtension17MallocMemoryStatsEPiPmS0_'>
+          <parameter type-id='type-id-259' is-artificial='yes'/>
+          <parameter type-id='type-id-897'/>
+          <parameter type-id='type-id-230'/>
+          <parameter type-id='type-id-897'/>
+          <return type-id='type-id-55'/>
         </function-decl>
       </member-function>
-      <member-function access='private' static='yes'>
-        <function-decl name='SetNewHook' mangled-name='_ZN10MallocHook10SetNewHookEPFvPKvmE' filepath='./src/gperftools/malloc_hook.h' line='276' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-1324'/>
-          <return type-id='type-id-1324'/>
+      <member-function access='private' vtable-offset='7'>
+        <function-decl name='GetStats' mangled-name='_ZN15MallocExtension8GetStatsEPci' filepath='src/malloc_extension.cc' line='125' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN15MallocExtension8GetStatsEPci'>
+          <parameter type-id='type-id-259' is-artificial='yes'/>
+          <parameter type-id='type-id-90'/>
+          <parameter type-id='type-id-1'/>
+          <return type-id='type-id-56'/>
         </function-decl>
       </member-function>
-      <member-function access='private' static='yes'>
-        <function-decl name='GetDeleteHook' mangled-name='_ZN10MallocHook13GetDeleteHookEv' filepath='./src/gperftools/malloc_hook.h' line='280' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <return type-id='type-id-1325'/>
-        </function-decl>
-      </member-function>
-      <member-function access='private' static='yes'>
-        <function-decl name='SetDeleteHook' mangled-name='_ZN10MallocHook13SetDeleteHookEPFvPKvE' filepath='./src/gperftools/malloc_hook.h' line='281' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-1325'/>
-          <return type-id='type-id-1325'/>
-        </function-decl>
-      </member-function>
-      <member-function access='private' static='yes'>
-        <function-decl name='GetMmapHook' mangled-name='_ZN10MallocHook11GetMmapHookEv' filepath='./src/gperftools/malloc_hook.h' line='290' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <return type-id='type-id-1326'/>
-        </function-decl>
-      </member-function>
-      <member-function access='private' static='yes'>
-        <function-decl name='GetSbrkHook' mangled-name='_ZN10MallocHook11GetSbrkHookEv' filepath='./src/gperftools/malloc_hook.h' line='310' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <return type-id='type-id-1327'/>
-        </function-decl>
-      </member-function>
-      <member-function access='private' static='yes'>
-        <function-decl name='RemovePreMmapHook' mangled-name='_ZN10MallocHook17RemovePreMmapHookEPFvPKvmiiilE' filepath='./src/gperftools/malloc_hook.h' line='130' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-1318'/>
-          <return type-id='type-id-55'/>
-        </function-decl>
-      </member-function>
-      <member-function access='private' static='yes'>
-        <function-decl name='InvokePreMmapHook' mangled-name='_ZN10MallocHook17InvokePreMmapHookEPKvmiiil' filepath='./src/gperftools/malloc_hook.h' line='133' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-53'/>
-          <parameter type-id='type-id-57'/>
-          <parameter type-id='type-id-1'/>
-          <parameter type-id='type-id-1'/>
-          <parameter type-id='type-id-1'/>
-          <parameter type-id='type-id-185'/>
+      <member-function access='private' vtable-offset='8'>
+        <function-decl name='GetHeapSample' mangled-name='_ZN15MallocExtension13GetHeapSampleEPSs' filepath='src/malloc_extension.cc' line='292' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN15MallocExtension13GetHeapSampleEPSs'>
+          <parameter type-id='type-id-259' is-artificial='yes'/>
+          <parameter type-id='type-id-1301'/>
           <return type-id='type-id-56'/>
         </function-decl>
       </member-function>
-      <member-function access='private' static='yes'>
-        <function-decl name='InvokeMmapReplacement' mangled-name='_ZN10MallocHook21InvokeMmapReplacementEPKvmiiilPPv' filepath='./src/gperftools/malloc_hook.h' line='157' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-53'/>
-          <parameter type-id='type-id-57'/>
-          <parameter type-id='type-id-1'/>
-          <parameter type-id='type-id-1'/>
-          <parameter type-id='type-id-1'/>
-          <parameter type-id='type-id-185'/>
-          <parameter type-id='type-id-120'/>
-          <return type-id='type-id-55'/>
+      <member-function access='private' vtable-offset='9'>
+        <function-decl name='GetHeapGrowthStacks' mangled-name='_ZN15MallocExtension19GetHeapGrowthStacksEPSs' filepath='src/malloc_extension.cc' line='316' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN15MallocExtension19GetHeapGrowthStacksEPSs'>
+          <parameter type-id='type-id-259' is-artificial='yes'/>
+          <parameter type-id='type-id-1301'/>
+          <return type-id='type-id-56'/>
         </function-decl>
       </member-function>
-      <member-function access='private' static='yes'>
-        <function-decl name='InvokeMmapHook' mangled-name='_ZN10MallocHook14InvokeMmapHookEPKvS1_miiil' filepath='./src/gperftools/malloc_hook.h' line='175' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-53'/>
+      <member-function access='private' vtable-offset='10'>
+        <function-decl name='Ranges' mangled-name='_ZN15MallocExtension6RangesEPvPFvS0_PKN4base11MallocRangeEE' filepath='src/malloc_extension.cc' line='340' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN15MallocExtension6RangesEPvPFvS0_PKN4base11MallocRangeEE'>
+          <parameter type-id='type-id-259' is-artificial='yes'/>
           <parameter type-id='type-id-53'/>
-          <parameter type-id='type-id-57'/>
-          <parameter type-id='type-id-1'/>
-          <parameter type-id='type-id-1'/>
-          <parameter type-id='type-id-1'/>
-          <parameter type-id='type-id-185'/>
+          <parameter type-id='type-id-896'/>
           <return type-id='type-id-56'/>
         </function-decl>
       </member-function>
-      <member-function access='private' static='yes'>
-        <function-decl name='InvokeMunmapReplacement' mangled-name='_ZN10MallocHook23InvokeMunmapReplacementEPKvmPi' filepath='./src/gperftools/malloc_hook.h' line='199' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-53'/>
-          <parameter type-id='type-id-57'/>
-          <parameter type-id='type-id-897'/>
+      <member-function access='private' vtable-offset='11'>
+        <function-decl name='GetNumericProperty' mangled-name='_ZN15MallocExtension18GetNumericPropertyEPKcPm' filepath='src/malloc_extension.cc' line='117' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN15MallocExtension18GetNumericPropertyEPKcPm'>
+          <parameter type-id='type-id-259' is-artificial='yes'/>
+          <parameter type-id='type-id-52'/>
+          <parameter type-id='type-id-230'/>
           <return type-id='type-id-55'/>
         </function-decl>
       </member-function>
-      <member-function access='private' static='yes'>
-        <function-decl name='InvokeMunmapHook' mangled-name='_ZN10MallocHook16InvokeMunmapHookEPKvm' filepath='./src/gperftools/malloc_hook.h' line='211' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-53'/>
-          <parameter type-id='type-id-57'/>
-          <return type-id='type-id-56'/>
-        </function-decl>
-      </member-function>
-      <member-function access='private' static='yes'>
-        <function-decl name='InvokeMremapHook' mangled-name='_ZN10MallocHook16InvokeMremapHookEPKvS1_mmiS1_' filepath='./src/gperftools/malloc_hook.h' line='221' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-53'/>
-          <parameter type-id='type-id-53'/>
-          <parameter type-id='type-id-57'/>
+      <member-function access='private' vtable-offset='12'>
+        <function-decl name='SetNumericProperty' mangled-name='_ZN15MallocExtension18SetNumericPropertyEPKcm' filepath='src/malloc_extension.cc' line='121' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN15MallocExtension18SetNumericPropertyEPKcm'>
+          <parameter type-id='type-id-259' is-artificial='yes'/>
+          <parameter type-id='type-id-52'/>
           <parameter type-id='type-id-57'/>
-          <parameter type-id='type-id-1'/>
-          <parameter type-id='type-id-53'/>
-          <return type-id='type-id-56'/>
-        </function-decl>
-      </member-function>
-      <member-function access='private' static='yes'>
-        <function-decl name='RemovePreSbrkHook' mangled-name='_ZN10MallocHook17RemovePreSbrkHookEPFvlE' filepath='./src/gperftools/malloc_hook.h' line='238' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-1323'/>
           <return type-id='type-id-55'/>
         </function-decl>
       </member-function>
-      <member-function access='private' static='yes'>
-        <function-decl name='InvokePreSbrkHook' mangled-name='_ZN10MallocHook17InvokePreSbrkHookEl' filepath='./src/gperftools/malloc_hook.h' line='241' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-186'/>
+      <member-function access='private' vtable-offset='13'>
+        <function-decl name='MarkThreadIdle' mangled-name='_ZN15MallocExtension14MarkThreadIdleEv' filepath='src/malloc_extension.cc' line='146' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN15MallocExtension14MarkThreadIdleEv'>
+          <parameter type-id='type-id-259' is-artificial='yes'/>
           <return type-id='type-id-56'/>
         </function-decl>
       </member-function>
-      <member-function access='private' static='yes'>
-        <function-decl name='InvokeSbrkHook' mangled-name='_ZN10MallocHook14InvokeSbrkHookEPKvl' filepath='./src/gperftools/malloc_hook.h' line='254' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-53'/>
-          <parameter type-id='type-id-186'/>
+      <member-function access='private' vtable-offset='14'>
+        <function-decl name='MarkThreadBusy' mangled-name='_ZN15MallocExtension14MarkThreadBusyEv' filepath='src/malloc_extension.cc' line='150' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN15MallocExtension14MarkThreadBusyEv'>
+          <parameter type-id='type-id-259' is-artificial='yes'/>
           <return type-id='type-id-56'/>
         </function-decl>
       </member-function>
-      <member-function access='private' static='yes'>
-        <function-decl name='UnhookedMMap' mangled-name='_ZN10MallocHook12UnhookedMMapEPvmiiil' filepath='./src/gperftools/malloc_hook.h' line='270' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN10MallocHook12UnhookedMMapEPvmiiil'>
-          <parameter type-id='type-id-53'/>
-          <parameter type-id='type-id-57'/>
-          <parameter type-id='type-id-1'/>
-          <parameter type-id='type-id-1'/>
-          <parameter type-id='type-id-1'/>
-          <parameter type-id='type-id-185'/>
-          <return type-id='type-id-53'/>
-        </function-decl>
-      </member-function>
-      <member-function access='private' static='yes'>
-        <function-decl name='UnhookedMUnmap' mangled-name='_ZN10MallocHook14UnhookedMUnmapEPvm' filepath='./src/gperftools/malloc_hook.h' line='272' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN10MallocHook14UnhookedMUnmapEPvm'>
-          <parameter type-id='type-id-53'/>
-          <parameter type-id='type-id-57'/>
-          <return type-id='type-id-1'/>
+      <member-function access='private' vtable-offset='15'>
+        <function-decl name='GetSystemAllocator' mangled-name='_ZN15MallocExtension18GetSystemAllocatorEv' filepath='src/malloc_extension.cc' line='154' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN15MallocExtension18GetSystemAllocatorEv'>
+          <parameter type-id='type-id-259' is-artificial='yes'/>
+          <return type-id='type-id-952'/>
         </function-decl>
       </member-function>
-      <member-function access='private' static='yes'>
-        <function-decl name='InvokeNewHookSlow' mangled-name='_ZN10MallocHook17InvokeNewHookSlowEPKvm' filepath='./src/gperftools/malloc_hook.h' line='318' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN10MallocHook17InvokeNewHookSlowEPKvm'>
-          <parameter type-id='type-id-53'/>
-          <parameter type-id='type-id-57'/>
+      <member-function access='private' vtable-offset='16'>
+        <function-decl name='SetSystemAllocator' mangled-name='_ZN15MallocExtension18SetSystemAllocatorEP12SysAllocator' filepath='src/malloc_extension.cc' line='158' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN15MallocExtension18SetSystemAllocatorEP12SysAllocator'>
+          <parameter type-id='type-id-259' is-artificial='yes'/>
+          <parameter type-id='type-id-952'/>
           <return type-id='type-id-56'/>
         </function-decl>
       </member-function>
-      <member-function access='private' static='yes'>
-        <function-decl name='InvokeDeleteHookSlow' mangled-name='_ZN10MallocHook20InvokeDeleteHookSlowEPKv' filepath='./src/gperftools/malloc_hook.h' line='319' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN10MallocHook20InvokeDeleteHookSlowEPKv'>
-          <parameter type-id='type-id-53'/>
+      <member-function access='private' vtable-offset='17'>
+        <function-decl name='ReleaseToSystem' mangled-name='_ZN15MallocExtension15ReleaseToSystemEm' filepath='src/malloc_extension.cc' line='162' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN15MallocExtension15ReleaseToSystemEm'>
+          <parameter type-id='type-id-259' is-artificial='yes'/>
+          <parameter type-id='type-id-57'/>
           <return type-id='type-id-56'/>
         </function-decl>
       </member-function>
-      <member-function access='private' static='yes'>
-        <function-decl name='InvokePreMmapHookSlow' mangled-name='_ZN10MallocHook21InvokePreMmapHookSlowEPKvmiiil' filepath='./src/gperftools/malloc_hook.h' line='320' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN10MallocHook21InvokePreMmapHookSlowEPKvmiiil'>
-          <parameter type-id='type-id-53'/>
-          <parameter type-id='type-id-57'/>
-          <parameter type-id='type-id-1'/>
-          <parameter type-id='type-id-1'/>
-          <parameter type-id='type-id-1'/>
-          <parameter type-id='type-id-185'/>
+      <member-function access='private' vtable-offset='18'>
+        <function-decl name='ReleaseFreeMemory' mangled-name='_ZN15MallocExtension17ReleaseFreeMemoryEv' filepath='src/malloc_extension.cc' line='166' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN15MallocExtension17ReleaseFreeMemoryEv'>
+          <parameter type-id='type-id-259' is-artificial='yes'/>
           <return type-id='type-id-56'/>
         </function-decl>
       </member-function>
-      <member-function access='private' static='yes'>
-        <function-decl name='InvokeMmapHookSlow' mangled-name='_ZN10MallocHook18InvokeMmapHookSlowEPKvS1_miiil' filepath='./src/gperftools/malloc_hook.h' line='326' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN10MallocHook18InvokeMmapHookSlowEPKvS1_miiil'>
-          <parameter type-id='type-id-53'/>
-          <parameter type-id='type-id-53'/>
-          <parameter type-id='type-id-57'/>
-          <parameter type-id='type-id-1'/>
-          <parameter type-id='type-id-1'/>
-          <parameter type-id='type-id-1'/>
-          <parameter type-id='type-id-185'/>
+      <member-function access='private' vtable-offset='19'>
+        <function-decl name='SetMemoryReleaseRate' mangled-name='_ZN15MallocExtension20SetMemoryReleaseRateEd' filepath='src/malloc_extension.cc' line='170' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN15MallocExtension20SetMemoryReleaseRateEd'>
+          <parameter type-id='type-id-259' is-artificial='yes'/>
+          <parameter type-id='type-id-2'/>
           <return type-id='type-id-56'/>
         </function-decl>
       </member-function>
-      <member-function access='private' static='yes'>
-        <function-decl name='InvokeMmapReplacementSlow' mangled-name='_ZN10MallocHook25InvokeMmapReplacementSlowEPKvmiiilPPv' filepath='./src/gperftools/malloc_hook.h' line='333' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN10MallocHook25InvokeMmapReplacementSlowEPKvmiiilPPv'>
-          <parameter type-id='type-id-53'/>
-          <parameter type-id='type-id-57'/>
-          <parameter type-id='type-id-1'/>
-          <parameter type-id='type-id-1'/>
-          <parameter type-id='type-id-1'/>
-          <parameter type-id='type-id-185'/>
-          <parameter type-id='type-id-120'/>
-          <return type-id='type-id-55'/>
+      <member-function access='private' vtable-offset='20'>
+        <function-decl name='GetMemoryReleaseRate' mangled-name='_ZN15MallocExtension20GetMemoryReleaseRateEv' filepath='src/malloc_extension.cc' line='174' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN15MallocExtension20GetMemoryReleaseRateEv'>
+          <parameter type-id='type-id-259' is-artificial='yes'/>
+          <return type-id='type-id-2'/>
         </function-decl>
       </member-function>
-      <member-function access='private' static='yes'>
-        <function-decl name='InvokeMunmapHookSlow' mangled-name='_ZN10MallocHook20InvokeMunmapHookSlowEPKvm' filepath='./src/gperftools/malloc_hook.h' line='340' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN10MallocHook20InvokeMunmapHookSlowEPKvm'>
-          <parameter type-id='type-id-53'/>
+      <member-function access='private' vtable-offset='21'>
+        <function-decl name='GetEstimatedAllocatedSize' mangled-name='_ZN15MallocExtension25GetEstimatedAllocatedSizeEm' filepath='src/malloc_extension.cc' line='178' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN15MallocExtension25GetEstimatedAllocatedSizeEm'>
+          <parameter type-id='type-id-259' is-artificial='yes'/>
           <parameter type-id='type-id-57'/>
-          <return type-id='type-id-56'/>
+          <return type-id='type-id-57'/>
         </function-decl>
       </member-function>
-      <member-function access='private' static='yes'>
-        <function-decl name='InvokeMunmapReplacementSlow' mangled-name='_ZN10MallocHook27InvokeMunmapReplacementSlowEPKvmPi' filepath='./src/gperftools/malloc_hook.h' line='341' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN10MallocHook27InvokeMunmapReplacementSlowEPKvmPi'>
+      <member-function access='private' vtable-offset='22'>
+        <function-decl name='GetAllocatedSize' mangled-name='_ZN15MallocExtension16GetAllocatedSizeEPKv' filepath='src/malloc_extension.cc' line='182' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN15MallocExtension16GetAllocatedSizeEPKv'>
+          <parameter type-id='type-id-259' is-artificial='yes'/>
           <parameter type-id='type-id-53'/>
-          <parameter type-id='type-id-57'/>
-          <parameter type-id='type-id-897'/>
-          <return type-id='type-id-55'/>
+          <return type-id='type-id-57'/>
         </function-decl>
       </member-function>
-      <member-function access='private' static='yes'>
-        <function-decl name='InvokeMremapHookSlow' mangled-name='_ZN10MallocHook20InvokeMremapHookSlowEPKvS1_mmiS1_' filepath='./src/gperftools/malloc_hook.h' line='344' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN10MallocHook20InvokeMremapHookSlowEPKvS1_mmiS1_'>
-          <parameter type-id='type-id-53'/>
-          <parameter type-id='type-id-53'/>
-          <parameter type-id='type-id-57'/>
-          <parameter type-id='type-id-57'/>
-          <parameter type-id='type-id-1'/>
+      <member-function access='private' vtable-offset='23'>
+        <function-decl name='GetOwnership' mangled-name='_ZN15MallocExtension12GetOwnershipEPKv' filepath='src/malloc_extension.cc' line='187' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN15MallocExtension12GetOwnershipEPKv'>
+          <parameter type-id='type-id-259' is-artificial='yes'/>
           <parameter type-id='type-id-53'/>
-          <return type-id='type-id-56'/>
+          <return type-id='type-id-1298'/>
         </function-decl>
       </member-function>
-      <member-function access='private' static='yes'>
-        <function-decl name='InvokePreSbrkHookSlow' mangled-name='_ZN10MallocHook21InvokePreSbrkHookSlowEl' filepath='./src/gperftools/malloc_hook.h' line='350' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN10MallocHook21InvokePreSbrkHookSlowEl'>
-          <parameter type-id='type-id-186'/>
-          <return type-id='type-id-56'/>
-        </function-decl>
-      </member-function>
-      <member-function access='private' static='yes'>
-        <function-decl name='InvokeSbrkHookSlow' mangled-name='_ZN10MallocHook18InvokeSbrkHookSlowEPKvl' filepath='./src/gperftools/malloc_hook.h' line='351' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN10MallocHook18InvokeSbrkHookSlowEPKvl'>
-          <parameter type-id='type-id-53'/>
-          <parameter type-id='type-id-186'/>
+      <member-function access='private' vtable-offset='24'>
+        <function-decl name='GetFreeListSizes' mangled-name='_ZN15MallocExtension16GetFreeListSizesEPSt6vectorINS_12FreeListInfoESaIS1_EE' filepath='src/malloc_extension.cc' line='191' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN15MallocExtension16GetFreeListSizesEPSt6vectorINS_12FreeListInfoESaIS1_EE'>
+          <parameter type-id='type-id-259' is-artificial='yes'/>
+          <parameter type-id='type-id-1302'/>
           <return type-id='type-id-56'/>
         </function-decl>
       </member-function>
-      <member-function access='private' static='yes'>
-        <function-decl name='GetCallerStackTrace' mangled-name='_ZN10MallocHook19GetCallerStackTraceEPPvii' filepath='./src/gperftools/malloc_hook.h' line='261' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-120'/>
-          <parameter type-id='type-id-1'/>
-          <parameter type-id='type-id-1'/>
-          <return type-id='type-id-1'/>
-        </function-decl>
-      </member-function>
-      <member-function access='private' static='yes'>
-        <function-decl name='AddMmapHook' mangled-name='_ZN10MallocHook11AddMmapHookEPFvPKvS1_miiilE' filepath='./src/gperftools/malloc_hook.h' line='169' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-1326'/>
-          <return type-id='type-id-55'/>
-        </function-decl>
-      </member-function>
-      <member-function access='private' static='yes'>
-        <function-decl name='RemoveMmapHook' mangled-name='_ZN10MallocHook14RemoveMmapHookEPFvPKvS1_miiilE' filepath='./src/gperftools/malloc_hook.h' line='172' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-1326'/>
-          <return type-id='type-id-55'/>
+      <member-function access='private' vtable-offset='25'>
+        <function-decl name='ReadStackTraces' mangled-name='_ZN15MallocExtension15ReadStackTracesEPi' filepath='src/malloc_extension.cc' line='138' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN15MallocExtension15ReadStackTracesEPi'>
+          <parameter type-id='type-id-259' is-artificial='yes'/>
+          <parameter type-id='type-id-897'/>
+          <return type-id='type-id-120'/>
         </function-decl>
       </member-function>
-      <member-function access='private' static='yes'>
-        <function-decl name='AddMunmapHook' mangled-name='_ZN10MallocHook13AddMunmapHookEPFvPKvmE' filepath='./src/gperftools/malloc_hook.h' line='205' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-1321'/>
-          <return type-id='type-id-55'/>
-        </function-decl>
-      </member-function>
-      <member-function access='private' static='yes'>
-        <function-decl name='RemoveMunmapHook' mangled-name='_ZN10MallocHook16RemoveMunmapHookEPFvPKvmE' filepath='./src/gperftools/malloc_hook.h' line='208' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-1321'/>
-          <return type-id='type-id-55'/>
-        </function-decl>
-      </member-function>
-      <member-function access='private' static='yes'>
-        <function-decl name='AddMremapHook' mangled-name='_ZN10MallocHook13AddMremapHookEPFvPKvS1_mmiS1_E' filepath='./src/gperftools/malloc_hook.h' line='215' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-1322'/>
-          <return type-id='type-id-55'/>
-        </function-decl>
-      </member-function>
-      <member-function access='private' static='yes'>
-        <function-decl name='RemoveMremapHook' mangled-name='_ZN10MallocHook16RemoveMremapHookEPFvPKvS1_mmiS1_E' filepath='./src/gperftools/malloc_hook.h' line='218' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-1322'/>
-          <return type-id='type-id-55'/>
-        </function-decl>
-      </member-function>
-      <member-function access='private' static='yes'>
-        <function-decl name='AddSbrkHook' mangled-name='_ZN10MallocHook11AddSbrkHookEPFvPKvlE' filepath='./src/gperftools/malloc_hook.h' line='248' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-1327'/>
-          <return type-id='type-id-55'/>
-        </function-decl>
-      </member-function>
-      <member-function access='private' static='yes'>
-        <function-decl name='RemoveSbrkHook' mangled-name='_ZN10MallocHook14RemoveSbrkHookEPFvPKvlE' filepath='./src/gperftools/malloc_hook.h' line='251' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-1327'/>
-          <return type-id='type-id-55'/>
+      <member-function access='private' vtable-offset='26'>
+        <function-decl name='ReadHeapGrowthStackTraces' mangled-name='_ZN15MallocExtension25ReadHeapGrowthStackTracesEv' filepath='src/malloc_extension.cc' line='142' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN15MallocExtension25ReadHeapGrowthStackTracesEv'>
+          <parameter type-id='type-id-259' is-artificial='yes'/>
+          <return type-id='type-id-120'/>
         </function-decl>
       </member-function>
     </class-decl>
-    <typedef-decl name='uint32_t' type-id='type-id-1123' filepath='/usr/include/stdint.h' line='52' column='1' id='type-id-12'/>
-    <typedef-decl name='pthread_key_t' type-id='type-id-1123' filepath='/usr/include/bits/pthreadtypes.h' line='140' column='1' id='type-id-953'/>
-    <typedef-decl name='ssize_t' type-id='type-id-1328' filepath='/usr/include/stdio.h' line='103' column='1' id='type-id-255'/>
-    <typedef-decl name='__ssize_t' type-id='type-id-285' filepath='/usr/include/bits/types.h' line='180' column='1' id='type-id-1328'/>
-    <typedef-decl name='pthread_t' type-id='type-id-5' filepath='/usr/include/bits/pthreadtypes.h' line='50' column='1' id='type-id-177'/>
-    <class-decl name='TCMallocStats' size-in-bits='512' is-struct='yes' visibility='default' filepath='src/tcmalloc.cc' line='295' column='1' id='type-id-1329'>
+    <class-decl name='_IO_FILE' size-in-bits='1728' is-struct='yes' visibility='default' filepath='/usr/include/libio.h' line='271' column='1' id='type-id-1296'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='thread_bytes' type-id='type-id-15' visibility='default' filepath='src/tcmalloc.cc' line='296' column='1'/>
+        <var-decl name='_flags' type-id='type-id-1' visibility='default' filepath='/usr/include/libio.h' line='272' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
-        <var-decl name='central_bytes' type-id='type-id-15' visibility='default' filepath='src/tcmalloc.cc' line='297' column='1'/>
+        <var-decl name='_IO_read_ptr' type-id='type-id-90' visibility='default' filepath='/usr/include/libio.h' line='277' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
-        <var-decl name='transfer_bytes' type-id='type-id-15' visibility='default' filepath='src/tcmalloc.cc' line='298' column='1'/>
+        <var-decl name='_IO_read_end' type-id='type-id-90' visibility='default' filepath='/usr/include/libio.h' line='278' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='192'>
-        <var-decl name='metadata_bytes' type-id='type-id-15' visibility='default' filepath='src/tcmalloc.cc' line='299' column='1'/>
+        <var-decl name='_IO_read_base' type-id='type-id-90' visibility='default' filepath='/usr/include/libio.h' line='279' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='256'>
-        <var-decl name='pageheap' type-id='type-id-1330' visibility='default' filepath='src/tcmalloc.cc' line='300' column='1'/>
+        <var-decl name='_IO_write_base' type-id='type-id-90' visibility='default' filepath='/usr/include/libio.h' line='280' column='1'/>
+      </data-member>
+      <data-member access='public' layout-offset-in-bits='320'>
+        <var-decl name='_IO_write_ptr' type-id='type-id-90' visibility='default' filepath='/usr/include/libio.h' line='281' column='1'/>
+      </data-member>
+      <data-member access='public' layout-offset-in-bits='384'>
+        <var-decl name='_IO_write_end' type-id='type-id-90' visibility='default' filepath='/usr/include/libio.h' line='282' column='1'/>
+      </data-member>
+      <data-member access='public' layout-offset-in-bits='448'>
+        <var-decl name='_IO_buf_base' type-id='type-id-90' visibility='default' filepath='/usr/include/libio.h' line='283' column='1'/>
+      </data-member>
+      <data-member access='public' layout-offset-in-bits='512'>
+        <var-decl name='_IO_buf_end' type-id='type-id-90' visibility='default' filepath='/usr/include/libio.h' line='284' column='1'/>
+      </data-member>
+      <data-member access='public' layout-offset-in-bits='576'>
+        <var-decl name='_IO_save_base' type-id='type-id-90' visibility='default' filepath='/usr/include/libio.h' line='286' column='1'/>
+      </data-member>
+      <data-member access='public' layout-offset-in-bits='640'>
+        <var-decl name='_IO_backup_base' type-id='type-id-90' visibility='default' filepath='/usr/include/libio.h' line='287' column='1'/>
+      </data-member>
+      <data-member access='public' layout-offset-in-bits='704'>
+        <var-decl name='_IO_save_end' type-id='type-id-90' visibility='default' filepath='/usr/include/libio.h' line='288' column='1'/>
+      </data-member>
+      <data-member access='public' layout-offset-in-bits='768'>
+        <var-decl name='_markers' type-id='type-id-1303' visibility='default' filepath='/usr/include/libio.h' line='290' column='1'/>
+      </data-member>
+      <data-member access='public' layout-offset-in-bits='832'>
+        <var-decl name='_chain' type-id='type-id-1304' visibility='default' filepath='/usr/include/libio.h' line='292' column='1'/>
+      </data-member>
+      <data-member access='public' layout-offset-in-bits='896'>
+        <var-decl name='_fileno' type-id='type-id-1' visibility='default' filepath='/usr/include/libio.h' line='294' column='1'/>
+      </data-member>
+      <data-member access='public' layout-offset-in-bits='928'>
+        <var-decl name='_flags2' type-id='type-id-1' visibility='default' filepath='/usr/include/libio.h' line='298' column='1'/>
+      </data-member>
+      <data-member access='public' layout-offset-in-bits='960'>
+        <var-decl name='_old_offset' type-id='type-id-287' visibility='default' filepath='/usr/include/libio.h' line='300' column='1'/>
+      </data-member>
+      <data-member access='public' layout-offset-in-bits='1024'>
+        <var-decl name='_cur_column' type-id='type-id-14' visibility='default' filepath='/usr/include/libio.h' line='304' column='1'/>
+      </data-member>
+      <data-member access='public' layout-offset-in-bits='1040'>
+        <var-decl name='_vtable_offset' type-id='type-id-1253' visibility='default' filepath='/usr/include/libio.h' line='305' column='1'/>
+      </data-member>
+      <data-member access='public' layout-offset-in-bits='1048'>
+        <var-decl name='_shortbuf' type-id='type-id-1238' visibility='default' filepath='/usr/include/libio.h' line='306' column='1'/>
+      </data-member>
+      <data-member access='public' layout-offset-in-bits='1088'>
+        <var-decl name='_lock' type-id='type-id-1305' visibility='default' filepath='/usr/include/libio.h' line='310' column='1'/>
+      </data-member>
+      <data-member access='public' layout-offset-in-bits='1152'>
+        <var-decl name='_offset' type-id='type-id-945' visibility='default' filepath='/usr/include/libio.h' line='319' column='1'/>
+      </data-member>
+      <data-member access='public' layout-offset-in-bits='1216'>
+        <var-decl name='__pad1' type-id='type-id-53' visibility='default' filepath='/usr/include/libio.h' line='328' column='1'/>
+      </data-member>
+      <data-member access='public' layout-offset-in-bits='1280'>
+        <var-decl name='__pad2' type-id='type-id-53' visibility='default' filepath='/usr/include/libio.h' line='329' column='1'/>
+      </data-member>
+      <data-member access='public' layout-offset-in-bits='1344'>
+        <var-decl name='__pad3' type-id='type-id-53' visibility='default' filepath='/usr/include/libio.h' line='330' column='1'/>
+      </data-member>
+      <data-member access='public' layout-offset-in-bits='1408'>
+        <var-decl name='__pad4' type-id='type-id-53' visibility='default' filepath='/usr/include/libio.h' line='331' column='1'/>
+      </data-member>
+      <data-member access='public' layout-offset-in-bits='1472'>
+        <var-decl name='__pad5' type-id='type-id-57' visibility='default' filepath='/usr/include/libio.h' line='332' column='1'/>
+      </data-member>
+      <data-member access='public' layout-offset-in-bits='1536'>
+        <var-decl name='_mode' type-id='type-id-1' visibility='default' filepath='/usr/include/libio.h' line='334' column='1'/>
+      </data-member>
+      <data-member access='public' layout-offset-in-bits='1568'>
+        <var-decl name='_unused2' type-id='type-id-1240' visibility='default' filepath='/usr/include/libio.h' line='336' column='1'/>
       </data-member>
     </class-decl>
-    <typedef-decl name='AtomicWord' type-id='type-id-73' filepath='./src/base/atomicops.h' line='129' column='1' id='type-id-781'/>
-    <typedef-decl name='intptr_t' type-id='type-id-285' filepath='/usr/include/stdint.h' line='120' column='1' id='type-id-73'/>
-    <class-decl name='TCMallocImplementation' size-in-bits='128' visibility='default' filepath='src/tcmalloc.cc' line='562' column='1' id='type-id-1331'>
-      <base-class access='public' layout-offset-in-bits='0' type-id='type-id-894'/>
-      <member-type access='private'>
-        <typedef-decl name='RangeFunction' type-id='type-id-900' filepath='./src/gperftools/malloc_extension.h' line='143' column='1' id='type-id-1332'/>
-      </member-type>
-      <data-member access='private' layout-offset-in-bits='64'>
-        <var-decl name='extra_bytes_released_' type-id='type-id-57' visibility='default' filepath='src/tcmalloc.cc' line='570' column='1'/>
+    <class-decl name='_IO_marker' size-in-bits='192' is-struct='yes' visibility='default' filepath='/usr/include/libio.h' line='186' column='1' id='type-id-1306'>
+      <data-member access='public' layout-offset-in-bits='0'>
+        <var-decl name='_next' type-id='type-id-1303' visibility='default' filepath='/usr/include/libio.h' line='187' column='1'/>
+      </data-member>
+      <data-member access='public' layout-offset-in-bits='64'>
+        <var-decl name='_sbuf' type-id='type-id-1304' visibility='default' filepath='/usr/include/libio.h' line='188' column='1'/>
+      </data-member>
+      <data-member access='public' layout-offset-in-bits='128'>
+        <var-decl name='_pos' type-id='type-id-1' visibility='default' filepath='/usr/include/libio.h' line='192' column='1'/>
       </data-member>
+    </class-decl>
+    <class-decl name='SysAllocator' size-in-bits='64' visibility='default' filepath='src/gperftools/malloc_extension.h' line='75' column='1' id='type-id-951'>
       <member-function access='private' constructor='yes'>
-        <function-decl name='TCMallocImplementation' filepath='src/tcmalloc.cc' line='573' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-1333' is-artificial='yes'/>
-          <return type-id='type-id-56'/>
-        </function-decl>
-      </member-function>
-      <member-function access='private' vtable-offset='7'>
-        <function-decl name='GetStats' mangled-name='_ZN22TCMallocImplementation8GetStatsEPci' filepath='src/tcmalloc.cc' line='577' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN22TCMallocImplementation8GetStatsEPci'>
-          <parameter type-id='type-id-1333' is-artificial='yes'/>
-          <parameter type-id='type-id-90'/>
-          <parameter type-id='type-id-1'/>
-          <return type-id='type-id-56'/>
-        </function-decl>
-      </member-function>
-      <member-function access='private' vtable-offset='8'>
-        <function-decl name='GetHeapSample' mangled-name='_ZN22TCMallocImplementation13GetHeapSampleEPSs' filepath='src/tcmalloc.cc' line='590' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN22TCMallocImplementation13GetHeapSampleEPSs'>
-          <parameter type-id='type-id-1333' is-artificial='yes'/>
-          <parameter type-id='type-id-901'/>
-          <return type-id='type-id-56'/>
-        </function-decl>
-      </member-function>
-      <member-function access='private' vtable-offset='10'>
-        <function-decl name='Ranges' mangled-name='_ZN22TCMallocImplementation6RangesEPvPFvS0_PKN4base11MallocRangeEE' filepath='src/tcmalloc.cc' line='622' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN22TCMallocImplementation6RangesEPvPFvS0_PKN4base11MallocRangeEE'>
-          <parameter type-id='type-id-1333' is-artificial='yes'/>
-          <parameter type-id='type-id-53'/>
-          <parameter type-id='type-id-1334'/>
-          <return type-id='type-id-56'/>
-        </function-decl>
-      </member-function>
-      <member-function access='private' vtable-offset='11'>
-        <function-decl name='GetNumericProperty' mangled-name='_ZN22TCMallocImplementation18GetNumericPropertyEPKcPm' filepath='src/tcmalloc.cc' line='626' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN22TCMallocImplementation18GetNumericPropertyEPKcPm'>
-          <parameter type-id='type-id-1333' is-artificial='yes'/>
-          <parameter type-id='type-id-52'/>
-          <parameter type-id='type-id-230'/>
-          <return type-id='type-id-55'/>
-        </function-decl>
-      </member-function>
-      <member-function access='private' vtable-offset='12'>
-        <function-decl name='SetNumericProperty' mangled-name='_ZN22TCMallocImplementation18SetNumericPropertyEPKcm' filepath='src/tcmalloc.cc' line='711' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN22TCMallocImplementation18SetNumericPropertyEPKcm'>
-          <parameter type-id='type-id-1333' is-artificial='yes'/>
-          <parameter type-id='type-id-52'/>
-          <parameter type-id='type-id-57'/>
-          <return type-id='type-id-55'/>
-        </function-decl>
-      </member-function>
-      <member-function access='private' vtable-offset='13'>
-        <function-decl name='MarkThreadIdle' mangled-name='_ZN22TCMallocImplementation14MarkThreadIdleEv' filepath='src/tcmalloc.cc' line='728' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN22TCMallocImplementation14MarkThreadIdleEv'>
-          <parameter type-id='type-id-1333' is-artificial='yes'/>
-          <return type-id='type-id-56'/>
-        </function-decl>
-      </member-function>
-      <member-function access='private' vtable-offset='14'>
-        <function-decl name='MarkThreadBusy' mangled-name='_ZN22TCMallocImplementation14MarkThreadBusyEv' filepath='src/tcmalloc.cc' line='1537' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN22TCMallocImplementation14MarkThreadBusyEv'>
-          <parameter type-id='type-id-1333' is-artificial='yes'/>
+        <function-decl name='SysAllocator' filepath='./src/gperftools/malloc_extension.h' line='77' column='1' visibility='default' binding='global' size-in-bits='64'>
+          <parameter type-id='type-id-952' is-artificial='yes'/>
           <return type-id='type-id-56'/>
         </function-decl>
       </member-function>
-      <member-function access='private' vtable-offset='15'>
-        <function-decl name='GetSystemAllocator' mangled-name='_ZN22TCMallocImplementation18GetSystemAllocatorEv' filepath='src/tcmalloc.cc' line='734' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN22TCMallocImplementation18GetSystemAllocatorEv'>
-          <parameter type-id='type-id-1333' is-artificial='yes'/>
-          <return type-id='type-id-902'/>
-        </function-decl>
-      </member-function>
-      <member-function access='private' vtable-offset='16'>
-        <function-decl name='SetSystemAllocator' mangled-name='_ZN22TCMallocImplementation18SetSystemAllocatorEP12SysAllocator' filepath='src/tcmalloc.cc' line='739' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN22TCMallocImplementation18SetSystemAllocatorEP12SysAllocator'>
-          <parameter type-id='type-id-1333' is-artificial='yes'/>
-          <parameter type-id='type-id-902'/>
+      <member-function access='private' destructor='yes' vtable-offset='-1'>
+        <function-decl name='~SysAllocator' mangled-name='_ZN12SysAllocatorD1Ev' filepath='src/malloc_extension.cc' line='108' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN12SysAllocatorD1Ev'>
+          <parameter type-id='type-id-952' is-artificial='yes'/>
+          <parameter type-id='type-id-1' is-artificial='yes'/>
           <return type-id='type-id-56'/>
         </function-decl>
       </member-function>
-      <member-function access='private' vtable-offset='17'>
-        <function-decl name='ReleaseToSystem' mangled-name='_ZN22TCMallocImplementation15ReleaseToSystemEm' filepath='src/tcmalloc.cc' line='744' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN22TCMallocImplementation15ReleaseToSystemEm'>
-          <parameter type-id='type-id-1333' is-artificial='yes'/>
+      <member-function access='private' vtable-offset='2'>
+        <function-decl name='Alloc' mangled-name='_ZN12SysAllocator5AllocEmPmm' filepath='src/gperftools/malloc_extension.h' line='84' column='1' visibility='default' binding='global' size-in-bits='64'>
+          <parameter type-id='type-id-952' is-artificial='yes'/>
           <parameter type-id='type-id-57'/>
-          <return type-id='type-id-56'/>
-        </function-decl>
-      </member-function>
-      <member-function access='private' vtable-offset='19'>
-        <function-decl name='SetMemoryReleaseRate' mangled-name='_ZN22TCMallocImplementation20SetMemoryReleaseRateEd' filepath='src/tcmalloc.cc' line='769' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN22TCMallocImplementation20SetMemoryReleaseRateEd'>
-          <parameter type-id='type-id-1333' is-artificial='yes'/>
-          <parameter type-id='type-id-2'/>
-          <return type-id='type-id-56'/>
-        </function-decl>
-      </member-function>
-      <member-function access='private' vtable-offset='20'>
-        <function-decl name='GetMemoryReleaseRate' mangled-name='_ZN22TCMallocImplementation20GetMemoryReleaseRateEv' filepath='src/tcmalloc.cc' line='773' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN22TCMallocImplementation20GetMemoryReleaseRateEv'>
-          <parameter type-id='type-id-1333' is-artificial='yes'/>
-          <return type-id='type-id-2'/>
-        </function-decl>
-      </member-function>
-      <member-function access='private' vtable-offset='21'>
-        <function-decl name='GetEstimatedAllocatedSize' mangled-name='_ZN22TCMallocImplementation25GetEstimatedAllocatedSizeEm' filepath='src/tcmalloc.cc' line='776' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN22TCMallocImplementation25GetEstimatedAllocatedSizeEm'>
-          <parameter type-id='type-id-1333' is-artificial='yes'/>
+          <parameter type-id='type-id-230'/>
           <parameter type-id='type-id-57'/>
-          <return type-id='type-id-57'/>
-        </function-decl>
-      </member-function>
-      <member-function access='private' vtable-offset='22'>
-        <function-decl name='GetAllocatedSize' mangled-name='_ZN22TCMallocImplementation16GetAllocatedSizeEPKv' filepath='src/tcmalloc.cc' line='1529' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN22TCMallocImplementation16GetAllocatedSizeEPKv'>
-          <parameter type-id='type-id-1333' is-artificial='yes'/>
-          <parameter type-id='type-id-53'/>
-          <return type-id='type-id-57'/>
-        </function-decl>
-      </member-function>
-      <member-function access='private' vtable-offset='23'>
-        <function-decl name='GetOwnership' mangled-name='_ZN22TCMallocImplementation12GetOwnershipEPKv' filepath='src/tcmalloc.cc' line='794' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN22TCMallocImplementation12GetOwnershipEPKv'>
-          <parameter type-id='type-id-1333' is-artificial='yes'/>
-          <parameter type-id='type-id-53'/>
-          <return type-id='type-id-898'/>
-        </function-decl>
-      </member-function>
-      <member-function access='private' vtable-offset='24'>
-        <function-decl name='GetFreeListSizes' mangled-name='_ZN22TCMallocImplementation16GetFreeListSizesEPSt6vectorIN15MallocExtension12FreeListInfoESaIS2_EE' filepath='src/tcmalloc.cc' line='810' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN22TCMallocImplementation16GetFreeListSizesEPSt6vectorIN15MallocExtension12FreeListInfoESaIS2_EE'>
-          <parameter type-id='type-id-1333' is-artificial='yes'/>
-          <parameter type-id='type-id-903'/>
-          <return type-id='type-id-56'/>
-        </function-decl>
-      </member-function>
-      <member-function access='private' vtable-offset='25'>
-        <function-decl name='ReadStackTraces' mangled-name='_ZN22TCMallocImplementation15ReadStackTracesEPi' filepath='src/tcmalloc.cc' line='605' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN22TCMallocImplementation15ReadStackTracesEPi'>
-          <parameter type-id='type-id-1333' is-artificial='yes'/>
-          <parameter type-id='type-id-897'/>
-          <return type-id='type-id-120'/>
-        </function-decl>
-      </member-function>
-      <member-function access='private' vtable-offset='26'>
-        <function-decl name='ReadHeapGrowthStackTraces' mangled-name='_ZN22TCMallocImplementation25ReadHeapGrowthStackTracesEv' filepath='src/tcmalloc.cc' line='618' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN22TCMallocImplementation25ReadHeapGrowthStackTracesEv'>
-          <parameter type-id='type-id-1333' is-artificial='yes'/>
-          <return type-id='type-id-120'/>
+          <return type-id='type-id-53'/>
         </function-decl>
       </member-function>
     </class-decl>
-    <typedef-decl name='MallocExtensionWriter' type-id='type-id-783' filepath='./src/gperftools/malloc_extension.h' line='68' column='1' id='type-id-1335'/>
-    <class-decl name='TCMallocGuard' size-in-bits='8' visibility='default' filepath='src/tcmalloc_guard.h' line='43' column='1' id='type-id-1336'>
-      <member-function access='private' constructor='yes'>
-        <function-decl name='TCMallocGuard' mangled-name='_ZN13TCMallocGuardC1Ev' filepath='src/tcmalloc_guard.h' line='45' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN13TCMallocGuardC1Ev'>
-          <parameter type-id='type-id-1337' is-artificial='yes'/>
-          <return type-id='type-id-56'/>
-        </function-decl>
-      </member-function>
-      <member-function access='private' destructor='yes'>
-        <function-decl name='~TCMallocGuard' mangled-name='_ZN13TCMallocGuardD1Ev' filepath='src/tcmalloc_guard.h' line='46' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN13TCMallocGuardD1Ev'>
-          <parameter type-id='type-id-1337' is-artificial='yes'/>
-          <parameter type-id='type-id-1' is-artificial='yes'/>
-          <return type-id='type-id-56'/>
-        </function-decl>
-      </member-function>
+    <typedef-decl name='__off_t' type-id='type-id-285' filepath='/usr/include/bits/types.h' line='141' column='1' id='type-id-287'/>
+    <typedef-decl name='_IO_lock_t' type-id='type-id-56' filepath='/usr/include/libio.h' line='180' column='1' id='type-id-1307'/>
+    <typedef-decl name='__off64_t' type-id='type-id-285' filepath='/usr/include/bits/types.h' line='142' column='1' id='type-id-945'/>
+    <typedef-decl name='mbstate_t' type-id='type-id-1308' filepath='/usr/include/wchar.h' line='106' column='1' id='type-id-1309'/>
+    <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-1308'>
+      <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-1310'>
+          <data-member access='private'>
+            <var-decl name='__wch' type-id='type-id-1117' visibility='default' filepath='/usr/include/wchar.h' line='89' column='1'/>
+          </data-member>
+          <data-member access='private'>
+            <var-decl name='__wchb' type-id='type-id-1242' visibility='default' filepath='/usr/include/wchar.h' line='93' column='1'/>
+          </data-member>
+        </union-decl>
+      </member-type>
+      <data-member access='public' layout-offset-in-bits='0'>
+        <var-decl name='__count' type-id='type-id-1' visibility='default' filepath='/usr/include/wchar.h' line='85' column='1'/>
+      </data-member>
+      <data-member access='public' layout-offset-in-bits='32'>
+        <var-decl name='__value' type-id='type-id-1310' visibility='default' filepath='/usr/include/wchar.h' line='94' column='1'/>
+      </data-member>
     </class-decl>
-    <class-decl name='mallinfo' size-in-bits='320' is-struct='yes' visibility='default' filepath='/usr/include/malloc.h' line='94' column='1' id='type-id-1338'>
+    <class-decl name='tm' size-in-bits='448' is-struct='yes' visibility='default' filepath='/usr/include/time.h' line='134' column='1' id='type-id-1311'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='arena' type-id='type-id-1' visibility='default' filepath='/usr/include/malloc.h' line='95' column='1'/>
+        <var-decl name='tm_sec' type-id='type-id-1' visibility='default' filepath='/usr/include/time.h' line='135' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='32'>
-        <var-decl name='ordblks' type-id='type-id-1' visibility='default' filepath='/usr/include/malloc.h' line='96' column='1'/>
+        <var-decl name='tm_min' type-id='type-id-1' visibility='default' filepath='/usr/include/time.h' line='136' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
-        <var-decl name='smblks' type-id='type-id-1' visibility='default' filepath='/usr/include/malloc.h' line='97' column='1'/>
+        <var-decl name='tm_hour' type-id='type-id-1' visibility='default' filepath='/usr/include/time.h' line='137' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='96'>
-        <var-decl name='hblks' type-id='type-id-1' visibility='default' filepath='/usr/include/malloc.h' line='98' column='1'/>
+        <var-decl name='tm_mday' type-id='type-id-1' visibility='default' filepath='/usr/include/time.h' line='138' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
-        <var-decl name='hblkhd' type-id='type-id-1' visibility='default' filepath='/usr/include/malloc.h' line='99' column='1'/>
+        <var-decl name='tm_mon' type-id='type-id-1' visibility='default' filepath='/usr/include/time.h' line='139' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='160'>
-        <var-decl name='usmblks' type-id='type-id-1' visibility='default' filepath='/usr/include/malloc.h' line='100' column='1'/>
+        <var-decl name='tm_year' type-id='type-id-1' visibility='default' filepath='/usr/include/time.h' line='140' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='192'>
-        <var-decl name='fsmblks' type-id='type-id-1' visibility='default' filepath='/usr/include/malloc.h' line='101' column='1'/>
+        <var-decl name='tm_wday' type-id='type-id-1' visibility='default' filepath='/usr/include/time.h' line='141' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='224'>
-        <var-decl name='uordblks' type-id='type-id-1' visibility='default' filepath='/usr/include/malloc.h' line='102' column='1'/>
+        <var-decl name='tm_yday' type-id='type-id-1' visibility='default' filepath='/usr/include/time.h' line='142' column='1'/>
+      </data-member>
+      <data-member access='public' layout-offset-in-bits='256'>
+        <var-decl name='tm_isdst' type-id='type-id-1' visibility='default' filepath='/usr/include/time.h' line='143' column='1'/>
+      </data-member>
+      <data-member access='public' layout-offset-in-bits='320'>
+        <var-decl name='tm_gmtoff' type-id='type-id-285' visibility='default' filepath='/usr/include/time.h' line='146' column='1'/>
+      </data-member>
+      <data-member access='public' layout-offset-in-bits='384'>
+        <var-decl name='tm_zone' type-id='type-id-52' visibility='default' filepath='/usr/include/time.h' line='147' column='1'/>
+      </data-member>
+    </class-decl>
+    <class-decl name='lconv' size-in-bits='768' is-struct='yes' visibility='default' filepath='/usr/include/locale.h' line='55' column='1' id='type-id-1312'>
+      <data-member access='public' layout-offset-in-bits='0'>
+        <var-decl name='decimal_point' type-id='type-id-90' visibility='default' filepath='/usr/include/locale.h' line='58' column='1'/>
+      </data-member>
+      <data-member access='public' layout-offset-in-bits='64'>
+        <var-decl name='thousands_sep' type-id='type-id-90' visibility='default' filepath='/usr/include/locale.h' line='59' column='1'/>
+      </data-member>
+      <data-member access='public' layout-offset-in-bits='128'>
+        <var-decl name='grouping' type-id='type-id-90' visibility='default' filepath='/usr/include/locale.h' line='65' column='1'/>
+      </data-member>
+      <data-member access='public' layout-offset-in-bits='192'>
+        <var-decl name='int_curr_symbol' type-id='type-id-90' visibility='default' filepath='/usr/include/locale.h' line='71' column='1'/>
+      </data-member>
+      <data-member access='public' layout-offset-in-bits='256'>
+        <var-decl name='currency_symbol' type-id='type-id-90' visibility='default' filepath='/usr/include/locale.h' line='72' column='1'/>
+      </data-member>
+      <data-member access='public' layout-offset-in-bits='320'>
+        <var-decl name='mon_decimal_point' type-id='type-id-90' visibility='default' filepath='/usr/include/locale.h' line='73' column='1'/>
+      </data-member>
+      <data-member access='public' layout-offset-in-bits='384'>
+        <var-decl name='mon_thousands_sep' type-id='type-id-90' visibility='default' filepath='/usr/include/locale.h' line='74' column='1'/>
+      </data-member>
+      <data-member access='public' layout-offset-in-bits='448'>
+        <var-decl name='mon_grouping' type-id='type-id-90' visibility='default' filepath='/usr/include/locale.h' line='75' column='1'/>
+      </data-member>
+      <data-member access='public' layout-offset-in-bits='512'>
+        <var-decl name='positive_sign' type-id='type-id-90' visibility='default' filepath='/usr/include/locale.h' line='76' column='1'/>
+      </data-member>
+      <data-member access='public' layout-offset-in-bits='576'>
+        <var-decl name='negative_sign' type-id='type-id-90' visibility='default' filepath='/usr/include/locale.h' line='77' column='1'/>
+      </data-member>
+      <data-member access='public' layout-offset-in-bits='640'>
+        <var-decl name='int_frac_digits' type-id='type-id-66' visibility='default' filepath='/usr/include/locale.h' line='78' column='1'/>
+      </data-member>
+      <data-member access='public' layout-offset-in-bits='648'>
+        <var-decl name='frac_digits' type-id='type-id-66' visibility='default' filepath='/usr/include/locale.h' line='79' column='1'/>
+      </data-member>
+      <data-member access='public' layout-offset-in-bits='656'>
+        <var-decl name='p_cs_precedes' type-id='type-id-66' visibility='default' filepath='/usr/include/locale.h' line='81' column='1'/>
+      </data-member>
+      <data-member access='public' layout-offset-in-bits='664'>
+        <var-decl name='p_sep_by_space' type-id='type-id-66' visibility='default' filepath='/usr/include/locale.h' line='83' column='1'/>
+      </data-member>
+      <data-member access='public' layout-offset-in-bits='672'>
+        <var-decl name='n_cs_precedes' type-id='type-id-66' visibility='default' filepath='/usr/include/locale.h' line='85' column='1'/>
+      </data-member>
+      <data-member access='public' layout-offset-in-bits='680'>
+        <var-decl name='n_sep_by_space' type-id='type-id-66' visibility='default' filepath='/usr/include/locale.h' line='87' column='1'/>
+      </data-member>
+      <data-member access='public' layout-offset-in-bits='688'>
+        <var-decl name='p_sign_posn' type-id='type-id-66' visibility='default' filepath='/usr/include/locale.h' line='94' column='1'/>
+      </data-member>
+      <data-member access='public' layout-offset-in-bits='696'>
+        <var-decl name='n_sign_posn' type-id='type-id-66' visibility='default' filepath='/usr/include/locale.h' line='95' column='1'/>
+      </data-member>
+      <data-member access='public' layout-offset-in-bits='704'>
+        <var-decl name='int_p_cs_precedes' type-id='type-id-66' visibility='default' filepath='/usr/include/locale.h' line='98' column='1'/>
+      </data-member>
+      <data-member access='public' layout-offset-in-bits='712'>
+        <var-decl name='int_p_sep_by_space' type-id='type-id-66' visibility='default' filepath='/usr/include/locale.h' line='100' column='1'/>
+      </data-member>
+      <data-member access='public' layout-offset-in-bits='720'>
+        <var-decl name='int_n_cs_precedes' type-id='type-id-66' visibility='default' filepath='/usr/include/locale.h' line='102' column='1'/>
+      </data-member>
+      <data-member access='public' layout-offset-in-bits='728'>
+        <var-decl name='int_n_sep_by_space' type-id='type-id-66' visibility='default' filepath='/usr/include/locale.h' line='104' column='1'/>
+      </data-member>
+      <data-member access='public' layout-offset-in-bits='736'>
+        <var-decl name='int_p_sign_posn' type-id='type-id-66' visibility='default' filepath='/usr/include/locale.h' line='111' column='1'/>
+      </data-member>
+      <data-member access='public' layout-offset-in-bits='744'>
+        <var-decl name='int_n_sign_posn' type-id='type-id-66' visibility='default' filepath='/usr/include/locale.h' line='112' column='1'/>
+      </data-member>
+    </class-decl>
+    <typedef-decl name='Atomic32' type-id='type-id-114' filepath='./src/base/atomicops-internals-x86.h' line='43' column='1' id='type-id-82'/>
+    <typedef-decl name='int32_t' type-id='type-id-1' filepath='/usr/include/stdint.h' line='39' column='1' id='type-id-114'/>
+    <typedef-decl name='int64_t' type-id='type-id-285' filepath='/usr/include/stdint.h' line='41' column='1' id='type-id-1313'/>
+    <typedef-decl name='uint64_t' type-id='type-id-5' filepath='/usr/include/stdint.h' line='56' column='1' id='type-id-15'/>
+    <typedef-decl name='Length' type-id='type-id-130' filepath='src/common.h' line='59' column='1' id='type-id-1132'/>
+    <typedef-decl name='uintptr_t' type-id='type-id-5' filepath='/usr/include/stdint.h' line='123' column='1' id='type-id-130'/>
+    <typedef-decl name='uint64' type-id='type-id-15' filepath='src/base/basictypes.h' line='72' column='1' id='type-id-94'/>
+    <typedef-decl name='int64' type-id='type-id-1313' filepath='src/base/basictypes.h' line='61' column='1' id='type-id-76'/>
+    <typedef-decl name='int32' type-id='type-id-114' filepath='src/base/basictypes.h' line='60' column='1' id='type-id-65'/>
+    <typedef-decl name='PageID' type-id='type-id-130' filepath='src/common.h' line='56' column='1' id='type-id-1131'/>
+    <class-decl name='SpinLockHolder' size-in-bits='64' visibility='default' filepath='src/base/spinlock.h' line='130' column='1' id='type-id-1314'>
+      <data-member access='private' layout-offset-in-bits='0'>
+        <var-decl name='lock_' type-id='type-id-254' visibility='default' filepath='src/base/spinlock.h' line='132' column='1'/>
+      </data-member>
+      <member-function access='private' constructor='yes'>
+        <function-decl name='SpinLockHolder' mangled-name='_ZN14SpinLockHolderC2EP8SpinLock' filepath='src/base/spinlock.h' line='134' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN14SpinLockHolderC2EP8SpinLock'>
+          <parameter type-id='type-id-1315' is-artificial='yes'/>
+          <parameter type-id='type-id-254'/>
+          <return type-id='type-id-56'/>
+        </function-decl>
+      </member-function>
+      <member-function access='private' destructor='yes'>
+        <function-decl name='~SpinLockHolder' mangled-name='_ZN14SpinLockHolderD1Ev' filepath='src/base/spinlock.h' line='140' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN14SpinLockHolderD1Ev'>
+          <parameter type-id='type-id-1315' is-artificial='yes'/>
+          <parameter type-id='type-id-1' is-artificial='yes'/>
+          <return type-id='type-id-56'/>
+        </function-decl>
+      </member-function>
+    </class-decl>
+    <class-decl name='MallocHook' size-in-bits='8' visibility='default' filepath='./src/gperftools/malloc_hook.h' line='98' column='1' id='type-id-1316'>
+      <member-type access='private'>
+        <typedef-decl name='PreMmapHook' type-id='type-id-899' filepath='./src/gperftools/malloc_hook.h' line='126' column='1' id='type-id-1317'/>
+      </member-type>
+      <member-type access='private'>
+        <typedef-decl name='MmapReplacement' type-id='type-id-901' filepath='./src/gperftools/malloc_hook.h' line='150' column='1' id='type-id-1318'/>
+      </member-type>
+      <member-type access='private'>
+        <typedef-decl name='MunmapReplacement' type-id='type-id-903' filepath='./src/gperftools/malloc_hook.h' line='192' column='1' id='type-id-1319'/>
+      </member-type>
+      <member-type access='private'>
+        <typedef-decl name='MunmapHook' type-id='type-id-904' filepath='./src/gperftools/malloc_hook.h' line='204' column='1' id='type-id-1320'/>
+      </member-type>
+      <member-type access='private'>
+        <typedef-decl name='MremapHook' type-id='type-id-906' filepath='./src/gperftools/malloc_hook.h' line='214' column='1' id='type-id-1321'/>
+      </member-type>
+      <member-type access='private'>
+        <typedef-decl name='PreSbrkHook' type-id='type-id-908' filepath='./src/gperftools/malloc_hook.h' line='234' column='1' id='type-id-1322'/>
+      </member-type>
+      <member-type access='private'>
+        <typedef-decl name='NewHook' type-id='type-id-364' filepath='./src/gperftools/malloc_hook.h' line='102' column='1' id='type-id-1323'/>
+      </member-type>
+      <member-type access='private'>
+        <typedef-decl name='DeleteHook' type-id='type-id-365' filepath='./src/gperftools/malloc_hook.h' line='113' column='1' id='type-id-1324'/>
+      </member-type>
+      <member-type access='private'>
+        <typedef-decl name='MmapHook' type-id='type-id-367' filepath='./src/gperftools/malloc_hook.h' line='168' column='1' id='type-id-1325'/>
+      </member-type>
+      <member-type access='private'>
+        <typedef-decl name='SbrkHook' type-id='type-id-369' filepath='./src/gperftools/malloc_hook.h' line='247' column='1' id='type-id-1326'/>
+      </member-type>
+      <member-function access='private' static='yes'>
+        <function-decl name='InvokeNewHook' mangled-name='_ZN10MallocHook13InvokeNewHookEPKvm' filepath='./src/gperftools/malloc_hook.h' line='109' column='1' visibility='default' binding='global' size-in-bits='64'>
+          <parameter type-id='type-id-53'/>
+          <parameter type-id='type-id-57'/>
+          <return type-id='type-id-56'/>
+        </function-decl>
+      </member-function>
+      <member-function access='private' static='yes'>
+        <function-decl name='InvokeDeleteHook' mangled-name='_ZN10MallocHook16InvokeDeleteHookEPKv' filepath='./src/gperftools/malloc_hook.h' line='120' column='1' visibility='default' binding='global' size-in-bits='64'>
+          <parameter type-id='type-id-53'/>
+          <return type-id='type-id-56'/>
+        </function-decl>
+      </member-function>
+      <member-function access='private' static='yes'>
+        <function-decl name='AddNewHook' mangled-name='_ZN10MallocHook10AddNewHookEPFvPKvmE' filepath='./src/gperftools/malloc_hook.h' line='103' column='1' visibility='default' binding='global' size-in-bits='64'>
+          <parameter type-id='type-id-1323'/>
+          <return type-id='type-id-55'/>
+        </function-decl>
+      </member-function>
+      <member-function access='private' static='yes'>
+        <function-decl name='RemoveNewHook' mangled-name='_ZN10MallocHook13RemoveNewHookEPFvPKvmE' filepath='./src/gperftools/malloc_hook.h' line='106' column='1' visibility='default' binding='global' size-in-bits='64'>
+          <parameter type-id='type-id-1323'/>
+          <return type-id='type-id-55'/>
+        </function-decl>
+      </member-function>
+      <member-function access='private' static='yes'>
+        <function-decl name='AddDeleteHook' mangled-name='_ZN10MallocHook13AddDeleteHookEPFvPKvE' filepath='./src/gperftools/malloc_hook.h' line='114' column='1' visibility='default' binding='global' size-in-bits='64'>
+          <parameter type-id='type-id-1324'/>
+          <return type-id='type-id-55'/>
+        </function-decl>
+      </member-function>
+      <member-function access='private' static='yes'>
+        <function-decl name='RemoveDeleteHook' mangled-name='_ZN10MallocHook16RemoveDeleteHookEPFvPKvE' filepath='./src/gperftools/malloc_hook.h' line='117' column='1' visibility='default' binding='global' size-in-bits='64'>
+          <parameter type-id='type-id-1324'/>
+          <return type-id='type-id-55'/>
+        </function-decl>
+      </member-function>
+      <member-function access='private' static='yes'>
+        <function-decl name='GetNewHook' mangled-name='_ZN10MallocHook10GetNewHookEv' filepath='./src/gperftools/malloc_hook.h' line='275' column='1' visibility='default' binding='global' size-in-bits='64'>
+          <return type-id='type-id-1323'/>
+        </function-decl>
+      </member-function>
+      <member-function access='private' static='yes'>
+        <function-decl name='SetNewHook' mangled-name='_ZN10MallocHook10SetNewHookEPFvPKvmE' filepath='./src/gperftools/malloc_hook.h' line='276' column='1' visibility='default' binding='global' size-in-bits='64'>
+          <parameter type-id='type-id-1323'/>
+          <return type-id='type-id-1323'/>
+        </function-decl>
+      </member-function>
+      <member-function access='private' static='yes'>
+        <function-decl name='GetDeleteHook' mangled-name='_ZN10MallocHook13GetDeleteHookEv' filepath='./src/gperftools/malloc_hook.h' line='280' column='1' visibility='default' binding='global' size-in-bits='64'>
+          <return type-id='type-id-1324'/>
+        </function-decl>
+      </member-function>
+      <member-function access='private' static='yes'>
+        <function-decl name='SetDeleteHook' mangled-name='_ZN10MallocHook13SetDeleteHookEPFvPKvE' filepath='./src/gperftools/malloc_hook.h' line='281' column='1' visibility='default' binding='global' size-in-bits='64'>
+          <parameter type-id='type-id-1324'/>
+          <return type-id='type-id-1324'/>
+        </function-decl>
+      </member-function>
+      <member-function access='private' static='yes'>
+        <function-decl name='GetMmapHook' mangled-name='_ZN10MallocHook11GetMmapHookEv' filepath='./src/gperftools/malloc_hook.h' line='290' column='1' visibility='default' binding='global' size-in-bits='64'>
+          <return type-id='type-id-1325'/>
+        </function-decl>
+      </member-function>
+      <member-function access='private' static='yes'>
+        <function-decl name='GetSbrkHook' mangled-name='_ZN10MallocHook11GetSbrkHookEv' filepath='./src/gperftools/malloc_hook.h' line='310' column='1' visibility='default' binding='global' size-in-bits='64'>
+          <return type-id='type-id-1326'/>
+        </function-decl>
+      </member-function>
+      <member-function access='private' static='yes'>
+        <function-decl name='RemovePreMmapHook' mangled-name='_ZN10MallocHook17RemovePreMmapHookEPFvPKvmiiilE' filepath='./src/gperftools/malloc_hook.h' line='130' column='1' visibility='default' binding='global' size-in-bits='64'>
+          <parameter type-id='type-id-1317'/>
+          <return type-id='type-id-55'/>
+        </function-decl>
+      </member-function>
+      <member-function access='private' static='yes'>
+        <function-decl name='InvokePreMmapHook' mangled-name='_ZN10MallocHook17InvokePreMmapHookEPKvmiiil' filepath='./src/gperftools/malloc_hook.h' line='133' column='1' visibility='default' binding='global' size-in-bits='64'>
+          <parameter type-id='type-id-53'/>
+          <parameter type-id='type-id-57'/>
+          <parameter type-id='type-id-1'/>
+          <parameter type-id='type-id-1'/>
+          <parameter type-id='type-id-1'/>
+          <parameter type-id='type-id-185'/>
+          <return type-id='type-id-56'/>
+        </function-decl>
+      </member-function>
+      <member-function access='private' static='yes'>
+        <function-decl name='InvokeMmapReplacement' mangled-name='_ZN10MallocHook21InvokeMmapReplacementEPKvmiiilPPv' filepath='./src/gperftools/malloc_hook.h' line='157' column='1' visibility='default' binding='global' size-in-bits='64'>
+          <parameter type-id='type-id-53'/>
+          <parameter type-id='type-id-57'/>
+          <parameter type-id='type-id-1'/>
+          <parameter type-id='type-id-1'/>
+          <parameter type-id='type-id-1'/>
+          <parameter type-id='type-id-185'/>
+          <parameter type-id='type-id-120'/>
+          <return type-id='type-id-55'/>
+        </function-decl>
+      </member-function>
+      <member-function access='private' static='yes'>
+        <function-decl name='InvokeMmapHook' mangled-name='_ZN10MallocHook14InvokeMmapHookEPKvS1_miiil' filepath='./src/gperftools/malloc_hook.h' line='175' column='1' visibility='default' binding='global' size-in-bits='64'>
+          <parameter type-id='type-id-53'/>
+          <parameter type-id='type-id-53'/>
+          <parameter type-id='type-id-57'/>
+          <parameter type-id='type-id-1'/>
+          <parameter type-id='type-id-1'/>
+          <parameter type-id='type-id-1'/>
+          <parameter type-id='type-id-185'/>
+          <return type-id='type-id-56'/>
+        </function-decl>
+      </member-function>
+      <member-function access='private' static='yes'>
+        <function-decl name='InvokeMunmapReplacement' mangled-name='_ZN10MallocHook23InvokeMunmapReplacementEPKvmPi' filepath='./src/gperftools/malloc_hook.h' line='199' column='1' visibility='default' binding='global' size-in-bits='64'>
+          <parameter type-id='type-id-53'/>
+          <parameter type-id='type-id-57'/>
+          <parameter type-id='type-id-897'/>
+          <return type-id='type-id-55'/>
+        </function-decl>
+      </member-function>
+      <member-function access='private' static='yes'>
+        <function-decl name='InvokeMunmapHook' mangled-name='_ZN10MallocHook16InvokeMunmapHookEPKvm' filepath='./src/gperftools/malloc_hook.h' line='211' column='1' visibility='default' binding='global' size-in-bits='64'>
+          <parameter type-id='type-id-53'/>
+          <parameter type-id='type-id-57'/>
+          <return type-id='type-id-56'/>
+        </function-decl>
+      </member-function>
+      <member-function access='private' static='yes'>
+        <function-decl name='InvokeMremapHook' mangled-name='_ZN10MallocHook16InvokeMremapHookEPKvS1_mmiS1_' filepath='./src/gperftools/malloc_hook.h' line='221' column='1' visibility='default' binding='global' size-in-bits='64'>
+          <parameter type-id='type-id-53'/>
+          <parameter type-id='type-id-53'/>
+          <parameter type-id='type-id-57'/>
+          <parameter type-id='type-id-57'/>
+          <parameter type-id='type-id-1'/>
+          <parameter type-id='type-id-53'/>
+          <return type-id='type-id-56'/>
+        </function-decl>
+      </member-function>
+      <member-function access='private' static='yes'>
+        <function-decl name='RemovePreSbrkHook' mangled-name='_ZN10MallocHook17RemovePreSbrkHookEPFvlE' filepath='./src/gperftools/malloc_hook.h' line='238' column='1' visibility='default' binding='global' size-in-bits='64'>
+          <parameter type-id='type-id-1322'/>
+          <return type-id='type-id-55'/>
+        </function-decl>
+      </member-function>
+      <member-function access='private' static='yes'>
+        <function-decl name='InvokePreSbrkHook' mangled-name='_ZN10MallocHook17InvokePreSbrkHookEl' filepath='./src/gperftools/malloc_hook.h' line='241' column='1' visibility='default' binding='global' size-in-bits='64'>
+          <parameter type-id='type-id-186'/>
+          <return type-id='type-id-56'/>
+        </function-decl>
+      </member-function>
+      <member-function access='private' static='yes'>
+        <function-decl name='InvokeSbrkHook' mangled-name='_ZN10MallocHook14InvokeSbrkHookEPKvl' filepath='./src/gperftools/malloc_hook.h' line='254' column='1' visibility='default' binding='global' size-in-bits='64'>
+          <parameter type-id='type-id-53'/>
+          <parameter type-id='type-id-186'/>
+          <return type-id='type-id-56'/>
+        </function-decl>
+      </member-function>
+      <member-function access='private' static='yes'>
+        <function-decl name='UnhookedMMap' mangled-name='_ZN10MallocHook12UnhookedMMapEPvmiiil' filepath='./src/gperftools/malloc_hook.h' line='270' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN10MallocHook12UnhookedMMapEPvmiiil'>
+          <parameter type-id='type-id-53'/>
+          <parameter type-id='type-id-57'/>
+          <parameter type-id='type-id-1'/>
+          <parameter type-id='type-id-1'/>
+          <parameter type-id='type-id-1'/>
+          <parameter type-id='type-id-185'/>
+          <return type-id='type-id-53'/>
+        </function-decl>
+      </member-function>
+      <member-function access='private' static='yes'>
+        <function-decl name='UnhookedMUnmap' mangled-name='_ZN10MallocHook14UnhookedMUnmapEPvm' filepath='./src/gperftools/malloc_hook.h' line='272' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN10MallocHook14UnhookedMUnmapEPvm'>
+          <parameter type-id='type-id-53'/>
+          <parameter type-id='type-id-57'/>
+          <return type-id='type-id-1'/>
+        </function-decl>
+      </member-function>
+      <member-function access='private' static='yes'>
+        <function-decl name='InvokeNewHookSlow' mangled-name='_ZN10MallocHook17InvokeNewHookSlowEPKvm' filepath='./src/gperftools/malloc_hook.h' line='318' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN10MallocHook17InvokeNewHookSlowEPKvm'>
+          <parameter type-id='type-id-53'/>
+          <parameter type-id='type-id-57'/>
+          <return type-id='type-id-56'/>
+        </function-decl>
+      </member-function>
+      <member-function access='private' static='yes'>
+        <function-decl name='InvokeDeleteHookSlow' mangled-name='_ZN10MallocHook20InvokeDeleteHookSlowEPKv' filepath='./src/gperftools/malloc_hook.h' line='319' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN10MallocHook20InvokeDeleteHookSlowEPKv'>
+          <parameter type-id='type-id-53'/>
+          <return type-id='type-id-56'/>
+        </function-decl>
+      </member-function>
+      <member-function access='private' static='yes'>
+        <function-decl name='InvokePreMmapHookSlow' mangled-name='_ZN10MallocHook21InvokePreMmapHookSlowEPKvmiiil' filepath='./src/gperftools/malloc_hook.h' line='320' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN10MallocHook21InvokePreMmapHookSlowEPKvmiiil'>
+          <parameter type-id='type-id-53'/>
+          <parameter type-id='type-id-57'/>
+          <parameter type-id='type-id-1'/>
+          <parameter type-id='type-id-1'/>
+          <parameter type-id='type-id-1'/>
+          <parameter type-id='type-id-185'/>
+          <return type-id='type-id-56'/>
+        </function-decl>
+      </member-function>
+      <member-function access='private' static='yes'>
+        <function-decl name='InvokeMmapHookSlow' mangled-name='_ZN10MallocHook18InvokeMmapHookSlowEPKvS1_miiil' filepath='./src/gperftools/malloc_hook.h' line='326' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN10MallocHook18InvokeMmapHookSlowEPKvS1_miiil'>
+          <parameter type-id='type-id-53'/>
+          <parameter type-id='type-id-53'/>
+          <parameter type-id='type-id-57'/>
+          <parameter type-id='type-id-1'/>
+          <parameter type-id='type-id-1'/>
+          <parameter type-id='type-id-1'/>
+          <parameter type-id='type-id-185'/>
+          <return type-id='type-id-56'/>
+        </function-decl>
+      </member-function>
+      <member-function access='private' static='yes'>
+        <function-decl name='InvokeMmapReplacementSlow' mangled-name='_ZN10MallocHook25InvokeMmapReplacementSlowEPKvmiiilPPv' filepath='./src/gperftools/malloc_hook.h' line='333' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN10MallocHook25InvokeMmapReplacementSlowEPKvmiiilPPv'>
+          <parameter type-id='type-id-53'/>
+          <parameter type-id='type-id-57'/>
+          <parameter type-id='type-id-1'/>
+          <parameter type-id='type-id-1'/>
+          <parameter type-id='type-id-1'/>
+          <parameter type-id='type-id-185'/>
+          <parameter type-id='type-id-120'/>
+          <return type-id='type-id-55'/>
+        </function-decl>
+      </member-function>
+      <member-function access='private' static='yes'>
+        <function-decl name='InvokeMunmapHookSlow' mangled-name='_ZN10MallocHook20InvokeMunmapHookSlowEPKvm' filepath='./src/gperftools/malloc_hook.h' line='340' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN10MallocHook20InvokeMunmapHookSlowEPKvm'>
+          <parameter type-id='type-id-53'/>
+          <parameter type-id='type-id-57'/>
+          <return type-id='type-id-56'/>
+        </function-decl>
+      </member-function>
+      <member-function access='private' static='yes'>
+        <function-decl name='InvokeMunmapReplacementSlow' mangled-name='_ZN10MallocHook27InvokeMunmapReplacementSlowEPKvmPi' filepath='./src/gperftools/malloc_hook.h' line='341' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN10MallocHook27InvokeMunmapReplacementSlowEPKvmPi'>
+          <parameter type-id='type-id-53'/>
+          <parameter type-id='type-id-57'/>
+          <parameter type-id='type-id-897'/>
+          <return type-id='type-id-55'/>
+        </function-decl>
+      </member-function>
+      <member-function access='private' static='yes'>
+        <function-decl name='InvokeMremapHookSlow' mangled-name='_ZN10MallocHook20InvokeMremapHookSlowEPKvS1_mmiS1_' filepath='./src/gperftools/malloc_hook.h' line='344' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN10MallocHook20InvokeMremapHookSlowEPKvS1_mmiS1_'>
+          <parameter type-id='type-id-53'/>
+          <parameter type-id='type-id-53'/>
+          <parameter type-id='type-id-57'/>
+          <parameter type-id='type-id-57'/>
+          <parameter type-id='type-id-1'/>
+          <parameter type-id='type-id-53'/>
+          <return type-id='type-id-56'/>
+        </function-decl>
+      </member-function>
+      <member-function access='private' static='yes'>
+        <function-decl name='InvokePreSbrkHookSlow' mangled-name='_ZN10MallocHook21InvokePreSbrkHookSlowEl' filepath='./src/gperftools/malloc_hook.h' line='350' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN10MallocHook21InvokePreSbrkHookSlowEl'>
+          <parameter type-id='type-id-186'/>
+          <return type-id='type-id-56'/>
+        </function-decl>
+      </member-function>
+      <member-function access='private' static='yes'>
+        <function-decl name='InvokeSbrkHookSlow' mangled-name='_ZN10MallocHook18InvokeSbrkHookSlowEPKvl' filepath='./src/gperftools/malloc_hook.h' line='351' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN10MallocHook18InvokeSbrkHookSlowEPKvl'>
+          <parameter type-id='type-id-53'/>
+          <parameter type-id='type-id-186'/>
+          <return type-id='type-id-56'/>
+        </function-decl>
+      </member-function>
+      <member-function access='private' static='yes'>
+        <function-decl name='GetCallerStackTrace' mangled-name='_ZN10MallocHook19GetCallerStackTraceEPPvii' filepath='./src/gperftools/malloc_hook.h' line='261' column='1' visibility='default' binding='global' size-in-bits='64'>
+          <parameter type-id='type-id-120'/>
+          <parameter type-id='type-id-1'/>
+          <parameter type-id='type-id-1'/>
+          <return type-id='type-id-1'/>
+        </function-decl>
+      </member-function>
+      <member-function access='private' static='yes'>
+        <function-decl name='AddMmapHook' mangled-name='_ZN10MallocHook11AddMmapHookEPFvPKvS1_miiilE' filepath='./src/gperftools/malloc_hook.h' line='169' column='1' visibility='default' binding='global' size-in-bits='64'>
+          <parameter type-id='type-id-1325'/>
+          <return type-id='type-id-55'/>
+        </function-decl>
+      </member-function>
+      <member-function access='private' static='yes'>
+        <function-decl name='RemoveMmapHook' mangled-name='_ZN10MallocHook14RemoveMmapHookEPFvPKvS1_miiilE' filepath='./src/gperftools/malloc_hook.h' line='172' column='1' visibility='default' binding='global' size-in-bits='64'>
+          <parameter type-id='type-id-1325'/>
+          <return type-id='type-id-55'/>
+        </function-decl>
+      </member-function>
+      <member-function access='private' static='yes'>
+        <function-decl name='AddMunmapHook' mangled-name='_ZN10MallocHook13AddMunmapHookEPFvPKvmE' filepath='./src/gperftools/malloc_hook.h' line='205' column='1' visibility='default' binding='global' size-in-bits='64'>
+          <parameter type-id='type-id-1320'/>
+          <return type-id='type-id-55'/>
+        </function-decl>
+      </member-function>
+      <member-function access='private' static='yes'>
+        <function-decl name='RemoveMunmapHook' mangled-name='_ZN10MallocHook16RemoveMunmapHookEPFvPKvmE' filepath='./src/gperftools/malloc_hook.h' line='208' column='1' visibility='default' binding='global' size-in-bits='64'>
+          <parameter type-id='type-id-1320'/>
+          <return type-id='type-id-55'/>
+        </function-decl>
+      </member-function>
+      <member-function access='private' static='yes'>
+        <function-decl name='AddMremapHook' mangled-name='_ZN10MallocHook13AddMremapHookEPFvPKvS1_mmiS1_E' filepath='./src/gperftools/malloc_hook.h' line='215' column='1' visibility='default' binding='global' size-in-bits='64'>
+          <parameter type-id='type-id-1321'/>
+          <return type-id='type-id-55'/>
+        </function-decl>
+      </member-function>
+      <member-function access='private' static='yes'>
+        <function-decl name='RemoveMremapHook' mangled-name='_ZN10MallocHook16RemoveMremapHookEPFvPKvS1_mmiS1_E' filepath='./src/gperftools/malloc_hook.h' line='218' column='1' visibility='default' binding='global' size-in-bits='64'>
+          <parameter type-id='type-id-1321'/>
+          <return type-id='type-id-55'/>
+        </function-decl>
+      </member-function>
+      <member-function access='private' static='yes'>
+        <function-decl name='AddSbrkHook' mangled-name='_ZN10MallocHook11AddSbrkHookEPFvPKvlE' filepath='./src/gperftools/malloc_hook.h' line='248' column='1' visibility='default' binding='global' size-in-bits='64'>
+          <parameter type-id='type-id-1326'/>
+          <return type-id='type-id-55'/>
+        </function-decl>
+      </member-function>
+      <member-function access='private' static='yes'>
+        <function-decl name='RemoveSbrkHook' mangled-name='_ZN10MallocHook14RemoveSbrkHookEPFvPKvlE' filepath='./src/gperftools/malloc_hook.h' line='251' column='1' visibility='default' binding='global' size-in-bits='64'>
+          <parameter type-id='type-id-1326'/>
+          <return type-id='type-id-55'/>
+        </function-decl>
+      </member-function>
+    </class-decl>
+    <typedef-decl name='uint32_t' type-id='type-id-1117' filepath='/usr/include/stdint.h' line='52' column='1' id='type-id-12'/>
+    <typedef-decl name='pthread_key_t' type-id='type-id-1117' filepath='/usr/include/bits/pthreadtypes.h' line='140' column='1' id='type-id-946'/>
+    <typedef-decl name='ssize_t' type-id='type-id-1327' filepath='/usr/include/stdio.h' line='103' column='1' id='type-id-255'/>
+    <typedef-decl name='__ssize_t' type-id='type-id-285' filepath='/usr/include/bits/types.h' line='180' column='1' id='type-id-1327'/>
+    <typedef-decl name='pthread_t' type-id='type-id-5' filepath='/usr/include/bits/pthreadtypes.h' line='50' column='1' id='type-id-177'/>
+    <class-decl name='TCMallocStats' size-in-bits='512' is-struct='yes' visibility='default' filepath='src/tcmalloc.cc' line='295' column='1' id='type-id-1328'>
+      <data-member access='public' layout-offset-in-bits='0'>
+        <var-decl name='thread_bytes' type-id='type-id-15' visibility='default' filepath='src/tcmalloc.cc' line='296' column='1'/>
+      </data-member>
+      <data-member access='public' layout-offset-in-bits='64'>
+        <var-decl name='central_bytes' type-id='type-id-15' visibility='default' filepath='src/tcmalloc.cc' line='297' column='1'/>
+      </data-member>
+      <data-member access='public' layout-offset-in-bits='128'>
+        <var-decl name='transfer_bytes' type-id='type-id-15' visibility='default' filepath='src/tcmalloc.cc' line='298' column='1'/>
+      </data-member>
+      <data-member access='public' layout-offset-in-bits='192'>
+        <var-decl name='metadata_bytes' type-id='type-id-15' visibility='default' filepath='src/tcmalloc.cc' line='299' column='1'/>
+      </data-member>
+      <data-member access='public' layout-offset-in-bits='256'>
+        <var-decl name='pageheap' type-id='type-id-1329' visibility='default' filepath='src/tcmalloc.cc' line='300' column='1'/>
+      </data-member>
+    </class-decl>
+    <typedef-decl name='AtomicWord' type-id='type-id-73' filepath='./src/base/atomicops.h' line='129' column='1' id='type-id-781'/>
+    <typedef-decl name='intptr_t' type-id='type-id-285' filepath='/usr/include/stdint.h' line='120' column='1' id='type-id-73'/>
+    <class-decl name='TCMallocImplementation' size-in-bits='128' visibility='default' filepath='src/tcmalloc.cc' line='562' column='1' id='type-id-1330'>
+      <base-class access='public' layout-offset-in-bits='0' type-id='type-id-894'/>
+      <member-type access='private'>
+        <typedef-decl name='RangeFunction' type-id='type-id-1300' filepath='./src/gperftools/malloc_extension.h' line='143' column='1' id='type-id-1331'/>
+      </member-type>
+      <data-member access='private' layout-offset-in-bits='64'>
+        <var-decl name='extra_bytes_released_' type-id='type-id-57' visibility='default' filepath='src/tcmalloc.cc' line='570' column='1'/>
+      </data-member>
+      <member-function access='private' constructor='yes'>
+        <function-decl name='TCMallocImplementation' filepath='src/tcmalloc.cc' line='573' column='1' visibility='default' binding='global' size-in-bits='64'>
+          <parameter type-id='type-id-1332' is-artificial='yes'/>
+          <return type-id='type-id-56'/>
+        </function-decl>
+      </member-function>
+      <member-function access='private' vtable-offset='7'>
+        <function-decl name='GetStats' mangled-name='_ZN22TCMallocImplementation8GetStatsEPci' filepath='src/tcmalloc.cc' line='577' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN22TCMallocImplementation8GetStatsEPci'>
+          <parameter type-id='type-id-1332' is-artificial='yes'/>
+          <parameter type-id='type-id-90'/>
+          <parameter type-id='type-id-1'/>
+          <return type-id='type-id-56'/>
+        </function-decl>
+      </member-function>
+      <member-function access='private' vtable-offset='8'>
+        <function-decl name='GetHeapSample' mangled-name='_ZN22TCMallocImplementation13GetHeapSampleEPSs' filepath='src/tcmalloc.cc' line='590' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN22TCMallocImplementation13GetHeapSampleEPSs'>
+          <parameter type-id='type-id-1332' is-artificial='yes'/>
+          <parameter type-id='type-id-1301'/>
+          <return type-id='type-id-56'/>
+        </function-decl>
+      </member-function>
+      <member-function access='private' vtable-offset='10'>
+        <function-decl name='Ranges' mangled-name='_ZN22TCMallocImplementation6RangesEPvPFvS0_PKN4base11MallocRangeEE' filepath='src/tcmalloc.cc' line='622' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN22TCMallocImplementation6RangesEPvPFvS0_PKN4base11MallocRangeEE'>
+          <parameter type-id='type-id-1332' is-artificial='yes'/>
+          <parameter type-id='type-id-53'/>
+          <parameter type-id='type-id-1333'/>
+          <return type-id='type-id-56'/>
+        </function-decl>
+      </member-function>
+      <member-function access='private' vtable-offset='11'>
+        <function-decl name='GetNumericProperty' mangled-name='_ZN22TCMallocImplementation18GetNumericPropertyEPKcPm' filepath='src/tcmalloc.cc' line='626' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN22TCMallocImplementation18GetNumericPropertyEPKcPm'>
+          <parameter type-id='type-id-1332' is-artificial='yes'/>
+          <parameter type-id='type-id-52'/>
+          <parameter type-id='type-id-230'/>
+          <return type-id='type-id-55'/>
+        </function-decl>
+      </member-function>
+      <member-function access='private' vtable-offset='12'>
+        <function-decl name='SetNumericProperty' mangled-name='_ZN22TCMallocImplementation18SetNumericPropertyEPKcm' filepath='src/tcmalloc.cc' line='711' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN22TCMallocImplementation18SetNumericPropertyEPKcm'>
+          <parameter type-id='type-id-1332' is-artificial='yes'/>
+          <parameter type-id='type-id-52'/>
+          <parameter type-id='type-id-57'/>
+          <return type-id='type-id-55'/>
+        </function-decl>
+      </member-function>
+      <member-function access='private' vtable-offset='13'>
+        <function-decl name='MarkThreadIdle' mangled-name='_ZN22TCMallocImplementation14MarkThreadIdleEv' filepath='src/tcmalloc.cc' line='728' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN22TCMallocImplementation14MarkThreadIdleEv'>
+          <parameter type-id='type-id-1332' is-artificial='yes'/>
+          <return type-id='type-id-56'/>
+        </function-decl>
+      </member-function>
+      <member-function access='private' vtable-offset='14'>
+        <function-decl name='MarkThreadBusy' mangled-name='_ZN22TCMallocImplementation14MarkThreadBusyEv' filepath='src/tcmalloc.cc' line='1537' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN22TCMallocImplementation14MarkThreadBusyEv'>
+          <parameter type-id='type-id-1332' is-artificial='yes'/>
+          <return type-id='type-id-56'/>
+        </function-decl>
+      </member-function>
+      <member-function access='private' vtable-offset='15'>
+        <function-decl name='GetSystemAllocator' mangled-name='_ZN22TCMallocImplementation18GetSystemAllocatorEv' filepath='src/tcmalloc.cc' line='734' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN22TCMallocImplementation18GetSystemAllocatorEv'>
+          <parameter type-id='type-id-1332' is-artificial='yes'/>
+          <return type-id='type-id-952'/>
+        </function-decl>
+      </member-function>
+      <member-function access='private' vtable-offset='16'>
+        <function-decl name='SetSystemAllocator' mangled-name='_ZN22TCMallocImplementation18SetSystemAllocatorEP12SysAllocator' filepath='src/tcmalloc.cc' line='739' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN22TCMallocImplementation18SetSystemAllocatorEP12SysAllocator'>
+          <parameter type-id='type-id-1332' is-artificial='yes'/>
+          <parameter type-id='type-id-952'/>
+          <return type-id='type-id-56'/>
+        </function-decl>
+      </member-function>
+      <member-function access='private' vtable-offset='17'>
+        <function-decl name='ReleaseToSystem' mangled-name='_ZN22TCMallocImplementation15ReleaseToSystemEm' filepath='src/tcmalloc.cc' line='744' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN22TCMallocImplementation15ReleaseToSystemEm'>
+          <parameter type-id='type-id-1332' is-artificial='yes'/>
+          <parameter type-id='type-id-57'/>
+          <return type-id='type-id-56'/>
+        </function-decl>
+      </member-function>
+      <member-function access='private' vtable-offset='19'>
+        <function-decl name='SetMemoryReleaseRate' mangled-name='_ZN22TCMallocImplementation20SetMemoryReleaseRateEd' filepath='src/tcmalloc.cc' line='769' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN22TCMallocImplementation20SetMemoryReleaseRateEd'>
+          <parameter type-id='type-id-1332' is-artificial='yes'/>
+          <parameter type-id='type-id-2'/>
+          <return type-id='type-id-56'/>
+        </function-decl>
+      </member-function>
+      <member-function access='private' vtable-offset='20'>
+        <function-decl name='GetMemoryReleaseRate' mangled-name='_ZN22TCMallocImplementation20GetMemoryReleaseRateEv' filepath='src/tcmalloc.cc' line='773' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN22TCMallocImplementation20GetMemoryReleaseRateEv'>
+          <parameter type-id='type-id-1332' is-artificial='yes'/>
+          <return type-id='type-id-2'/>
+        </function-decl>
+      </member-function>
+      <member-function access='private' vtable-offset='21'>
+        <function-decl name='GetEstimatedAllocatedSize' mangled-name='_ZN22TCMallocImplementation25GetEstimatedAllocatedSizeEm' filepath='src/tcmalloc.cc' line='776' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN22TCMallocImplementation25GetEstimatedAllocatedSizeEm'>
+          <parameter type-id='type-id-1332' is-artificial='yes'/>
+          <parameter type-id='type-id-57'/>
+          <return type-id='type-id-57'/>
+        </function-decl>
+      </member-function>
+      <member-function access='private' vtable-offset='22'>
+        <function-decl name='GetAllocatedSize' mangled-name='_ZN22TCMallocImplementation16GetAllocatedSizeEPKv' filepath='src/tcmalloc.cc' line='1529' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN22TCMallocImplementation16GetAllocatedSizeEPKv'>
+          <parameter type-id='type-id-1332' is-artificial='yes'/>
+          <parameter type-id='type-id-53'/>
+          <return type-id='type-id-57'/>
+        </function-decl>
+      </member-function>
+      <member-function access='private' vtable-offset='23'>
+        <function-decl name='GetOwnership' mangled-name='_ZN22TCMallocImplementation12GetOwnershipEPKv' filepath='src/tcmalloc.cc' line='794' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN22TCMallocImplementation12GetOwnershipEPKv'>
+          <parameter type-id='type-id-1332' is-artificial='yes'/>
+          <parameter type-id='type-id-53'/>
+          <return type-id='type-id-1298'/>
+        </function-decl>
+      </member-function>
+      <member-function access='private' vtable-offset='24'>
+        <function-decl name='GetFreeListSizes' mangled-name='_ZN22TCMallocImplementation16GetFreeListSizesEPSt6vectorIN15MallocExtension12FreeListInfoESaIS2_EE' filepath='src/tcmalloc.cc' line='810' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN22TCMallocImplementation16GetFreeListSizesEPSt6vectorIN15MallocExtension12FreeListInfoESaIS2_EE'>
+          <parameter type-id='type-id-1332' is-artificial='yes'/>
+          <parameter type-id='type-id-1302'/>
+          <return type-id='type-id-56'/>
+        </function-decl>
+      </member-function>
+      <member-function access='private' vtable-offset='25'>
+        <function-decl name='ReadStackTraces' mangled-name='_ZN22TCMallocImplementation15ReadStackTracesEPi' filepath='src/tcmalloc.cc' line='605' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN22TCMallocImplementation15ReadStackTracesEPi'>
+          <parameter type-id='type-id-1332' is-artificial='yes'/>
+          <parameter type-id='type-id-897'/>
+          <return type-id='type-id-120'/>
+        </function-decl>
+      </member-function>
+      <member-function access='private' vtable-offset='26'>
+        <function-decl name='ReadHeapGrowthStackTraces' mangled-name='_ZN22TCMallocImplementation25ReadHeapGrowthStackTracesEv' filepath='src/tcmalloc.cc' line='618' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN22TCMallocImplementation25ReadHeapGrowthStackTracesEv'>
+          <parameter type-id='type-id-1332' is-artificial='yes'/>
+          <return type-id='type-id-120'/>
+        </function-decl>
+      </member-function>
+    </class-decl>
+    <typedef-decl name='MallocExtensionWriter' type-id='type-id-783' filepath='./src/gperftools/malloc_extension.h' line='68' column='1' id='type-id-1334'/>
+    <class-decl name='TCMallocGuard' size-in-bits='8' visibility='default' filepath='src/tcmalloc_guard.h' line='43' column='1' id='type-id-1335'>
+      <member-function access='private' constructor='yes'>
+        <function-decl name='TCMallocGuard' mangled-name='_ZN13TCMallocGuardC1Ev' filepath='src/tcmalloc_guard.h' line='45' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN13TCMallocGuardC1Ev'>
+          <parameter type-id='type-id-1336' is-artificial='yes'/>
+          <return type-id='type-id-56'/>
+        </function-decl>
+      </member-function>
+      <member-function access='private' destructor='yes'>
+        <function-decl name='~TCMallocGuard' mangled-name='_ZN13TCMallocGuardD1Ev' filepath='src/tcmalloc_guard.h' line='46' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN13TCMallocGuardD1Ev'>
+          <parameter type-id='type-id-1336' is-artificial='yes'/>
+          <parameter type-id='type-id-1' is-artificial='yes'/>
+          <return type-id='type-id-56'/>
+        </function-decl>
+      </member-function>
+    </class-decl>
+    <class-decl name='mallinfo' size-in-bits='320' is-struct='yes' visibility='default' filepath='/usr/include/malloc.h' line='94' column='1' id='type-id-1337'>
+      <data-member access='public' layout-offset-in-bits='0'>
+        <var-decl name='arena' type-id='type-id-1' visibility='default' filepath='/usr/include/malloc.h' line='95' column='1'/>
+      </data-member>
+      <data-member access='public' layout-offset-in-bits='32'>
+        <var-decl name='ordblks' type-id='type-id-1' visibility='default' filepath='/usr/include/malloc.h' line='96' column='1'/>
+      </data-member>
+      <data-member access='public' layout-offset-in-bits='64'>
+        <var-decl name='smblks' type-id='type-id-1' visibility='default' filepath='/usr/include/malloc.h' line='97' column='1'/>
+      </data-member>
+      <data-member access='public' layout-offset-in-bits='96'>
+        <var-decl name='hblks' type-id='type-id-1' visibility='default' filepath='/usr/include/malloc.h' line='98' column='1'/>
+      </data-member>
+      <data-member access='public' layout-offset-in-bits='128'>
+        <var-decl name='hblkhd' type-id='type-id-1' visibility='default' filepath='/usr/include/malloc.h' line='99' column='1'/>
+      </data-member>
+      <data-member access='public' layout-offset-in-bits='160'>
+        <var-decl name='usmblks' type-id='type-id-1' visibility='default' filepath='/usr/include/malloc.h' line='100' column='1'/>
+      </data-member>
+      <data-member access='public' layout-offset-in-bits='192'>
+        <var-decl name='fsmblks' type-id='type-id-1' visibility='default' filepath='/usr/include/malloc.h' line='101' column='1'/>
+      </data-member>
+      <data-member access='public' layout-offset-in-bits='224'>
+        <var-decl name='uordblks' type-id='type-id-1' visibility='default' filepath='/usr/include/malloc.h' line='102' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='256'>
         <var-decl name='fordblks' type-id='type-id-1' visibility='default' filepath='/usr/include/malloc.h' line='103' column='1'/>
@@ -21265,61 +21260,61 @@
         <var-decl name='keepcost' type-id='type-id-1' visibility='default' filepath='/usr/include/malloc.h' line='104' column='1'/>
       </data-member>
     </class-decl>
-    <pointer-type-def type-id='type-id-82' size-in-bits='64' id='type-id-1293'/>
-    <reference-type-def kind='lvalue' type-id='type-id-899' size-in-bits='64' id='type-id-1339'/>
-    <pointer-type-def type-id='type-id-899' size-in-bits='64' id='type-id-1340'/>
-    <qualified-type-def type-id='type-id-1340' const='yes' id='type-id-1341'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1341' size-in-bits='64' id='type-id-1342'/>
-    <pointer-type-def type-id='type-id-1335' size-in-bits='64' id='type-id-901'/>
-    <pointer-type-def type-id='type-id-1299' size-in-bits='64' id='type-id-1300'/>
+    <pointer-type-def type-id='type-id-82' size-in-bits='64' id='type-id-1287'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1299' size-in-bits='64' id='type-id-1338'/>
+    <pointer-type-def type-id='type-id-1299' size-in-bits='64' id='type-id-1339'/>
+    <qualified-type-def type-id='type-id-1339' const='yes' id='type-id-1340'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1340' size-in-bits='64' id='type-id-1341'/>
+    <pointer-type-def type-id='type-id-1334' size-in-bits='64' id='type-id-1301'/>
+    <pointer-type-def type-id='type-id-1293' size-in-bits='64' id='type-id-1294'/>
     <pointer-type-def type-id='type-id-176' size-in-bits='64' id='type-id-254'/>
-    <pointer-type-def type-id='type-id-1315' size-in-bits='64' id='type-id-1316'/>
-    <pointer-type-def type-id='type-id-958' size-in-bits='64' id='type-id-902'/>
-    <pointer-type-def type-id='type-id-1336' size-in-bits='64' id='type-id-1337'/>
+    <pointer-type-def type-id='type-id-1314' size-in-bits='64' id='type-id-1315'/>
+    <pointer-type-def type-id='type-id-951' size-in-bits='64' id='type-id-952'/>
+    <pointer-type-def type-id='type-id-1335' size-in-bits='64' id='type-id-1336'/>
+    <pointer-type-def type-id='type-id-1330' size-in-bits='64' id='type-id-1332'/>
     <pointer-type-def type-id='type-id-1331' size-in-bits='64' id='type-id-1333'/>
-    <pointer-type-def type-id='type-id-1332' size-in-bits='64' id='type-id-1334'/>
-    <pointer-type-def type-id='type-id-1278' size-in-bits='64' id='type-id-1282'/>
-    <pointer-type-def type-id='type-id-1279' size-in-bits='64' id='type-id-1281'/>
-    <pointer-type-def type-id='type-id-1296' size-in-bits='64' id='type-id-1297'/>
-    <pointer-type-def type-id='type-id-1302' size-in-bits='64' id='type-id-1305'/>
-    <pointer-type-def type-id='type-id-1308' size-in-bits='64' id='type-id-1306'/>
-    <pointer-type-def type-id='type-id-1307' size-in-bits='64' id='type-id-1304'/>
-    <pointer-type-def type-id='type-id-1303' size-in-bits='64' id='type-id-1343'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1344' size-in-bits='64' id='type-id-1345'/>
-    <pointer-type-def type-id='type-id-1344' size-in-bits='64' id='type-id-1346'/>
-    <pointer-type-def type-id='type-id-1347' size-in-bits='64' id='type-id-1348'/>
-    <pointer-type-def type-id='type-id-1349' size-in-bits='64' id='type-id-1350'/>
-    <pointer-type-def type-id='type-id-1351' size-in-bits='64' id='type-id-1352'/>
-    <pointer-type-def type-id='type-id-948' size-in-bits='64' id='type-id-1353'/>
-    <pointer-type-def type-id='type-id-947' size-in-bits='64' id='type-id-1354'/>
+    <pointer-type-def type-id='type-id-1272' size-in-bits='64' id='type-id-1276'/>
+    <pointer-type-def type-id='type-id-1273' size-in-bits='64' id='type-id-1275'/>
+    <pointer-type-def type-id='type-id-1290' size-in-bits='64' id='type-id-1291'/>
+    <pointer-type-def type-id='type-id-1296' size-in-bits='64' id='type-id-1304'/>
+    <pointer-type-def type-id='type-id-1307' size-in-bits='64' id='type-id-1305'/>
+    <pointer-type-def type-id='type-id-1306' size-in-bits='64' id='type-id-1303'/>
+    <pointer-type-def type-id='type-id-1297' size-in-bits='64' id='type-id-1342'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1343' size-in-bits='64' id='type-id-1344'/>
+    <pointer-type-def type-id='type-id-1343' size-in-bits='64' id='type-id-1345'/>
+    <pointer-type-def type-id='type-id-1346' size-in-bits='64' id='type-id-1347'/>
+    <pointer-type-def type-id='type-id-1348' size-in-bits='64' id='type-id-1349'/>
+    <pointer-type-def type-id='type-id-1350' size-in-bits='64' id='type-id-1351'/>
+    <pointer-type-def type-id='type-id-942' size-in-bits='64' id='type-id-1352'/>
+    <pointer-type-def type-id='type-id-941' size-in-bits='64' id='type-id-1353'/>
     <reference-type-def kind='lvalue' type-id='type-id-66' size-in-bits='64' id='type-id-283'/>
     <pointer-type-def type-id='type-id-66' size-in-bits='64' id='type-id-90'/>
     <pointer-type-def type-id='type-id-90' size-in-bits='64' id='type-id-97'/>
-    <qualified-type-def type-id='type-id-899' const='yes' id='type-id-1355'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1355' size-in-bits='64' id='type-id-1356'/>
-    <pointer-type-def type-id='type-id-1355' size-in-bits='64' id='type-id-1357'/>
-    <qualified-type-def type-id='type-id-1299' const='yes' id='type-id-1358'/>
-    <pointer-type-def type-id='type-id-1358' size-in-bits='64' id='type-id-1301'/>
-    <qualified-type-def type-id='type-id-176' const='yes' id='type-id-1359'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1359' size-in-bits='64' id='type-id-1294'/>
-    <pointer-type-def type-id='type-id-1359' size-in-bits='64' id='type-id-1292'/>
-    <qualified-type-def type-id='type-id-1278' const='yes' id='type-id-1360'/>
-    <pointer-type-def type-id='type-id-1360' size-in-bits='64' id='type-id-1283'/>
-    <qualified-type-def type-id='type-id-1344' const='yes' id='type-id-1361'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1361' size-in-bits='64' id='type-id-1362'/>
-    <pointer-type-def type-id='type-id-1361' size-in-bits='64' id='type-id-1363'/>
-    <qualified-type-def type-id='type-id-1347' const='yes' id='type-id-1364'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1364' size-in-bits='64' id='type-id-1365'/>
-    <pointer-type-def type-id='type-id-1364' size-in-bits='64' id='type-id-1366'/>
-    <qualified-type-def type-id='type-id-1349' const='yes' id='type-id-1367'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1367' size-in-bits='64' id='type-id-1368'/>
-    <pointer-type-def type-id='type-id-1367' size-in-bits='64' id='type-id-1369'/>
-    <qualified-type-def type-id='type-id-1291' const='yes' id='type-id-1290'/>
-    <qualified-type-def type-id='type-id-1351' const='yes' id='type-id-1370'/>
-    <pointer-type-def type-id='type-id-1370' size-in-bits='64' id='type-id-952'/>
-    <qualified-type-def type-id='type-id-948' const='yes' id='type-id-1371'/>
+    <qualified-type-def type-id='type-id-1299' const='yes' id='type-id-1354'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1354' size-in-bits='64' id='type-id-1355'/>
+    <pointer-type-def type-id='type-id-1354' size-in-bits='64' id='type-id-1356'/>
+    <qualified-type-def type-id='type-id-1293' const='yes' id='type-id-1357'/>
+    <pointer-type-def type-id='type-id-1357' size-in-bits='64' id='type-id-1295'/>
+    <qualified-type-def type-id='type-id-176' const='yes' id='type-id-1358'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1358' size-in-bits='64' id='type-id-1288'/>
+    <pointer-type-def type-id='type-id-1358' size-in-bits='64' id='type-id-1286'/>
+    <qualified-type-def type-id='type-id-1272' const='yes' id='type-id-1359'/>
+    <pointer-type-def type-id='type-id-1359' size-in-bits='64' id='type-id-1277'/>
+    <qualified-type-def type-id='type-id-1343' const='yes' id='type-id-1360'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1360' size-in-bits='64' id='type-id-1361'/>
+    <pointer-type-def type-id='type-id-1360' size-in-bits='64' id='type-id-1362'/>
+    <qualified-type-def type-id='type-id-1346' const='yes' id='type-id-1363'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1363' size-in-bits='64' id='type-id-1364'/>
+    <pointer-type-def type-id='type-id-1363' size-in-bits='64' id='type-id-1365'/>
+    <qualified-type-def type-id='type-id-1348' const='yes' id='type-id-1366'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1366' size-in-bits='64' id='type-id-1367'/>
+    <pointer-type-def type-id='type-id-1366' size-in-bits='64' id='type-id-1368'/>
+    <qualified-type-def type-id='type-id-1285' const='yes' id='type-id-1284'/>
+    <qualified-type-def type-id='type-id-1350' const='yes' id='type-id-1369'/>
+    <pointer-type-def type-id='type-id-1369' size-in-bits='64' id='type-id-1370'/>
+    <qualified-type-def type-id='type-id-942' const='yes' id='type-id-1371'/>
     <pointer-type-def type-id='type-id-1371' size-in-bits='64' id='type-id-1372'/>
-    <qualified-type-def type-id='type-id-947' const='yes' id='type-id-1373'/>
+    <qualified-type-def type-id='type-id-941' const='yes' id='type-id-1373'/>
     <pointer-type-def type-id='type-id-1373' size-in-bits='64' id='type-id-1374'/>
     <qualified-type-def type-id='type-id-55' const='yes' id='type-id-459'/>
     <qualified-type-def type-id='type-id-66' const='yes' id='type-id-720'/>
@@ -21327,9 +21322,9 @@
     <pointer-type-def type-id='type-id-720' size-in-bits='64' id='type-id-52'/>
     <pointer-type-def type-id='type-id-52' size-in-bits='64' id='type-id-1375'/>
     <qualified-type-def type-id='type-id-2' const='yes' id='type-id-1376'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1376' size-in-bits='64' id='type-id-1135'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1376' size-in-bits='64' id='type-id-1129'/>
     <qualified-type-def type-id='type-id-1' const='yes' id='type-id-112'/>
-    <qualified-type-def type-id='type-id-1310' const='yes' id='type-id-1377'/>
+    <qualified-type-def type-id='type-id-1309' const='yes' id='type-id-1377'/>
     <pointer-type-def type-id='type-id-1377' size-in-bits='64' id='type-id-1378'/>
     <qualified-type-def type-id='type-id-186' const='yes' id='type-id-1379'/>
     <reference-type-def kind='lvalue' type-id='type-id-1379' size-in-bits='64' id='type-id-780'/>
@@ -21361,22 +21356,22 @@
     <pointer-type-def type-id='type-id-1413' size-in-bits='64' id='type-id-1414'/>
     <qualified-type-def type-id='type-id-1415' const='yes' id='type-id-1416'/>
     <pointer-type-def type-id='type-id-1416' size-in-bits='64' id='type-id-1417'/>
-    <qualified-type-def type-id='type-id-1267' const='yes' id='type-id-1418'/>
+    <qualified-type-def type-id='type-id-1261' const='yes' id='type-id-1418'/>
     <pointer-type-def type-id='type-id-1418' size-in-bits='64' id='type-id-1419'/>
-    <qualified-type-def type-id='type-id-1312' const='yes' id='type-id-1420'/>
+    <qualified-type-def type-id='type-id-1311' const='yes' id='type-id-1420'/>
     <pointer-type-def type-id='type-id-1420' size-in-bits='64' id='type-id-1421'/>
     <qualified-type-def type-id='type-id-130' const='yes' id='type-id-263'/>
     <qualified-type-def type-id='type-id-5' const='yes' id='type-id-615'/>
     <reference-type-def kind='lvalue' type-id='type-id-615' size-in-bits='64' id='type-id-334'/>
-    <qualified-type-def type-id='type-id-945' const='yes' id='type-id-1422'/>
-    <pointer-type-def type-id='type-id-1422' size-in-bits='64' id='type-id-950'/>
-    <qualified-type-def type-id='type-id-1276' const='yes' id='type-id-1423'/>
+    <qualified-type-def type-id='type-id-939' const='yes' id='type-id-1422'/>
+    <pointer-type-def type-id='type-id-1422' size-in-bits='64' id='type-id-944'/>
+    <qualified-type-def type-id='type-id-1270' const='yes' id='type-id-1423'/>
     <pointer-type-def type-id='type-id-1423' size-in-bits='64' id='type-id-1424'/>
     <pointer-type-def type-id='type-id-1424' size-in-bits='64' id='type-id-1425'/>
-    <pointer-type-def type-id='type-id-1426' size-in-bits='64' id='type-id-1284'/>
+    <pointer-type-def type-id='type-id-1426' size-in-bits='64' id='type-id-1278'/>
     <pointer-type-def type-id='type-id-1' size-in-bits='64' id='type-id-897'/>
-    <pointer-type-def type-id='type-id-1313' size-in-bits='64' id='type-id-1427'/>
-    <pointer-type-def type-id='type-id-1310' size-in-bits='64' id='type-id-1428'/>
+    <pointer-type-def type-id='type-id-1312' size-in-bits='64' id='type-id-1427'/>
+    <pointer-type-def type-id='type-id-1309' size-in-bits='64' id='type-id-1428'/>
     <pointer-type-def type-id='type-id-57' size-in-bits='64' id='type-id-230'/>
     <pointer-type-def type-id='type-id-1380' size-in-bits='64' id='type-id-1429'/>
     <pointer-type-def type-id='type-id-1430' size-in-bits='64' id='type-id-1431'/>
@@ -21391,26 +21386,26 @@
     <pointer-type-def type-id='type-id-562' size-in-bits='64' id='type-id-1442'/>
     <pointer-type-def type-id='type-id-1443' size-in-bits='64' id='type-id-1444'/>
     <reference-type-def kind='lvalue' type-id='type-id-1399' size-in-bits='64' id='type-id-1445'/>
-    <pointer-type-def type-id='type-id-1399' size-in-bits='64' id='type-id-903'/>
+    <pointer-type-def type-id='type-id-1399' size-in-bits='64' id='type-id-1302'/>
     <pointer-type-def type-id='type-id-1446' size-in-bits='64' id='type-id-1447'/>
-    <pointer-type-def type-id='type-id-1263' size-in-bits='64' id='type-id-1448'/>
+    <pointer-type-def type-id='type-id-1257' size-in-bits='64' id='type-id-1448'/>
     <pointer-type-def type-id='type-id-886' size-in-bits='64' id='type-id-1449'/>
     <pointer-type-def type-id='type-id-1403' size-in-bits='64' id='type-id-1450'/>
     <pointer-type-def type-id='type-id-1451' size-in-bits='64' id='type-id-1452'/>
     <pointer-type-def type-id='type-id-1453' size-in-bits='64' id='type-id-1454'/>
-    <pointer-type-def type-id='type-id-1265' size-in-bits='64' id='type-id-1455'/>
-    <pointer-type-def type-id='type-id-1330' size-in-bits='64' id='type-id-1456'/>
+    <pointer-type-def type-id='type-id-1259' size-in-bits='64' id='type-id-1455'/>
+    <pointer-type-def type-id='type-id-1329' size-in-bits='64' id='type-id-1456'/>
     <pointer-type-def type-id='type-id-1406' size-in-bits='64' id='type-id-1457'/>
     <pointer-type-def type-id='type-id-1409' size-in-bits='64' id='type-id-1458'/>
-    <pointer-type-def type-id='type-id-1139' size-in-bits='64' id='type-id-1459'/>
+    <pointer-type-def type-id='type-id-1133' size-in-bits='64' id='type-id-1459'/>
     <pointer-type-def type-id='type-id-1412' size-in-bits='64' id='type-id-1460'/>
     <pointer-type-def type-id='type-id-1461' size-in-bits='64' id='type-id-1462'/>
     <pointer-type-def type-id='type-id-1463' size-in-bits='64' id='type-id-1464'/>
-    <pointer-type-def type-id='type-id-117' size-in-bits='64' id='type-id-1136'/>
-    <pointer-type-def type-id='type-id-1142' size-in-bits='64' id='type-id-1465'/>
+    <pointer-type-def type-id='type-id-117' size-in-bits='64' id='type-id-1130'/>
+    <pointer-type-def type-id='type-id-1136' size-in-bits='64' id='type-id-1465'/>
     <pointer-type-def type-id='type-id-1415' size-in-bits='64' id='type-id-1466'/>
-    <pointer-type-def type-id='type-id-1267' size-in-bits='64' id='type-id-1467'/>
-    <pointer-type-def type-id='type-id-1249' size-in-bits='64' id='type-id-64'/>
+    <pointer-type-def type-id='type-id-1261' size-in-bits='64' id='type-id-1467'/>
+    <pointer-type-def type-id='type-id-1243' size-in-bits='64' id='type-id-64'/>
     <pointer-type-def type-id='type-id-15' size-in-bits='64' id='type-id-1468'/>
     <pointer-type-def type-id='type-id-1469' size-in-bits='64' id='type-id-153'/>
     <pointer-type-def type-id='type-id-1470' size-in-bits='64' id='type-id-218'/>
@@ -21424,21 +21419,21 @@
     <pointer-type-def type-id='type-id-1480' size-in-bits='64' id='type-id-267'/>
     <pointer-type-def type-id='type-id-1481' size-in-bits='64' id='type-id-1482'/>
     <pointer-type-def type-id='type-id-53' size-in-bits='64' id='type-id-120'/>
-    <qualified-type-def type-id='type-id-82' volatile='yes' id='type-id-986'/>
-    <pointer-type-def type-id='type-id-986' size-in-bits='64' id='type-id-80'/>
-    <qualified-type-def type-id='type-id-949' volatile='yes' id='type-id-945'/>
+    <qualified-type-def type-id='type-id-82' volatile='yes' id='type-id-980'/>
+    <pointer-type-def type-id='type-id-980' size-in-bits='64' id='type-id-80'/>
+    <qualified-type-def type-id='type-id-943' volatile='yes' id='type-id-939'/>
     <qualified-type-def type-id='type-id-57' volatile='yes' id='type-id-1483'/>
-    <qualified-type-def type-id='type-id-5' volatile='yes' id='type-id-1273'/>
-    <pointer-type-def type-id='type-id-1276' size-in-bits='64' id='type-id-1484'/>
+    <qualified-type-def type-id='type-id-5' volatile='yes' id='type-id-1267'/>
+    <pointer-type-def type-id='type-id-1270' size-in-bits='64' id='type-id-1484'/>
     <pointer-type-def type-id='type-id-1484' size-in-bits='64' id='type-id-1485'/>
     <namespace-decl name='std'>
       <function-decl name='_Destroy&lt;MallocExtension::FreeListInfo*&gt;' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_construct.h' line='119' column='1' visibility='default' binding='global' size-in-bits='64'>
-        <parameter type-id='type-id-1340'/>
-        <parameter type-id='type-id-1340'/>
+        <parameter type-id='type-id-1339'/>
+        <parameter type-id='type-id-1339'/>
         <return type-id='type-id-56'/>
       </function-decl>
       <class-decl name='allocator&lt;MallocExtension::FreeListInfo&gt;' size-in-bits='8' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/allocator.h' line='87' column='1' id='type-id-1383'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1347'/>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1346'/>
         <member-function access='private'>
           <function-decl name='allocator' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/allocator.h' line='101' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1433' is-artificial='yes'/>
@@ -21461,53 +21456,53 @@
         </member-function>
       </class-decl>
       <function-decl name='_Destroy&lt;MallocExtension::FreeListInfo*, MallocExtension::FreeListInfo&gt;' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_construct.h' line='146' column='1' visibility='default' binding='global' size-in-bits='64'>
-        <parameter type-id='type-id-1340'/>
-        <parameter type-id='type-id-1340'/>
+        <parameter type-id='type-id-1339'/>
+        <parameter type-id='type-id-1339'/>
         <parameter type-id='type-id-1432'/>
         <return type-id='type-id-56'/>
       </function-decl>
       <function-decl name='__copy_move_backward_a&lt;false, MallocExtension::FreeListInfo*, MallocExtension::FreeListInfo*&gt;' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_algobase.h' line='582' column='1' visibility='default' binding='global' size-in-bits='64'>
-        <parameter type-id='type-id-1340'/>
-        <parameter type-id='type-id-1340'/>
-        <parameter type-id='type-id-1340'/>
-        <return type-id='type-id-1340'/>
+        <parameter type-id='type-id-1339'/>
+        <parameter type-id='type-id-1339'/>
+        <parameter type-id='type-id-1339'/>
+        <return type-id='type-id-1339'/>
       </function-decl>
       <function-decl name='__copy_move_backward_a2&lt;false, MallocExtension::FreeListInfo*, MallocExtension::FreeListInfo*&gt;' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_algobase.h' line='600' column='1' visibility='default' binding='global' size-in-bits='64'>
-        <parameter type-id='type-id-1340'/>
-        <parameter type-id='type-id-1340'/>
-        <parameter type-id='type-id-1340'/>
-        <return type-id='type-id-1340'/>
+        <parameter type-id='type-id-1339'/>
+        <parameter type-id='type-id-1339'/>
+        <parameter type-id='type-id-1339'/>
+        <return type-id='type-id-1339'/>
       </function-decl>
       <function-decl name='__copy_move_a&lt;false, MallocExtension::FreeListInfo*, MallocExtension::FreeListInfo*&gt;' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_algobase.h' line='386' column='1' visibility='default' binding='global' size-in-bits='64'>
-        <parameter type-id='type-id-1340'/>
-        <parameter type-id='type-id-1340'/>
-        <parameter type-id='type-id-1340'/>
-        <return type-id='type-id-1340'/>
+        <parameter type-id='type-id-1339'/>
+        <parameter type-id='type-id-1339'/>
+        <parameter type-id='type-id-1339'/>
+        <return type-id='type-id-1339'/>
       </function-decl>
       <function-decl name='__copy_move_a2&lt;false, MallocExtension::FreeListInfo*, MallocExtension::FreeListInfo*&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-1340'/>
-        <parameter type-id='type-id-1340'/>
-        <parameter type-id='type-id-1340'/>
-        <return type-id='type-id-1340'/>
+        <parameter type-id='type-id-1339'/>
+        <parameter type-id='type-id-1339'/>
+        <parameter type-id='type-id-1339'/>
+        <return type-id='type-id-1339'/>
       </function-decl>
       <function-decl name='copy&lt;MallocExtension::FreeListInfo*, MallocExtension::FreeListInfo*&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-1340'/>
-        <parameter type-id='type-id-1340'/>
-        <parameter type-id='type-id-1340'/>
-        <return type-id='type-id-1340'/>
+        <parameter type-id='type-id-1339'/>
+        <parameter type-id='type-id-1339'/>
+        <parameter type-id='type-id-1339'/>
+        <return type-id='type-id-1339'/>
       </function-decl>
       <function-decl name='uninitialized_copy&lt;MallocExtension::FreeListInfo*, MallocExtension::FreeListInfo*&gt;' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_uninitialized.h' line='106' column='1' visibility='default' binding='global' size-in-bits='64'>
-        <parameter type-id='type-id-1340'/>
-        <parameter type-id='type-id-1340'/>
-        <parameter type-id='type-id-1340'/>
-        <return type-id='type-id-1340'/>
+        <parameter type-id='type-id-1339'/>
+        <parameter type-id='type-id-1339'/>
+        <parameter type-id='type-id-1339'/>
+        <return type-id='type-id-1339'/>
       </function-decl>
       <function-decl name='__uninitialized_copy_a&lt;MallocExtension::FreeListInfo*, MallocExtension::FreeListInfo*, MallocExtension::FreeListInfo&gt;' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_uninitialized.h' line='254' column='1' visibility='default' binding='global' size-in-bits='64'>
-        <parameter type-id='type-id-1340'/>
-        <parameter type-id='type-id-1340'/>
-        <parameter type-id='type-id-1340'/>
+        <parameter type-id='type-id-1339'/>
+        <parameter type-id='type-id-1339'/>
+        <parameter type-id='type-id-1339'/>
         <parameter type-id='type-id-1432'/>
-        <return type-id='type-id-1340'/>
+        <return type-id='type-id-1339'/>
       </function-decl>
       <function-decl name='max&lt;long unsigned int&gt;' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_algobase.h' line='209' column='1' visibility='default' binding='global' size-in-bits='64'>
         <parameter type-id='type-id-334'/>
@@ -21515,23 +21510,23 @@
         <return type-id='type-id-334'/>
       </function-decl>
       <function-decl name='copy_backward&lt;MallocExtension::FreeListInfo*, MallocExtension::FreeListInfo*&gt;' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_algobase.h' line='628' column='1' visibility='default' binding='global' size-in-bits='64'>
-        <parameter type-id='type-id-1340'/>
-        <parameter type-id='type-id-1340'/>
-        <parameter type-id='type-id-1340'/>
-        <return type-id='type-id-1340'/>
+        <parameter type-id='type-id-1339'/>
+        <parameter type-id='type-id-1339'/>
+        <parameter type-id='type-id-1339'/>
+        <return type-id='type-id-1339'/>
       </function-decl>
       <function-decl name='__uninitialized_move_a&lt;MallocExtension::FreeListInfo*, MallocExtension::FreeListInfo*, std::allocator&lt;MallocExtension::FreeListInfo&gt; &gt;' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_uninitialized.h' line='261' column='1' visibility='default' binding='global' size-in-bits='64'>
-        <parameter type-id='type-id-1340'/>
-        <parameter type-id='type-id-1340'/>
-        <parameter type-id='type-id-1340'/>
+        <parameter type-id='type-id-1339'/>
+        <parameter type-id='type-id-1339'/>
+        <parameter type-id='type-id-1339'/>
         <parameter type-id='type-id-1432'/>
-        <return type-id='type-id-1340'/>
+        <return type-id='type-id-1339'/>
       </function-decl>
       <class-decl name='_Destroy_aux&lt;true&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_construct.h' line='106' column='1' id='type-id-1486'>
         <member-function access='public' static='yes'>
           <function-decl name='__destroy&lt;MallocExtension::FreeListInfo*&gt;' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_construct.h' line='109' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1340'/>
-            <parameter type-id='type-id-1340'/>
+            <parameter type-id='type-id-1339'/>
+            <parameter type-id='type-id-1339'/>
             <return type-id='type-id-56'/>
           </function-decl>
         </member-function>
@@ -21548,13 +21543,13 @@
           <class-decl name='_Vector_impl' size-in-bits='192' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='75' column='1' id='type-id-1430'>
             <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1383'/>
             <data-member access='public' layout-offset-in-bits='0'>
-              <var-decl name='_M_start' type-id='type-id-1340' 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'/>
+              <var-decl name='_M_start' type-id='type-id-1339' 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-1340' 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'/>
+              <var-decl name='_M_finish' type-id='type-id-1339' 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-1340' 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'/>
+              <var-decl name='_M_end_of_storage' type-id='type-id-1339' 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'>
@@ -21624,13 +21619,13 @@
           <function-decl name='_M_allocate' mangled-name='_ZNSt12_Vector_baseIN15MallocExtension12FreeListInfoESaIS1_EE11_M_allocateEm' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='139' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1429' is-artificial='yes'/>
             <parameter type-id='type-id-5'/>
-            <return type-id='type-id-1340'/>
+            <return type-id='type-id-1339'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_M_deallocate' mangled-name='_ZNSt12_Vector_baseIN15MallocExtension12FreeListInfoESaIS1_EE13_M_deallocateEPS1_m' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='143' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1429' is-artificial='yes'/>
-            <parameter type-id='type-id-1340'/>
+            <parameter type-id='type-id-1339'/>
             <parameter type-id='type-id-5'/>
             <return type-id='type-id-56'/>
           </function-decl>
@@ -21640,59 +21635,59 @@
         <base-class access='protected' layout-offset-in-bits='0' type-id='type-id-1380'/>
         <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-903' is-artificial='yes'/>
+            <parameter type-id='type-id-1302' is-artificial='yes'/>
             <return type-id='type-id-56'/>
           </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-903' is-artificial='yes'/>
+            <parameter type-id='type-id-1302' is-artificial='yes'/>
             <parameter type-id='type-id-1385'/>
             <return type-id='type-id-56'/>
           </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-903' is-artificial='yes'/>
+            <parameter type-id='type-id-1302' is-artificial='yes'/>
             <parameter type-id='type-id-5'/>
-            <parameter type-id='type-id-1356'/>
+            <parameter type-id='type-id-1355'/>
             <parameter type-id='type-id-1385'/>
             <return type-id='type-id-56'/>
           </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-903' is-artificial='yes'/>
+            <parameter type-id='type-id-1302' is-artificial='yes'/>
             <parameter type-id='type-id-1401'/>
             <return type-id='type-id-56'/>
           </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-903' is-artificial='yes'/>
+            <parameter type-id='type-id-1302' is-artificial='yes'/>
             <parameter type-id='type-id-1' is-artificial='yes'/>
             <return type-id='type-id-56'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='operator=' mangled-name='_ZNSt6vectorIN15MallocExtension12FreeListInfoESaIS1_EEaSERKS3_' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/vector.tcc' line='156' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-903' is-artificial='yes'/>
+            <parameter type-id='type-id-1302' is-artificial='yes'/>
             <parameter type-id='type-id-1401'/>
             <return type-id='type-id-1445'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='assign' mangled-name='_ZNSt6vectorIN15MallocExtension12FreeListInfoESaIS1_EE6assignEmRKS1_' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='374' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-903' is-artificial='yes'/>
+            <parameter type-id='type-id-1302' is-artificial='yes'/>
             <parameter type-id='type-id-5'/>
-            <parameter type-id='type-id-1356'/>
+            <parameter type-id='type-id-1355'/>
             <return type-id='type-id-56'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='begin' mangled-name='_ZNSt6vectorIN15MallocExtension12FreeListInfoESaIS1_EE5beginEv' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='425' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-903' is-artificial='yes'/>
-            <return type-id='type-id-1344'/>
+            <parameter type-id='type-id-1302' is-artificial='yes'/>
+            <return type-id='type-id-1343'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
@@ -21703,8 +21698,8 @@
         </member-function>
         <member-function access='private'>
           <function-decl name='end' mangled-name='_ZNSt6vectorIN15MallocExtension12FreeListInfoESaIS1_EE3endEv' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='443' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-903' is-artificial='yes'/>
-            <return type-id='type-id-1344'/>
+            <parameter type-id='type-id-1302' is-artificial='yes'/>
+            <return type-id='type-id-1343'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
@@ -21715,7 +21710,7 @@
         </member-function>
         <member-function access='private'>
           <function-decl name='rbegin' mangled-name='_ZNSt6vectorIN15MallocExtension12FreeListInfoESaIS1_EE6rbeginEv' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='461' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-903' is-artificial='yes'/>
+            <parameter type-id='type-id-1302' is-artificial='yes'/>
             <return type-id='type-id-1488'/>
           </function-decl>
         </member-function>
@@ -21727,7 +21722,7 @@
         </member-function>
         <member-function access='private'>
           <function-decl name='rend' mangled-name='_ZNSt6vectorIN15MallocExtension12FreeListInfoESaIS1_EE4rendEv' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='479' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-903' is-artificial='yes'/>
+            <parameter type-id='type-id-1302' is-artificial='yes'/>
             <return type-id='type-id-1488'/>
           </function-decl>
         </member-function>
@@ -21751,9 +21746,9 @@
         </member-function>
         <member-function access='private'>
           <function-decl name='resize' mangled-name='_ZNSt6vectorIN15MallocExtension12FreeListInfoESaIS1_EE6resizeEmS1_' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='552' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-903' is-artificial='yes'/>
+            <parameter type-id='type-id-1302' is-artificial='yes'/>
             <parameter type-id='type-id-5'/>
-            <parameter type-id='type-id-899'/>
+            <parameter type-id='type-id-1299'/>
             <return type-id='type-id-56'/>
           </function-decl>
         </member-function>
@@ -21771,23 +21766,23 @@
         </member-function>
         <member-function access='private'>
           <function-decl name='reserve' mangled-name='_ZNSt6vectorIN15MallocExtension12FreeListInfoESaIS1_EE7reserveEm' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/vector.tcc' line='64' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-903' is-artificial='yes'/>
+            <parameter type-id='type-id-1302' is-artificial='yes'/>
             <parameter type-id='type-id-5'/>
             <return type-id='type-id-56'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='operator[]' mangled-name='_ZNSt6vectorIN15MallocExtension12FreeListInfoESaIS1_EEixEm' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='610' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-903' is-artificial='yes'/>
+            <parameter type-id='type-id-1302' is-artificial='yes'/>
             <parameter type-id='type-id-5'/>
-            <return type-id='type-id-1339'/>
+            <return type-id='type-id-1338'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='operator[]' mangled-name='_ZNKSt6vectorIN15MallocExtension12FreeListInfoESaIS1_EEixEm' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='625' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1402' is-artificial='yes'/>
             <parameter type-id='type-id-5'/>
-            <return type-id='type-id-1356'/>
+            <return type-id='type-id-1355'/>
           </function-decl>
         </member-function>
         <member-function access='protected'>
@@ -21799,142 +21794,142 @@
         </member-function>
         <member-function access='private'>
           <function-decl name='at' mangled-name='_ZNSt6vectorIN15MallocExtension12FreeListInfoESaIS1_EE2atEm' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='650' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-903' is-artificial='yes'/>
+            <parameter type-id='type-id-1302' is-artificial='yes'/>
             <parameter type-id='type-id-5'/>
-            <return type-id='type-id-1339'/>
+            <return type-id='type-id-1338'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='at' mangled-name='_ZNKSt6vectorIN15MallocExtension12FreeListInfoESaIS1_EE2atEm' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='668' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1402' is-artificial='yes'/>
             <parameter type-id='type-id-5'/>
-            <return type-id='type-id-1356'/>
+            <return type-id='type-id-1355'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='front' mangled-name='_ZNSt6vectorIN15MallocExtension12FreeListInfoESaIS1_EE5frontEv' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='679' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-903' is-artificial='yes'/>
-            <return type-id='type-id-1339'/>
+            <parameter type-id='type-id-1302' is-artificial='yes'/>
+            <return type-id='type-id-1338'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='front' mangled-name='_ZNKSt6vectorIN15MallocExtension12FreeListInfoESaIS1_EE5frontEv' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='687' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1402' is-artificial='yes'/>
-            <return type-id='type-id-1356'/>
+            <return type-id='type-id-1355'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='back' mangled-name='_ZNSt6vectorIN15MallocExtension12FreeListInfoESaIS1_EE4backEv' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='695' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-903' is-artificial='yes'/>
-            <return type-id='type-id-1339'/>
+            <parameter type-id='type-id-1302' is-artificial='yes'/>
+            <return type-id='type-id-1338'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='back' mangled-name='_ZNKSt6vectorIN15MallocExtension12FreeListInfoESaIS1_EE4backEv' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='703' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1402' is-artificial='yes'/>
-            <return type-id='type-id-1356'/>
+            <return type-id='type-id-1355'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='data' mangled-name='_ZNSt6vectorIN15MallocExtension12FreeListInfoESaIS1_EE4dataEv' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='714' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-903' is-artificial='yes'/>
-            <return type-id='type-id-1340'/>
+            <parameter type-id='type-id-1302' is-artificial='yes'/>
+            <return type-id='type-id-1339'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='data' mangled-name='_ZNKSt6vectorIN15MallocExtension12FreeListInfoESaIS1_EE4dataEv' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='718' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1402' is-artificial='yes'/>
-            <return type-id='type-id-1357'/>
+            <return type-id='type-id-1356'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='push_back' mangled-name='_ZNSt6vectorIN15MallocExtension12FreeListInfoESaIS1_EE9push_backERKS1_' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='733' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-903' is-artificial='yes'/>
-            <parameter type-id='type-id-1356'/>
+            <parameter type-id='type-id-1302' is-artificial='yes'/>
+            <parameter type-id='type-id-1355'/>
             <return type-id='type-id-56'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='pop_back' mangled-name='_ZNSt6vectorIN15MallocExtension12FreeListInfoESaIS1_EE8pop_backEv' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='764' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-903' is-artificial='yes'/>
+            <parameter type-id='type-id-1302' is-artificial='yes'/>
             <return type-id='type-id-56'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='insert' mangled-name='_ZNSt6vectorIN15MallocExtension12FreeListInfoESaIS1_EE6insertEN9__gnu_cxx17__normal_iteratorIPS1_S3_EERKS1_' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/vector.tcc' line='106' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-903' is-artificial='yes'/>
-            <parameter type-id='type-id-1344'/>
-            <parameter type-id='type-id-1356'/>
-            <return type-id='type-id-1344'/>
+            <parameter type-id='type-id-1302' is-artificial='yes'/>
+            <parameter type-id='type-id-1343'/>
+            <parameter type-id='type-id-1355'/>
+            <return type-id='type-id-1343'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='insert' mangled-name='_ZNSt6vectorIN15MallocExtension12FreeListInfoESaIS1_EE6insertEN9__gnu_cxx17__normal_iteratorIPS1_S3_EEmRKS1_' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='850' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-903' is-artificial='yes'/>
-            <parameter type-id='type-id-1344'/>
+            <parameter type-id='type-id-1302' is-artificial='yes'/>
+            <parameter type-id='type-id-1343'/>
             <parameter type-id='type-id-5'/>
-            <parameter type-id='type-id-1356'/>
+            <parameter type-id='type-id-1355'/>
             <return type-id='type-id-56'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='erase' mangled-name='_ZNSt6vectorIN15MallocExtension12FreeListInfoESaIS1_EE5eraseEN9__gnu_cxx17__normal_iteratorIPS1_S3_EE' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/vector.tcc' line='133' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-903' is-artificial='yes'/>
-            <parameter type-id='type-id-1344'/>
-            <return type-id='type-id-1344'/>
+            <parameter type-id='type-id-1302' is-artificial='yes'/>
+            <parameter type-id='type-id-1343'/>
+            <return type-id='type-id-1343'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='erase' mangled-name='_ZNSt6vectorIN15MallocExtension12FreeListInfoESaIS1_EE5eraseEN9__gnu_cxx17__normal_iteratorIPS1_S3_EES7_' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/vector.tcc' line='145' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-903' is-artificial='yes'/>
-            <parameter type-id='type-id-1344'/>
-            <parameter type-id='type-id-1344'/>
-            <return type-id='type-id-1344'/>
+            <parameter type-id='type-id-1302' is-artificial='yes'/>
+            <parameter type-id='type-id-1343'/>
+            <parameter type-id='type-id-1343'/>
+            <return type-id='type-id-1343'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='swap' mangled-name='_ZNSt6vectorIN15MallocExtension12FreeListInfoESaIS1_EE4swapERS3_' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='929' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-903' is-artificial='yes'/>
+            <parameter type-id='type-id-1302' is-artificial='yes'/>
             <parameter type-id='type-id-1445'/>
             <return type-id='type-id-56'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='clear' mangled-name='_ZNSt6vectorIN15MallocExtension12FreeListInfoESaIS1_EE5clearEv' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='950' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-903' is-artificial='yes'/>
+            <parameter type-id='type-id-1302' is-artificial='yes'/>
             <return type-id='type-id-56'/>
           </function-decl>
         </member-function>
         <member-function access='protected'>
           <function-decl name='_M_fill_initialize' mangled-name='_ZNSt6vectorIN15MallocExtension12FreeListInfoESaIS1_EE18_M_fill_initializeEmRKS1_' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='1033' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-903' is-artificial='yes'/>
+            <parameter type-id='type-id-1302' is-artificial='yes'/>
             <parameter type-id='type-id-5'/>
-            <parameter type-id='type-id-1356'/>
+            <parameter type-id='type-id-1355'/>
             <return type-id='type-id-56'/>
           </function-decl>
         </member-function>
         <member-function access='protected'>
           <function-decl name='_M_fill_assign' mangled-name='_ZNSt6vectorIN15MallocExtension12FreeListInfoESaIS1_EE14_M_fill_assignEmRKS1_' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/vector.tcc' line='195' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-903' is-artificial='yes'/>
+            <parameter type-id='type-id-1302' is-artificial='yes'/>
             <parameter type-id='type-id-5'/>
-            <parameter type-id='type-id-1356'/>
+            <parameter type-id='type-id-1355'/>
             <return type-id='type-id-56'/>
           </function-decl>
         </member-function>
         <member-function access='protected'>
           <function-decl name='_M_fill_insert' mangled-name='_ZNSt6vectorIN15MallocExtension12FreeListInfoESaIS1_EE14_M_fill_insertEN9__gnu_cxx17__normal_iteratorIPS1_S3_EEmRKS1_' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/vector.tcc' line='372' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-903' is-artificial='yes'/>
-            <parameter type-id='type-id-1344'/>
+            <parameter type-id='type-id-1302' is-artificial='yes'/>
+            <parameter type-id='type-id-1343'/>
             <parameter type-id='type-id-5'/>
-            <parameter type-id='type-id-1356'/>
+            <parameter type-id='type-id-1355'/>
             <return type-id='type-id-56'/>
           </function-decl>
         </member-function>
         <member-function access='protected'>
           <function-decl name='_M_insert_aux' mangled-name='_ZNSt6vectorIN15MallocExtension12FreeListInfoESaIS1_EE13_M_insert_auxEN9__gnu_cxx17__normal_iteratorIPS1_S3_EERKS1_' 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='_ZNSt6vectorIN15MallocExtension12FreeListInfoESaIS1_EE13_M_insert_auxEN9__gnu_cxx17__normal_iteratorIPS1_S3_EERKS1_'>
-            <parameter type-id='type-id-903' is-artificial='yes'/>
-            <parameter type-id='type-id-1344'/>
-            <parameter type-id='type-id-1356'/>
+            <parameter type-id='type-id-1302' is-artificial='yes'/>
+            <parameter type-id='type-id-1343'/>
+            <parameter type-id='type-id-1355'/>
             <return type-id='type-id-56'/>
           </function-decl>
         </member-function>
@@ -21948,8 +21943,8 @@
         </member-function>
         <member-function access='protected'>
           <function-decl name='_M_erase_at_end' mangled-name='_ZNSt6vectorIN15MallocExtension12FreeListInfoESaIS1_EE15_M_erase_at_endEPS1_' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='1148' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-903' is-artificial='yes'/>
-            <parameter type-id='type-id-1340'/>
+            <parameter type-id='type-id-1302' is-artificial='yes'/>
+            <parameter type-id='type-id-1339'/>
             <return type-id='type-id-56'/>
           </function-decl>
         </member-function>
@@ -21959,10 +21954,10 @@
       <class-decl name='__copy_move_backward&lt;false, true, std::random_access_iterator_tag&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_algobase.h' line='511' column='1' id='type-id-1490'>
         <member-function access='public' static='yes'>
           <function-decl name='__copy_move_b&lt;MallocExtension::FreeListInfo&gt;' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_algobase.h' line='572' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1357'/>
-            <parameter type-id='type-id-1357'/>
-            <parameter type-id='type-id-1340'/>
-            <return type-id='type-id-1340'/>
+            <parameter type-id='type-id-1356'/>
+            <parameter type-id='type-id-1356'/>
+            <parameter type-id='type-id-1339'/>
+            <return type-id='type-id-1339'/>
           </function-decl>
         </member-function>
         <member-function access='public' static='yes'>
@@ -21993,26 +21988,26 @@
       <class-decl name='__niter_base&lt;MallocExtension::FreeListInfo*, false&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_algobase.h' line='267' column='1' id='type-id-1491'>
         <member-function access='public' static='yes'>
           <function-decl name='__b' mangled-name='_ZNSt12__niter_baseIPN15MallocExtension12FreeListInfoELb0EE3__bES2_' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_algobase.h' line='269' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1340'/>
-            <return type-id='type-id-1340'/>
+            <parameter type-id='type-id-1339'/>
+            <return type-id='type-id-1339'/>
           </function-decl>
         </member-function>
       </class-decl>
       <class-decl name='__miter_base&lt;MallocExtension::FreeListInfo*, false&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_algobase.h' line='285' column='1' id='type-id-1492'>
         <member-function access='public' static='yes'>
           <function-decl name='__b' mangled-name='_ZNSt12__miter_baseIPN15MallocExtension12FreeListInfoELb0EE3__bES2_' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_algobase.h' line='287' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1340'/>
-            <return type-id='type-id-1340'/>
+            <parameter type-id='type-id-1339'/>
+            <return type-id='type-id-1339'/>
           </function-decl>
         </member-function>
       </class-decl>
       <class-decl name='__copy_move&lt;false, true, std::random_access_iterator_tag&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_algobase.h' line='307' column='1' id='type-id-1493'>
         <member-function access='public' static='yes'>
           <function-decl name='__copy_m&lt;MallocExtension::FreeListInfo&gt;' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_algobase.h' line='376' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1357'/>
-            <parameter type-id='type-id-1357'/>
-            <parameter type-id='type-id-1340'/>
-            <return type-id='type-id-1340'/>
+            <parameter type-id='type-id-1356'/>
+            <parameter type-id='type-id-1356'/>
+            <parameter type-id='type-id-1339'/>
+            <return type-id='type-id-1339'/>
           </function-decl>
         </member-function>
         <member-function access='public' static='yes'>
@@ -22043,10 +22038,10 @@
       <class-decl name='__uninitialized_copy&lt;true&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_uninitialized.h' line='87' column='1' id='type-id-1494'>
         <member-function access='public' static='yes'>
           <function-decl name='uninitialized_copy&lt;MallocExtension::FreeListInfo*, MallocExtension::FreeListInfo*&gt;' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_uninitialized.h' line='90' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1340'/>
-            <parameter type-id='type-id-1340'/>
-            <parameter type-id='type-id-1340'/>
-            <return type-id='type-id-1340'/>
+            <parameter type-id='type-id-1339'/>
+            <parameter type-id='type-id-1339'/>
+            <parameter type-id='type-id-1339'/>
+            <return type-id='type-id-1339'/>
           </function-decl>
         </member-function>
         <member-function access='public' static='yes'>
@@ -23169,665 +23164,439 @@
             <parameter type-id='type-id-1390' is-artificial='yes'/>
             <parameter type-id='type-id-52'/>
             <parameter type-id='type-id-5'/>
-            <parameter type-id='type-id-5'/>
-            <return type-id='type-id-57'/>
-          </function-decl>
-        </member-function>
-        <member-function access='public'>
-          <function-decl name='find_first_of' mangled-name='_ZNKSs13find_first_ofEPKcm' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/basic_string.h' line='1787' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1390' is-artificial='yes'/>
-            <parameter type-id='type-id-52'/>
-            <parameter type-id='type-id-5'/>
-            <return type-id='type-id-57'/>
-          </function-decl>
-        </member-function>
-        <member-function access='public'>
-          <function-decl name='find_first_of' mangled-name='_ZNKSs13find_first_ofEcm' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/basic_string.h' line='1806' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1390' is-artificial='yes'/>
-            <parameter type-id='type-id-66'/>
-            <parameter type-id='type-id-5'/>
-            <return type-id='type-id-57'/>
-          </function-decl>
-        </member-function>
-        <member-function access='public'>
-          <function-decl name='find_last_of' mangled-name='_ZNKSs12find_last_ofERKSsm' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/basic_string.h' line='1820' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1390' is-artificial='yes'/>
-            <parameter type-id='type-id-718'/>
-            <parameter type-id='type-id-5'/>
-            <return type-id='type-id-57'/>
-          </function-decl>
-        </member-function>
-        <member-function access='public'>
-          <function-decl name='find_last_of' mangled-name='_ZNKSs12find_last_ofEPKcmm' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/basic_string.tcc' line='831' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1390' is-artificial='yes'/>
-            <parameter type-id='type-id-52'/>
-            <parameter type-id='type-id-5'/>
-            <parameter type-id='type-id-5'/>
-            <return type-id='type-id-57'/>
-          </function-decl>
-        </member-function>
-        <member-function access='public'>
-          <function-decl name='find_last_of' mangled-name='_ZNKSs12find_last_ofEPKcm' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/basic_string.h' line='1848' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1390' is-artificial='yes'/>
-            <parameter type-id='type-id-52'/>
-            <parameter type-id='type-id-5'/>
-            <return type-id='type-id-57'/>
-          </function-decl>
-        </member-function>
-        <member-function access='public'>
-          <function-decl name='find_last_of' mangled-name='_ZNKSs12find_last_ofEcm' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/basic_string.h' line='1867' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1390' is-artificial='yes'/>
-            <parameter type-id='type-id-66'/>
-            <parameter type-id='type-id-5'/>
-            <return type-id='type-id-57'/>
-          </function-decl>
-        </member-function>
-        <member-function access='public'>
-          <function-decl name='find_first_not_of' mangled-name='_ZNKSs17find_first_not_ofERKSsm' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/basic_string.h' line='1881' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1390' is-artificial='yes'/>
-            <parameter type-id='type-id-718'/>
-            <parameter type-id='type-id-5'/>
-            <return type-id='type-id-57'/>
-          </function-decl>
-        </member-function>
-        <member-function access='public'>
-          <function-decl name='find_first_not_of' mangled-name='_ZNKSs17find_first_not_ofEPKcmm' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/basic_string.tcc' line='852' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1390' is-artificial='yes'/>
-            <parameter type-id='type-id-52'/>
-            <parameter type-id='type-id-5'/>
-            <parameter type-id='type-id-5'/>
-            <return type-id='type-id-57'/>
-          </function-decl>
-        </member-function>
-        <member-function access='public'>
-          <function-decl name='find_first_not_of' mangled-name='_ZNKSs17find_first_not_ofEPKcm' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/basic_string.h' line='1910' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1390' is-artificial='yes'/>
-            <parameter type-id='type-id-52'/>
-            <parameter type-id='type-id-5'/>
-            <return type-id='type-id-57'/>
-          </function-decl>
-        </member-function>
-        <member-function access='public'>
-          <function-decl name='find_first_not_of' mangled-name='_ZNKSs17find_first_not_ofEcm' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/basic_string.tcc' line='864' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1390' is-artificial='yes'/>
-            <parameter type-id='type-id-66'/>
-            <parameter type-id='type-id-5'/>
-            <return type-id='type-id-57'/>
-          </function-decl>
-        </member-function>
-        <member-function access='public'>
-          <function-decl name='find_last_not_of' mangled-name='_ZNKSs16find_last_not_ofERKSsm' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/basic_string.h' line='1940' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1390' is-artificial='yes'/>
-            <parameter type-id='type-id-718'/>
-            <parameter type-id='type-id-5'/>
-            <return type-id='type-id-57'/>
-          </function-decl>
-        </member-function>
-        <member-function access='public'>
-          <function-decl name='find_last_not_of' mangled-name='_ZNKSs16find_last_not_ofEPKcmm' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/basic_string.tcc' line='875' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1390' is-artificial='yes'/>
-            <parameter type-id='type-id-52'/>
-            <parameter type-id='type-id-5'/>
-            <parameter type-id='type-id-5'/>
-            <return type-id='type-id-57'/>
-          </function-decl>
-        </member-function>
-        <member-function access='public'>
-          <function-decl name='find_last_not_of' mangled-name='_ZNKSs16find_last_not_ofEPKcm' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/basic_string.h' line='1969' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1390' is-artificial='yes'/>
-            <parameter type-id='type-id-52'/>
-            <parameter type-id='type-id-5'/>
-            <return type-id='type-id-57'/>
-          </function-decl>
-        </member-function>
-        <member-function access='public'>
-          <function-decl name='find_last_not_of' mangled-name='_ZNKSs16find_last_not_ofEcm' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/basic_string.tcc' line='896' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1390' is-artificial='yes'/>
-            <parameter type-id='type-id-66'/>
-            <parameter type-id='type-id-5'/>
-            <return type-id='type-id-57'/>
-          </function-decl>
-        </member-function>
-        <member-function access='public'>
-          <function-decl name='substr' mangled-name='_ZNKSs6substrEmm' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/basic_string.h' line='2001' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1390' is-artificial='yes'/>
-            <parameter type-id='type-id-5'/>
-            <parameter type-id='type-id-5'/>
-            <return type-id='type-id-726'/>
-          </function-decl>
-        </member-function>
-        <member-function access='public'>
-          <function-decl name='compare' mangled-name='_ZNKSs7compareERKSs' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/basic_string.h' line='2019' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1390' is-artificial='yes'/>
-            <parameter type-id='type-id-718'/>
-            <return type-id='type-id-1'/>
-          </function-decl>
-        </member-function>
-        <member-function access='public'>
-          <function-decl name='compare' mangled-name='_ZNKSs7compareEmmRKSs' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/basic_string.tcc' line='916' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1390' is-artificial='yes'/>
-            <parameter type-id='type-id-5'/>
-            <parameter type-id='type-id-5'/>
-            <parameter type-id='type-id-718'/>
-            <return type-id='type-id-1'/>
-          </function-decl>
-        </member-function>
-        <member-function access='public'>
-          <function-decl name='compare' mangled-name='_ZNKSs7compareEmmRKSsmm' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/basic_string.tcc' line='931' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1390' is-artificial='yes'/>
-            <parameter type-id='type-id-5'/>
-            <parameter type-id='type-id-5'/>
-            <parameter type-id='type-id-718'/>
-            <parameter type-id='type-id-5'/>
-            <parameter type-id='type-id-5'/>
-            <return type-id='type-id-1'/>
-          </function-decl>
-        </member-function>
-        <member-function access='public'>
-          <function-decl name='compare' mangled-name='_ZNKSs7compareEPKc' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/basic_string.tcc' line='949' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1390' is-artificial='yes'/>
-            <parameter type-id='type-id-52'/>
-            <return type-id='type-id-1'/>
-          </function-decl>
-        </member-function>
-        <member-function access='public'>
-          <function-decl name='compare' mangled-name='_ZNKSs7compareEmmPKc' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/basic_string.tcc' line='964' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1390' is-artificial='yes'/>
-            <parameter type-id='type-id-5'/>
-            <parameter type-id='type-id-5'/>
-            <parameter type-id='type-id-52'/>
-            <return type-id='type-id-1'/>
+            <parameter type-id='type-id-5'/>
+            <return type-id='type-id-57'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
-          <function-decl name='compare' mangled-name='_ZNKSs7compareEmmPKcm' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/basic_string.tcc' line='980' column='1' visibility='default' binding='global' size-in-bits='64'>
+          <function-decl name='find_first_of' mangled-name='_ZNKSs13find_first_ofEPKcm' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/basic_string.h' line='1787' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1390' is-artificial='yes'/>
-            <parameter type-id='type-id-5'/>
-            <parameter type-id='type-id-5'/>
             <parameter type-id='type-id-52'/>
             <parameter type-id='type-id-5'/>
-            <return type-id='type-id-1'/>
-          </function-decl>
-        </member-function>
-      </class-decl>
-      <class-decl name='allocator&lt;char&gt;' size-in-bits='8' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stringfwd.h' line='45' column='1' id='type-id-1386'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1349'/>
-        <member-function access='private'>
-          <function-decl name='allocator' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/allocator.h' line='101' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1434' is-artificial='yes'/>
-            <return type-id='type-id-56'/>
-          </function-decl>
-        </member-function>
-        <member-function access='private'>
-          <function-decl name='allocator' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/allocator.h' line='103' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1434' is-artificial='yes'/>
-            <parameter type-id='type-id-1388'/>
-            <return type-id='type-id-56'/>
+            <return type-id='type-id-57'/>
           </function-decl>
         </member-function>
-        <member-function access='private' destructor='yes'>
-          <function-decl name='~allocator' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/allocator.h' line='109' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1434' is-artificial='yes'/>
-            <parameter type-id='type-id-1' is-artificial='yes'/>
-            <return type-id='type-id-56'/>
+        <member-function access='public'>
+          <function-decl name='find_first_of' mangled-name='_ZNKSs13find_first_ofEcm' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/basic_string.h' line='1806' column='1' visibility='default' binding='global' size-in-bits='64'>
+            <parameter type-id='type-id-1390' is-artificial='yes'/>
+            <parameter type-id='type-id-66'/>
+            <parameter type-id='type-id-5'/>
+            <return type-id='type-id-57'/>
           </function-decl>
         </member-function>
-      </class-decl>
-      <class-decl name='reverse_iterator&lt;__gnu_cxx::__normal_iterator&lt;char*, std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt; &gt; &gt;' visibility='default' is-declaration-only='yes' id='type-id-1499'/>
-      <class-decl name='reverse_iterator&lt;__gnu_cxx::__normal_iterator&lt;const char*, std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt; &gt; &gt;' visibility='default' is-declaration-only='yes' id='type-id-1500'/>
-      <typedef-decl name='string' type-id='type-id-726' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stringfwd.h' line='56' column='1' id='type-id-783'/>
-      <class-decl name='nothrow_t' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/new' line='67' column='1' id='type-id-1395'/>
-    </namespace-decl>
-    <class-decl name='MallocExtension' size-in-bits='64' visibility='default' filepath='src/gperftools/malloc_extension.h' line='90' column='1' is-declaration-only='yes' id='type-id-894'>
-      <member-type access='private'>
-        <enum-decl name='Ownership' filepath='./src/gperftools/malloc_extension.h' line='315' column='1' id='type-id-898'>
-          <underlying-type type-id='type-id-133'/>
-          <enumerator name='kUnknownOwnership' value='0'/>
-          <enumerator name='kOwned' value='1'/>
-          <enumerator name='kNotOwned' value='2'/>
-        </enum-decl>
-      </member-type>
-      <member-type access='private'>
-        <class-decl name='FreeListInfo' size-in-bits='256' is-struct='yes' visibility='default' filepath='./src/gperftools/malloc_extension.h' line='333' column='1' id='type-id-899'>
-          <data-member access='public' layout-offset-in-bits='0'>
-            <var-decl name='min_object_size' type-id='type-id-57' visibility='default' filepath='./src/gperftools/malloc_extension.h' line='334' column='1'/>
-          </data-member>
-          <data-member access='public' layout-offset-in-bits='64'>
-            <var-decl name='max_object_size' type-id='type-id-57' visibility='default' filepath='./src/gperftools/malloc_extension.h' line='335' column='1'/>
-          </data-member>
-          <data-member access='public' layout-offset-in-bits='128'>
-            <var-decl name='total_bytes_free' type-id='type-id-57' visibility='default' filepath='./src/gperftools/malloc_extension.h' line='336' column='1'/>
-          </data-member>
-          <data-member access='public' layout-offset-in-bits='192'>
-            <var-decl name='type' type-id='type-id-52' visibility='default' filepath='./src/gperftools/malloc_extension.h' line='337' column='1'/>
-          </data-member>
-        </class-decl>
-      </member-type>
-      <member-type access='private'>
-        <typedef-decl name='RangeFunction' type-id='type-id-900' filepath='src/gperftools/malloc_extension.h' line='143' column='1' id='type-id-895'/>
-      </member-type>
-      <member-function access='private' static='yes'>
-        <function-decl name='Initialize' mangled-name='_ZN15MallocExtension10InitializeEv' filepath='src/malloc_extension.cc' line='79' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN15MallocExtension10InitializeEv'>
-          <return type-id='type-id-56'/>
-        </function-decl>
-      </member-function>
-      <member-function access='private' static='yes'>
-        <function-decl name='instance' mangled-name='_ZN15MallocExtension8instanceEv' filepath='src/malloc_extension.cc' line='212' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN15MallocExtension8instanceEv'>
-          <return type-id='type-id-259'/>
-        </function-decl>
-      </member-function>
-      <member-function access='private'>
-        <function-decl name='Register' mangled-name='_ZN15MallocExtension8RegisterEPS_' filepath='src/malloc_extension.cc' line='217' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN15MallocExtension8RegisterEPS_'>
-          <parameter type-id='type-id-259' is-artificial='yes'/>
-          <return type-id='type-id-56'/>
-        </function-decl>
-      </member-function>
-      <member-function access='private' destructor='yes' vtable-offset='-1'>
-        <function-decl name='~MallocExtension' mangled-name='_ZN15MallocExtensionD1Ev' filepath='src/malloc_extension.cc' line='111' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN15MallocExtensionD1Ev'>
-          <parameter type-id='type-id-259' is-artificial='yes'/>
-          <parameter type-id='type-id-1' is-artificial='yes'/>
-          <return type-id='type-id-56'/>
-        </function-decl>
-      </member-function>
-      <member-function access='private' vtable-offset='2'>
-        <function-decl name='VerifyAllMemory' mangled-name='_ZN15MallocExtension15VerifyAllMemoryEv' filepath='src/malloc_extension.cc' line='112' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN15MallocExtension15VerifyAllMemoryEv'>
-          <parameter type-id='type-id-259' is-artificial='yes'/>
-          <return type-id='type-id-55'/>
-        </function-decl>
-      </member-function>
-      <member-function access='private' vtable-offset='3'>
-        <function-decl name='VerifyNewMemory' mangled-name='_ZN15MallocExtension15VerifyNewMemoryEPKv' filepath='src/malloc_extension.cc' line='113' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN15MallocExtension15VerifyNewMemoryEPKv'>
-          <parameter type-id='type-id-259' is-artificial='yes'/>
-          <parameter type-id='type-id-53'/>
-          <return type-id='type-id-55'/>
-        </function-decl>
-      </member-function>
-      <member-function access='private' vtable-offset='4'>
-        <function-decl name='VerifyArrayNewMemory' mangled-name='_ZN15MallocExtension20VerifyArrayNewMemoryEPKv' filepath='src/malloc_extension.cc' line='114' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN15MallocExtension20VerifyArrayNewMemoryEPKv'>
-          <parameter type-id='type-id-259' is-artificial='yes'/>
-          <parameter type-id='type-id-53'/>
-          <return type-id='type-id-55'/>
-        </function-decl>
-      </member-function>
-      <member-function access='private' vtable-offset='5'>
-        <function-decl name='VerifyMallocMemory' mangled-name='_ZN15MallocExtension18VerifyMallocMemoryEPKv' filepath='src/malloc_extension.cc' line='115' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN15MallocExtension18VerifyMallocMemoryEPKv'>
-          <parameter type-id='type-id-259' is-artificial='yes'/>
-          <parameter type-id='type-id-53'/>
-          <return type-id='type-id-55'/>
-        </function-decl>
-      </member-function>
-      <member-function access='private' vtable-offset='6'>
-        <function-decl name='MallocMemoryStats' mangled-name='_ZN15MallocExtension17MallocMemoryStatsEPiPmS0_' filepath='src/malloc_extension.cc' line='130' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN15MallocExtension17MallocMemoryStatsEPiPmS0_'>
-          <parameter type-id='type-id-259' is-artificial='yes'/>
-          <parameter type-id='type-id-897'/>
-          <parameter type-id='type-id-230'/>
-          <parameter type-id='type-id-897'/>
-          <return type-id='type-id-55'/>
-        </function-decl>
-      </member-function>
-      <member-function access='private' vtable-offset='7'>
-        <function-decl name='GetStats' mangled-name='_ZN15MallocExtension8GetStatsEPci' filepath='src/malloc_extension.cc' line='125' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN15MallocExtension8GetStatsEPci'>
-          <parameter type-id='type-id-259' is-artificial='yes'/>
-          <parameter type-id='type-id-90'/>
-          <parameter type-id='type-id-1'/>
-          <return type-id='type-id-56'/>
-        </function-decl>
-      </member-function>
-      <member-function access='private' vtable-offset='8'>
-        <function-decl name='GetHeapSample' mangled-name='_ZN15MallocExtension13GetHeapSampleEPSs' filepath='src/malloc_extension.cc' line='292' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN15MallocExtension13GetHeapSampleEPSs'>
-          <parameter type-id='type-id-259' is-artificial='yes'/>
-          <parameter type-id='type-id-901'/>
-          <return type-id='type-id-56'/>
-        </function-decl>
-      </member-function>
-      <member-function access='private' vtable-offset='9'>
-        <function-decl name='GetHeapGrowthStacks' mangled-name='_ZN15MallocExtension19GetHeapGrowthStacksEPSs' filepath='src/malloc_extension.cc' line='316' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN15MallocExtension19GetHeapGrowthStacksEPSs'>
-          <parameter type-id='type-id-259' is-artificial='yes'/>
-          <parameter type-id='type-id-901'/>
-          <return type-id='type-id-56'/>
-        </function-decl>
-      </member-function>
-      <member-function access='private' vtable-offset='10'>
-        <function-decl name='Ranges' mangled-name='_ZN15MallocExtension6RangesEPvPFvS0_PKN4base11MallocRangeEE' filepath='src/malloc_extension.cc' line='340' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN15MallocExtension6RangesEPvPFvS0_PKN4base11MallocRangeEE'>
-          <parameter type-id='type-id-259' is-artificial='yes'/>
-          <parameter type-id='type-id-53'/>
-          <parameter type-id='type-id-896'/>
-          <return type-id='type-id-56'/>
-        </function-decl>
-      </member-function>
-      <member-function access='private' vtable-offset='11'>
-        <function-decl name='GetNumericProperty' mangled-name='_ZN15MallocExtension18GetNumericPropertyEPKcPm' filepath='src/malloc_extension.cc' line='117' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN15MallocExtension18GetNumericPropertyEPKcPm'>
-          <parameter type-id='type-id-259' is-artificial='yes'/>
-          <parameter type-id='type-id-52'/>
-          <parameter type-id='type-id-230'/>
-          <return type-id='type-id-55'/>
-        </function-decl>
-      </member-function>
-      <member-function access='private' vtable-offset='12'>
-        <function-decl name='SetNumericProperty' mangled-name='_ZN15MallocExtension18SetNumericPropertyEPKcm' filepath='src/malloc_extension.cc' line='121' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN15MallocExtension18SetNumericPropertyEPKcm'>
-          <parameter type-id='type-id-259' is-artificial='yes'/>
-          <parameter type-id='type-id-52'/>
-          <parameter type-id='type-id-57'/>
-          <return type-id='type-id-55'/>
-        </function-decl>
-      </member-function>
-      <member-function access='private' vtable-offset='13'>
-        <function-decl name='MarkThreadIdle' mangled-name='_ZN15MallocExtension14MarkThreadIdleEv' filepath='src/malloc_extension.cc' line='146' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN15MallocExtension14MarkThreadIdleEv'>
-          <parameter type-id='type-id-259' is-artificial='yes'/>
-          <return type-id='type-id-56'/>
-        </function-decl>
-      </member-function>
-      <member-function access='private' vtable-offset='14'>
-        <function-decl name='MarkThreadBusy' mangled-name='_ZN15MallocExtension14MarkThreadBusyEv' filepath='src/malloc_extension.cc' line='150' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN15MallocExtension14MarkThreadBusyEv'>
-          <parameter type-id='type-id-259' is-artificial='yes'/>
-          <return type-id='type-id-56'/>
-        </function-decl>
-      </member-function>
-      <member-function access='private' vtable-offset='15'>
-        <function-decl name='GetSystemAllocator' mangled-name='_ZN15MallocExtension18GetSystemAllocatorEv' filepath='src/malloc_extension.cc' line='154' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN15MallocExtension18GetSystemAllocatorEv'>
-          <parameter type-id='type-id-259' is-artificial='yes'/>
-          <return type-id='type-id-902'/>
-        </function-decl>
-      </member-function>
-      <member-function access='private' vtable-offset='16'>
-        <function-decl name='SetSystemAllocator' mangled-name='_ZN15MallocExtension18SetSystemAllocatorEP12SysAllocator' filepath='src/malloc_extension.cc' line='158' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN15MallocExtension18SetSystemAllocatorEP12SysAllocator'>
-          <parameter type-id='type-id-259' is-artificial='yes'/>
-          <parameter type-id='type-id-902'/>
-          <return type-id='type-id-56'/>
-        </function-decl>
-      </member-function>
-      <member-function access='private' vtable-offset='17'>
-        <function-decl name='ReleaseToSystem' mangled-name='_ZN15MallocExtension15ReleaseToSystemEm' filepath='src/malloc_extension.cc' line='162' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN15MallocExtension15ReleaseToSystemEm'>
-          <parameter type-id='type-id-259' is-artificial='yes'/>
-          <parameter type-id='type-id-57'/>
-          <return type-id='type-id-56'/>
-        </function-decl>
-      </member-function>
-      <member-function access='private' vtable-offset='18'>
-        <function-decl name='ReleaseFreeMemory' mangled-name='_ZN15MallocExtension17ReleaseFreeMemoryEv' filepath='src/malloc_extension.cc' line='166' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN15MallocExtension17ReleaseFreeMemoryEv'>
-          <parameter type-id='type-id-259' is-artificial='yes'/>
-          <return type-id='type-id-56'/>
-        </function-decl>
-      </member-function>
-      <member-function access='private' vtable-offset='19'>
-        <function-decl name='SetMemoryReleaseRate' mangled-name='_ZN15MallocExtension20SetMemoryReleaseRateEd' filepath='src/malloc_extension.cc' line='170' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN15MallocExtension20SetMemoryReleaseRateEd'>
-          <parameter type-id='type-id-259' is-artificial='yes'/>
-          <parameter type-id='type-id-2'/>
-          <return type-id='type-id-56'/>
-        </function-decl>
-      </member-function>
-      <member-function access='private' vtable-offset='20'>
-        <function-decl name='GetMemoryReleaseRate' mangled-name='_ZN15MallocExtension20GetMemoryReleaseRateEv' filepath='src/malloc_extension.cc' line='174' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN15MallocExtension20GetMemoryReleaseRateEv'>
-          <parameter type-id='type-id-259' is-artificial='yes'/>
-          <return type-id='type-id-2'/>
-        </function-decl>
-      </member-function>
-      <member-function access='private' vtable-offset='21'>
-        <function-decl name='GetEstimatedAllocatedSize' mangled-name='_ZN15MallocExtension25GetEstimatedAllocatedSizeEm' filepath='src/malloc_extension.cc' line='178' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN15MallocExtension25GetEstimatedAllocatedSizeEm'>
-          <parameter type-id='type-id-259' is-artificial='yes'/>
-          <parameter type-id='type-id-57'/>
-          <return type-id='type-id-57'/>
-        </function-decl>
-      </member-function>
-      <member-function access='private' vtable-offset='22'>
-        <function-decl name='GetAllocatedSize' mangled-name='_ZN15MallocExtension16GetAllocatedSizeEPKv' filepath='src/malloc_extension.cc' line='182' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN15MallocExtension16GetAllocatedSizeEPKv'>
-          <parameter type-id='type-id-259' is-artificial='yes'/>
-          <parameter type-id='type-id-53'/>
-          <return type-id='type-id-57'/>
-        </function-decl>
-      </member-function>
-      <member-function access='private' vtable-offset='23'>
-        <function-decl name='GetOwnership' mangled-name='_ZN15MallocExtension12GetOwnershipEPKv' filepath='src/malloc_extension.cc' line='187' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN15MallocExtension12GetOwnershipEPKv'>
-          <parameter type-id='type-id-259' is-artificial='yes'/>
-          <parameter type-id='type-id-53'/>
-          <return type-id='type-id-898'/>
-        </function-decl>
-      </member-function>
-      <member-function access='private' vtable-offset='24'>
-        <function-decl name='GetFreeListSizes' mangled-name='_ZN15MallocExtension16GetFreeListSizesEPSt6vectorINS_12FreeListInfoESaIS1_EE' filepath='src/malloc_extension.cc' line='191' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN15MallocExtension16GetFreeListSizesEPSt6vectorINS_12FreeListInfoESaIS1_EE'>
-          <parameter type-id='type-id-259' is-artificial='yes'/>
-          <parameter type-id='type-id-903'/>
-          <return type-id='type-id-56'/>
-        </function-decl>
-      </member-function>
-      <member-function access='private' vtable-offset='25'>
-        <function-decl name='ReadStackTraces' mangled-name='_ZN15MallocExtension15ReadStackTracesEPi' filepath='src/malloc_extension.cc' line='138' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN15MallocExtension15ReadStackTracesEPi'>
-          <parameter type-id='type-id-259' is-artificial='yes'/>
-          <parameter type-id='type-id-897'/>
-          <return type-id='type-id-120'/>
-        </function-decl>
-      </member-function>
-      <member-function access='private' vtable-offset='26'>
-        <function-decl name='ReadHeapGrowthStackTraces' mangled-name='_ZN15MallocExtension25ReadHeapGrowthStackTracesEv' filepath='src/malloc_extension.cc' line='142' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN15MallocExtension25ReadHeapGrowthStackTracesEv'>
-          <parameter type-id='type-id-259' is-artificial='yes'/>
-          <return type-id='type-id-120'/>
-        </function-decl>
-      </member-function>
-    </class-decl>
+        <member-function access='public'>
+          <function-decl name='find_last_of' mangled-name='_ZNKSs12find_last_ofERKSsm' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/basic_string.h' line='1820' column='1' visibility='default' binding='global' size-in-bits='64'>
+            <parameter type-id='type-id-1390' is-artificial='yes'/>
+            <parameter type-id='type-id-718'/>
+            <parameter type-id='type-id-5'/>
+            <return type-id='type-id-57'/>
+          </function-decl>
+        </member-function>
+        <member-function access='public'>
+          <function-decl name='find_last_of' mangled-name='_ZNKSs12find_last_ofEPKcmm' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/basic_string.tcc' line='831' column='1' visibility='default' binding='global' size-in-bits='64'>
+            <parameter type-id='type-id-1390' is-artificial='yes'/>
+            <parameter type-id='type-id-52'/>
+            <parameter type-id='type-id-5'/>
+            <parameter type-id='type-id-5'/>
+            <return type-id='type-id-57'/>
+          </function-decl>
+        </member-function>
+        <member-function access='public'>
+          <function-decl name='find_last_of' mangled-name='_ZNKSs12find_last_ofEPKcm' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/basic_string.h' line='1848' column='1' visibility='default' binding='global' size-in-bits='64'>
+            <parameter type-id='type-id-1390' is-artificial='yes'/>
+            <parameter type-id='type-id-52'/>
+            <parameter type-id='type-id-5'/>
+            <return type-id='type-id-57'/>
+          </function-decl>
+        </member-function>
+        <member-function access='public'>
+          <function-decl name='find_last_of' mangled-name='_ZNKSs12find_last_ofEcm' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/basic_string.h' line='1867' column='1' visibility='default' binding='global' size-in-bits='64'>
+            <parameter type-id='type-id-1390' is-artificial='yes'/>
+            <parameter type-id='type-id-66'/>
+            <parameter type-id='type-id-5'/>
+            <return type-id='type-id-57'/>
+          </function-decl>
+        </member-function>
+        <member-function access='public'>
+          <function-decl name='find_first_not_of' mangled-name='_ZNKSs17find_first_not_ofERKSsm' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/basic_string.h' line='1881' column='1' visibility='default' binding='global' size-in-bits='64'>
+            <parameter type-id='type-id-1390' is-artificial='yes'/>
+            <parameter type-id='type-id-718'/>
+            <parameter type-id='type-id-5'/>
+            <return type-id='type-id-57'/>
+          </function-decl>
+        </member-function>
+        <member-function access='public'>
+          <function-decl name='find_first_not_of' mangled-name='_ZNKSs17find_first_not_ofEPKcmm' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/basic_string.tcc' line='852' column='1' visibility='default' binding='global' size-in-bits='64'>
+            <parameter type-id='type-id-1390' is-artificial='yes'/>
+            <parameter type-id='type-id-52'/>
+            <parameter type-id='type-id-5'/>
+            <parameter type-id='type-id-5'/>
+            <return type-id='type-id-57'/>
+          </function-decl>
+        </member-function>
+        <member-function access='public'>
+          <function-decl name='find_first_not_of' mangled-name='_ZNKSs17find_first_not_ofEPKcm' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/basic_string.h' line='1910' column='1' visibility='default' binding='global' size-in-bits='64'>
+            <parameter type-id='type-id-1390' is-artificial='yes'/>
+            <parameter type-id='type-id-52'/>
+            <parameter type-id='type-id-5'/>
+            <return type-id='type-id-57'/>
+          </function-decl>
+        </member-function>
+        <member-function access='public'>
+          <function-decl name='find_first_not_of' mangled-name='_ZNKSs17find_first_not_ofEcm' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/basic_string.tcc' line='864' column='1' visibility='default' binding='global' size-in-bits='64'>
+            <parameter type-id='type-id-1390' is-artificial='yes'/>
+            <parameter type-id='type-id-66'/>
+            <parameter type-id='type-id-5'/>
+            <return type-id='type-id-57'/>
+          </function-decl>
+        </member-function>
+        <member-function access='public'>
+          <function-decl name='find_last_not_of' mangled-name='_ZNKSs16find_last_not_ofERKSsm' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/basic_string.h' line='1940' column='1' visibility='default' binding='global' size-in-bits='64'>
+            <parameter type-id='type-id-1390' is-artificial='yes'/>
+            <parameter type-id='type-id-718'/>
+            <parameter type-id='type-id-5'/>
+            <return type-id='type-id-57'/>
+          </function-decl>
+        </member-function>
+        <member-function access='public'>
+          <function-decl name='find_last_not_of' mangled-name='_ZNKSs16find_last_not_ofEPKcmm' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/basic_string.tcc' line='875' column='1' visibility='default' binding='global' size-in-bits='64'>
+            <parameter type-id='type-id-1390' is-artificial='yes'/>
+            <parameter type-id='type-id-52'/>
+            <parameter type-id='type-id-5'/>
+            <parameter type-id='type-id-5'/>
+            <return type-id='type-id-57'/>
+          </function-decl>
+        </member-function>
+        <member-function access='public'>
+          <function-decl name='find_last_not_of' mangled-name='_ZNKSs16find_last_not_ofEPKcm' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/basic_string.h' line='1969' column='1' visibility='default' binding='global' size-in-bits='64'>
+            <parameter type-id='type-id-1390' is-artificial='yes'/>
+            <parameter type-id='type-id-52'/>
+            <parameter type-id='type-id-5'/>
+            <return type-id='type-id-57'/>
+          </function-decl>
+        </member-function>
+        <member-function access='public'>
+          <function-decl name='find_last_not_of' mangled-name='_ZNKSs16find_last_not_ofEcm' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/basic_string.tcc' line='896' column='1' visibility='default' binding='global' size-in-bits='64'>
+            <parameter type-id='type-id-1390' is-artificial='yes'/>
+            <parameter type-id='type-id-66'/>
+            <parameter type-id='type-id-5'/>
+            <return type-id='type-id-57'/>
+          </function-decl>
+        </member-function>
+        <member-function access='public'>
+          <function-decl name='substr' mangled-name='_ZNKSs6substrEmm' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/basic_string.h' line='2001' column='1' visibility='default' binding='global' size-in-bits='64'>
+            <parameter type-id='type-id-1390' is-artificial='yes'/>
+            <parameter type-id='type-id-5'/>
+            <parameter type-id='type-id-5'/>
+            <return type-id='type-id-726'/>
+          </function-decl>
+        </member-function>
+        <member-function access='public'>
+          <function-decl name='compare' mangled-name='_ZNKSs7compareERKSs' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/basic_string.h' line='2019' column='1' visibility='default' binding='global' size-in-bits='64'>
+            <parameter type-id='type-id-1390' is-artificial='yes'/>
+            <parameter type-id='type-id-718'/>
+            <return type-id='type-id-1'/>
+          </function-decl>
+        </member-function>
+        <member-function access='public'>
+          <function-decl name='compare' mangled-name='_ZNKSs7compareEmmRKSs' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/basic_string.tcc' line='916' column='1' visibility='default' binding='global' size-in-bits='64'>
+            <parameter type-id='type-id-1390' is-artificial='yes'/>
+            <parameter type-id='type-id-5'/>
+            <parameter type-id='type-id-5'/>
+            <parameter type-id='type-id-718'/>
+            <return type-id='type-id-1'/>
+          </function-decl>
+        </member-function>
+        <member-function access='public'>
+          <function-decl name='compare' mangled-name='_ZNKSs7compareEmmRKSsmm' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/basic_string.tcc' line='931' column='1' visibility='default' binding='global' size-in-bits='64'>
+            <parameter type-id='type-id-1390' is-artificial='yes'/>
+            <parameter type-id='type-id-5'/>
+            <parameter type-id='type-id-5'/>
+            <parameter type-id='type-id-718'/>
+            <parameter type-id='type-id-5'/>
+            <parameter type-id='type-id-5'/>
+            <return type-id='type-id-1'/>
+          </function-decl>
+        </member-function>
+        <member-function access='public'>
+          <function-decl name='compare' mangled-name='_ZNKSs7compareEPKc' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/basic_string.tcc' line='949' column='1' visibility='default' binding='global' size-in-bits='64'>
+            <parameter type-id='type-id-1390' is-artificial='yes'/>
+            <parameter type-id='type-id-52'/>
+            <return type-id='type-id-1'/>
+          </function-decl>
+        </member-function>
+        <member-function access='public'>
+          <function-decl name='compare' mangled-name='_ZNKSs7compareEmmPKc' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/basic_string.tcc' line='964' column='1' visibility='default' binding='global' size-in-bits='64'>
+            <parameter type-id='type-id-1390' is-artificial='yes'/>
+            <parameter type-id='type-id-5'/>
+            <parameter type-id='type-id-5'/>
+            <parameter type-id='type-id-52'/>
+            <return type-id='type-id-1'/>
+          </function-decl>
+        </member-function>
+        <member-function access='public'>
+          <function-decl name='compare' mangled-name='_ZNKSs7compareEmmPKcm' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/basic_string.tcc' line='980' column='1' visibility='default' binding='global' size-in-bits='64'>
+            <parameter type-id='type-id-1390' is-artificial='yes'/>
+            <parameter type-id='type-id-5'/>
+            <parameter type-id='type-id-5'/>
+            <parameter type-id='type-id-52'/>
+            <parameter type-id='type-id-5'/>
+            <return type-id='type-id-1'/>
+          </function-decl>
+        </member-function>
+      </class-decl>
+      <class-decl name='allocator&lt;char&gt;' size-in-bits='8' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stringfwd.h' line='45' column='1' id='type-id-1386'>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1348'/>
+        <member-function access='private'>
+          <function-decl name='allocator' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/allocator.h' line='101' column='1' visibility='default' binding='global' size-in-bits='64'>
+            <parameter type-id='type-id-1434' is-artificial='yes'/>
+            <return type-id='type-id-56'/>
+          </function-decl>
+        </member-function>
+        <member-function access='private'>
+          <function-decl name='allocator' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/allocator.h' line='103' column='1' visibility='default' binding='global' size-in-bits='64'>
+            <parameter type-id='type-id-1434' is-artificial='yes'/>
+            <parameter type-id='type-id-1388'/>
+            <return type-id='type-id-56'/>
+          </function-decl>
+        </member-function>
+        <member-function access='private' destructor='yes'>
+          <function-decl name='~allocator' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/allocator.h' line='109' column='1' visibility='default' binding='global' size-in-bits='64'>
+            <parameter type-id='type-id-1434' is-artificial='yes'/>
+            <parameter type-id='type-id-1' is-artificial='yes'/>
+            <return type-id='type-id-56'/>
+          </function-decl>
+        </member-function>
+      </class-decl>
+      <class-decl name='reverse_iterator&lt;__gnu_cxx::__normal_iterator&lt;char*, std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt; &gt; &gt;' visibility='default' is-declaration-only='yes' id='type-id-1499'/>
+      <class-decl name='reverse_iterator&lt;__gnu_cxx::__normal_iterator&lt;const char*, std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt; &gt; &gt;' visibility='default' is-declaration-only='yes' id='type-id-1500'/>
+      <typedef-decl name='string' type-id='type-id-726' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stringfwd.h' line='56' column='1' id='type-id-783'/>
+      <class-decl name='nothrow_t' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/new' line='67' column='1' id='type-id-1395'/>
+    </namespace-decl>
     <namespace-decl name='__gnu_cxx'>
       <function-decl name='abs' mangled-name='_ZN9__gnu_cxx3absEx' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/cstdlib' line='170' column='1' visibility='default' binding='global' size-in-bits='64'>
-        <parameter type-id='type-id-1257'/>
-        <return type-id='type-id-1257'/>
+        <parameter type-id='type-id-1251'/>
+        <return type-id='type-id-1251'/>
       </function-decl>
       <function-decl name='div' mangled-name='_ZN9__gnu_cxx3divExx' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/cstdlib' line='176' column='1' visibility='default' binding='global' size-in-bits='64'>
-        <parameter type-id='type-id-1257'/>
-        <parameter type-id='type-id-1257'/>
-        <return type-id='type-id-1277'/>
+        <parameter type-id='type-id-1251'/>
+        <parameter type-id='type-id-1251'/>
+        <return type-id='type-id-1271'/>
       </function-decl>
-      <class-decl name='__normal_iterator&lt;MallocExtension::FreeListInfo*, std::vector&lt;MallocExtension::FreeListInfo, std::allocator&lt;MallocExtension::FreeListInfo&gt; &gt; &gt;' size-in-bits='64' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_iterator.h' line='669' column='1' id='type-id-1344'>
+      <class-decl name='__normal_iterator&lt;MallocExtension::FreeListInfo*, std::vector&lt;MallocExtension::FreeListInfo, std::allocator&lt;MallocExtension::FreeListInfo&gt; &gt; &gt;' size-in-bits='64' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_iterator.h' line='669' column='1' id='type-id-1343'>
         <data-member access='protected' layout-offset-in-bits='0'>
-          <var-decl name='_M_current' type-id='type-id-1340' 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'/>
+          <var-decl name='_M_current' type-id='type-id-1339' 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>
         <member-function access='private'>
           <function-decl name='__normal_iterator' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_iterator.h' line='683' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1346' is-artificial='yes'/>
+            <parameter type-id='type-id-1345' is-artificial='yes'/>
             <return type-id='type-id-56'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='__normal_iterator' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_iterator.h' line='686' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1346' is-artificial='yes'/>
-            <parameter type-id='type-id-1342'/>
+            <parameter type-id='type-id-1345' is-artificial='yes'/>
+            <parameter type-id='type-id-1341'/>
             <return type-id='type-id-56'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='operator*' mangled-name='_ZNK9__gnu_cxx17__normal_iteratorIPN15MallocExtension12FreeListInfoESt6vectorIS2_SaIS2_EEEdeEv' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_iterator.h' line='698' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1363' is-artificial='yes'/>
-            <return type-id='type-id-1339'/>
+            <parameter type-id='type-id-1362' is-artificial='yes'/>
+            <return type-id='type-id-1338'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='operator-&gt;' mangled-name='_ZNK9__gnu_cxx17__normal_iteratorIPN15MallocExtension12FreeListInfoESt6vectorIS2_SaIS2_EEEptEv' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_iterator.h' line='702' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1363' is-artificial='yes'/>
-            <return type-id='type-id-1340'/>
+            <parameter type-id='type-id-1362' is-artificial='yes'/>
+            <return type-id='type-id-1339'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='operator++' mangled-name='_ZN9__gnu_cxx17__normal_iteratorIPN15MallocExtension12FreeListInfoESt6vectorIS2_SaIS2_EEEppEv' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_iterator.h' line='706' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1346' is-artificial='yes'/>
-            <return type-id='type-id-1345'/>
+            <parameter type-id='type-id-1345' is-artificial='yes'/>
+            <return type-id='type-id-1344'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='operator++' mangled-name='_ZN9__gnu_cxx17__normal_iteratorIPN15MallocExtension12FreeListInfoESt6vectorIS2_SaIS2_EEEppEi' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_iterator.h' line='713' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1346' is-artificial='yes'/>
+            <parameter type-id='type-id-1345' is-artificial='yes'/>
             <parameter type-id='type-id-1'/>
-            <return type-id='type-id-1344'/>
+            <return type-id='type-id-1343'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='operator--' mangled-name='_ZN9__gnu_cxx17__normal_iteratorIPN15MallocExtension12FreeListInfoESt6vectorIS2_SaIS2_EEEmmEv' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_iterator.h' line='718' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1346' is-artificial='yes'/>
-            <return type-id='type-id-1345'/>
+            <parameter type-id='type-id-1345' is-artificial='yes'/>
+            <return type-id='type-id-1344'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='operator--' mangled-name='_ZN9__gnu_cxx17__normal_iteratorIPN15MallocExtension12FreeListInfoESt6vectorIS2_SaIS2_EEEmmEi' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_iterator.h' line='725' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1346' is-artificial='yes'/>
+            <parameter type-id='type-id-1345' is-artificial='yes'/>
             <parameter type-id='type-id-1'/>
-            <return type-id='type-id-1344'/>
+            <return type-id='type-id-1343'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='operator[]' mangled-name='_ZNK9__gnu_cxx17__normal_iteratorIPN15MallocExtension12FreeListInfoESt6vectorIS2_SaIS2_EEEixERKl' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_iterator.h' line='730' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1363' is-artificial='yes'/>
+            <parameter type-id='type-id-1362' is-artificial='yes'/>
             <parameter type-id='type-id-780'/>
-            <return type-id='type-id-1339'/>
+            <return type-id='type-id-1338'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='operator+=' mangled-name='_ZN9__gnu_cxx17__normal_iteratorIPN15MallocExtension12FreeListInfoESt6vectorIS2_SaIS2_EEEpLERKl' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_iterator.h' line='734' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1346' is-artificial='yes'/>
+            <parameter type-id='type-id-1345' is-artificial='yes'/>
             <parameter type-id='type-id-780'/>
-            <return type-id='type-id-1345'/>
+            <return type-id='type-id-1344'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='operator+' mangled-name='_ZNK9__gnu_cxx17__normal_iteratorIPN15MallocExtension12FreeListInfoESt6vectorIS2_SaIS2_EEEplERKl' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_iterator.h' line='738' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1363' is-artificial='yes'/>
+            <parameter type-id='type-id-1362' is-artificial='yes'/>
             <parameter type-id='type-id-780'/>
-            <return type-id='type-id-1344'/>
+            <return type-id='type-id-1343'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='operator-=' mangled-name='_ZN9__gnu_cxx17__normal_iteratorIPN15MallocExtension12FreeListInfoESt6vectorIS2_SaIS2_EEEmIERKl' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_iterator.h' line='742' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1346' is-artificial='yes'/>
+            <parameter type-id='type-id-1345' is-artificial='yes'/>
             <parameter type-id='type-id-780'/>
-            <return type-id='type-id-1345'/>
+            <return type-id='type-id-1344'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='operator-' mangled-name='_ZNK9__gnu_cxx17__normal_iteratorIPN15MallocExtension12FreeListInfoESt6vectorIS2_SaIS2_EEEmiERKl' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_iterator.h' line='746' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1363' is-artificial='yes'/>
+            <parameter type-id='type-id-1362' is-artificial='yes'/>
             <parameter type-id='type-id-780'/>
-            <return type-id='type-id-1344'/>
+            <return type-id='type-id-1343'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='base' mangled-name='_ZNK9__gnu_cxx17__normal_iteratorIPN15MallocExtension12FreeListInfoESt6vectorIS2_SaIS2_EEE4baseEv' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_iterator.h' line='750' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1363' is-artificial='yes'/>
-            <return type-id='type-id-1342'/>
+            <parameter type-id='type-id-1362' is-artificial='yes'/>
+            <return type-id='type-id-1341'/>
           </function-decl>
         </member-function>
       </class-decl>
       <function-decl name='operator-&lt;MallocExtension::FreeListInfo*, std::vector&lt;MallocExtension::FreeListInfo, std::allocator&lt;MallocExtension::FreeListInfo&gt; &gt; &gt;' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_iterator.h' line='856' column='1' visibility='default' binding='global' size-in-bits='64'>
-        <parameter type-id='type-id-1362'/>
-        <parameter type-id='type-id-1362'/>
+        <parameter type-id='type-id-1361'/>
+        <parameter type-id='type-id-1361'/>
         <return type-id='type-id-186'/>
       </function-decl>
-      <class-decl name='new_allocator&lt;MallocExtension::FreeListInfo&gt;' size-in-bits='8' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/ext/new_allocator.h' line='52' column='1' id='type-id-1347'>
+      <class-decl name='new_allocator&lt;MallocExtension::FreeListInfo&gt;' size-in-bits='8' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/ext/new_allocator.h' line='52' column='1' id='type-id-1346'>
         <member-function access='private'>
           <function-decl name='new_allocator' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/ext/new_allocator.h' line='66' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1348' is-artificial='yes'/>
+            <parameter type-id='type-id-1347' is-artificial='yes'/>
             <return type-id='type-id-56'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='new_allocator' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/ext/new_allocator.h' line='68' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1348' is-artificial='yes'/>
-            <parameter type-id='type-id-1365'/>
+            <parameter type-id='type-id-1347' is-artificial='yes'/>
+            <parameter type-id='type-id-1364'/>
             <return type-id='type-id-56'/>
           </function-decl>
         </member-function>
         <member-function access='private' destructor='yes'>
           <function-decl name='~new_allocator' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/ext/new_allocator.h' line='73' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1348' is-artificial='yes'/>
+            <parameter type-id='type-id-1347' is-artificial='yes'/>
             <parameter type-id='type-id-1' is-artificial='yes'/>
             <return type-id='type-id-56'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='address' mangled-name='_ZNK9__gnu_cxx13new_allocatorIN15MallocExtension12FreeListInfoEE7addressERS2_' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/ext/new_allocator.h' line='76' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1366' is-artificial='yes'/>
-            <parameter type-id='type-id-1339'/>
-            <return type-id='type-id-1340'/>
+            <parameter type-id='type-id-1365' is-artificial='yes'/>
+            <parameter type-id='type-id-1338'/>
+            <return type-id='type-id-1339'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='address' mangled-name='_ZNK9__gnu_cxx13new_allocatorIN15MallocExtension12FreeListInfoEE7addressERKS2_' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/ext/new_allocator.h' line='79' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1366' is-artificial='yes'/>
-            <parameter type-id='type-id-1356'/>
-            <return type-id='type-id-1357'/>
+            <parameter type-id='type-id-1365' is-artificial='yes'/>
+            <parameter type-id='type-id-1355'/>
+            <return type-id='type-id-1356'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='allocate' mangled-name='_ZN9__gnu_cxx13new_allocatorIN15MallocExtension12FreeListInfoEE8allocateEmPKv' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/ext/new_allocator.h' line='84' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1348' is-artificial='yes'/>
+            <parameter type-id='type-id-1347' is-artificial='yes'/>
             <parameter type-id='type-id-5'/>
             <parameter type-id='type-id-53'/>
-            <return type-id='type-id-1340'/>
+            <return type-id='type-id-1339'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='deallocate' mangled-name='_ZN9__gnu_cxx13new_allocatorIN15MallocExtension12FreeListInfoEE10deallocateEPS2_m' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/ext/new_allocator.h' line='94' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1348' is-artificial='yes'/>
-            <parameter type-id='type-id-1340'/>
+            <parameter type-id='type-id-1347' is-artificial='yes'/>
+            <parameter type-id='type-id-1339'/>
             <parameter type-id='type-id-5'/>
             <return type-id='type-id-56'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='max_size' mangled-name='_ZNK9__gnu_cxx13new_allocatorIN15MallocExtension12FreeListInfoEE8max_sizeEv' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/ext/new_allocator.h' line='98' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1366' is-artificial='yes'/>
+            <parameter type-id='type-id-1365' is-artificial='yes'/>
             <return type-id='type-id-57'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='construct' mangled-name='_ZN9__gnu_cxx13new_allocatorIN15MallocExtension12FreeListInfoEE9constructEPS2_RKS2_' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/ext/new_allocator.h' line='104' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1348' is-artificial='yes'/>
-            <parameter type-id='type-id-1340'/>
-            <parameter type-id='type-id-1356'/>
+            <parameter type-id='type-id-1347' is-artificial='yes'/>
+            <parameter type-id='type-id-1339'/>
+            <parameter type-id='type-id-1355'/>
             <return type-id='type-id-56'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='destroy' mangled-name='_ZN9__gnu_cxx13new_allocatorIN15MallocExtension12FreeListInfoEE7destroyEPS2_' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/ext/new_allocator.h' line='115' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1348' is-artificial='yes'/>
-            <parameter type-id='type-id-1340'/>
+            <parameter type-id='type-id-1347' is-artificial='yes'/>
+            <parameter type-id='type-id-1339'/>
             <return type-id='type-id-56'/>
           </function-decl>
         </member-function>
       </class-decl>
       <class-decl name='__normal_iterator&lt;const MallocExtension::FreeListInfo*, std::vector&lt;MallocExtension::FreeListInfo, std::allocator&lt;MallocExtension::FreeListInfo&gt; &gt; &gt;' visibility='default' is-declaration-only='yes' id='type-id-1487'/>
-      <class-decl name='new_allocator&lt;char&gt;' size-in-bits='8' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/ext/new_allocator.h' line='52' column='1' id='type-id-1349'>
+      <class-decl name='new_allocator&lt;char&gt;' size-in-bits='8' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/ext/new_allocator.h' line='52' column='1' id='type-id-1348'>
         <member-function access='private'>
           <function-decl name='new_allocator' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/ext/new_allocator.h' line='66' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1350' is-artificial='yes'/>
+            <parameter type-id='type-id-1349' is-artificial='yes'/>
             <return type-id='type-id-56'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='new_allocator' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/ext/new_allocator.h' line='68' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1350' is-artificial='yes'/>
-            <parameter type-id='type-id-1368'/>
+            <parameter type-id='type-id-1349' is-artificial='yes'/>
+            <parameter type-id='type-id-1367'/>
             <return type-id='type-id-56'/>
           </function-decl>
         </member-function>
         <member-function access='private' destructor='yes'>
           <function-decl name='~new_allocator' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/ext/new_allocator.h' line='73' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1350' is-artificial='yes'/>
+            <parameter type-id='type-id-1349' is-artificial='yes'/>
             <parameter type-id='type-id-1' is-artificial='yes'/>
             <return type-id='type-id-56'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='address' mangled-name='_ZNK9__gnu_cxx13new_allocatorIcE7addressERc' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/ext/new_allocator.h' line='76' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1369' is-artificial='yes'/>
+            <parameter type-id='type-id-1368' is-artificial='yes'/>
             <parameter type-id='type-id-283'/>
             <return type-id='type-id-90'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='address' mangled-name='_ZNK9__gnu_cxx13new_allocatorIcE7addressERKc' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/ext/new_allocator.h' line='79' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1369' is-artificial='yes'/>
+            <parameter type-id='type-id-1368' is-artificial='yes'/>
             <parameter type-id='type-id-284'/>
             <return type-id='type-id-52'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='allocate' mangled-name='_ZN9__gnu_cxx13new_allocatorIcE8allocateEmPKv' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/ext/new_allocator.h' line='84' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1350' is-artificial='yes'/>
+            <parameter type-id='type-id-1349' is-artificial='yes'/>
             <parameter type-id='type-id-5'/>
             <parameter type-id='type-id-53'/>
             <return type-id='type-id-90'/>
@@ -23835,7 +23604,7 @@
         </member-function>
         <member-function access='private'>
           <function-decl name='deallocate' mangled-name='_ZN9__gnu_cxx13new_allocatorIcE10deallocateEPcm' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/ext/new_allocator.h' line='94' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1350' is-artificial='yes'/>
+            <parameter type-id='type-id-1349' is-artificial='yes'/>
             <parameter type-id='type-id-90'/>
             <parameter type-id='type-id-5'/>
             <return type-id='type-id-56'/>
@@ -23843,13 +23612,13 @@
         </member-function>
         <member-function access='private'>
           <function-decl name='max_size' mangled-name='_ZNK9__gnu_cxx13new_allocatorIcE8max_sizeEv' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/ext/new_allocator.h' line='98' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1369' is-artificial='yes'/>
+            <parameter type-id='type-id-1368' is-artificial='yes'/>
             <return type-id='type-id-57'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='construct' mangled-name='_ZN9__gnu_cxx13new_allocatorIcE9constructEPcRKc' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/ext/new_allocator.h' line='104' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1350' is-artificial='yes'/>
+            <parameter type-id='type-id-1349' is-artificial='yes'/>
             <parameter type-id='type-id-90'/>
             <parameter type-id='type-id-284'/>
             <return type-id='type-id-56'/>
@@ -23857,7 +23626,7 @@
         </member-function>
         <member-function access='private'>
           <function-decl name='destroy' mangled-name='_ZN9__gnu_cxx13new_allocatorIcE7destroyEPc' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/ext/new_allocator.h' line='115' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1350' is-artificial='yes'/>
+            <parameter type-id='type-id-1349' is-artificial='yes'/>
             <parameter type-id='type-id-90'/>
             <return type-id='type-id-56'/>
           </function-decl>
@@ -23887,7 +23656,7 @@
       <parameter type-id='type-id-53'/>
       <parameter type-id='type-id-57'/>
       <parameter type-id='type-id-57'/>
-      <parameter type-id='type-id-1285'/>
+      <parameter type-id='type-id-1279'/>
       <return type-id='type-id-53'/>
     </function-decl>
     <function-decl name='calloc' filepath='/usr/include/stdlib.h' line='473' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -23898,7 +23667,7 @@
     <function-decl name='div' filepath='/usr/include/stdlib.h' line='785' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-1'/>
       <parameter type-id='type-id-1'/>
-      <return type-id='type-id-1286'/>
+      <return type-id='type-id-1280'/>
     </function-decl>
     <function-decl name='free' filepath='/usr/include/stdlib.h' line='488' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-53'/>
@@ -23911,7 +23680,7 @@
     <function-decl name='ldiv' filepath='/usr/include/stdlib.h' line='787' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-285'/>
       <parameter type-id='type-id-285'/>
-      <return type-id='type-id-1295'/>
+      <return type-id='type-id-1289'/>
     </function-decl>
     <function-decl name='malloc' filepath='/usr/include/stdlib.h' line='471' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-57'/>
@@ -23938,7 +23707,7 @@
       <parameter type-id='type-id-53'/>
       <parameter type-id='type-id-57'/>
       <parameter type-id='type-id-57'/>
-      <parameter type-id='type-id-1285'/>
+      <parameter type-id='type-id-1279'/>
       <return type-id='type-id-56'/>
     </function-decl>
     <function-decl name='rand' filepath='/usr/include/stdlib.h' line='380' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -23950,7 +23719,7 @@
       <return type-id='type-id-53'/>
     </function-decl>
     <function-decl name='srand' filepath='/usr/include/stdlib.h' line='382' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-1123'/>
+      <parameter type-id='type-id-1117'/>
       <return type-id='type-id-56'/>
     </function-decl>
     <function-decl name='strtod' filepath='/usr/include/stdlib.h' line='165' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -23982,87 +23751,87 @@
     </function-decl>
     <function-decl name='wctomb' filepath='/usr/include/stdlib.h' line='867' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-90'/>
-      <parameter type-id='type-id-1276'/>
+      <parameter type-id='type-id-1270'/>
       <return type-id='type-id-1'/>
     </function-decl>
     <function-decl name='lldiv' filepath='/usr/include/stdlib.h' line='793' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-1257'/>
-      <parameter type-id='type-id-1257'/>
-      <return type-id='type-id-1277'/>
+      <parameter type-id='type-id-1251'/>
+      <parameter type-id='type-id-1251'/>
+      <return type-id='type-id-1271'/>
     </function-decl>
     <function-decl name='atoll' filepath='/usr/include/stdlib.h' line='158' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-52'/>
-      <return type-id='type-id-1257'/>
+      <return type-id='type-id-1251'/>
     </function-decl>
     <function-decl name='strtoll' filepath='/usr/include/stdlib.h' line='210' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-52'/>
       <parameter type-id='type-id-97'/>
       <parameter type-id='type-id-1'/>
-      <return type-id='type-id-1257'/>
+      <return type-id='type-id-1251'/>
     </function-decl>
     <function-decl name='strtoull' filepath='/usr/include/stdlib.h' line='215' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-52'/>
       <parameter type-id='type-id-97'/>
       <parameter type-id='type-id-1'/>
-      <return type-id='type-id-1258'/>
+      <return type-id='type-id-1252'/>
     </function-decl>
     <function-decl name='strtof' filepath='/usr/include/stdlib.h' line='173' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-52'/>
       <parameter type-id='type-id-97'/>
-      <return type-id='type-id-1251'/>
+      <return type-id='type-id-1245'/>
     </function-decl>
     <function-decl name='strtold' filepath='/usr/include/stdlib.h' line='176' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-52'/>
       <parameter type-id='type-id-97'/>
-      <return type-id='type-id-1256'/>
+      <return type-id='type-id-1250'/>
     </function-decl>
     <function-decl name='btowc' filepath='/usr/include/wchar.h' line='351' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-1'/>
-      <return type-id='type-id-1298'/>
+      <return type-id='type-id-1292'/>
     </function-decl>
     <function-decl name='fgetwc' filepath='/usr/include/wchar.h' line='743' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-1343'/>
-      <return type-id='type-id-1298'/>
+      <parameter type-id='type-id-1342'/>
+      <return type-id='type-id-1292'/>
     </function-decl>
     <function-decl name='fgetws' filepath='/usr/include/wchar.h' line='772' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-1484'/>
       <parameter type-id='type-id-1'/>
-      <parameter type-id='type-id-1343'/>
+      <parameter type-id='type-id-1342'/>
       <return type-id='type-id-1484'/>
     </function-decl>
     <function-decl name='fputwc' filepath='/usr/include/wchar.h' line='757' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-1276'/>
-      <parameter type-id='type-id-1343'/>
-      <return type-id='type-id-1298'/>
+      <parameter type-id='type-id-1270'/>
+      <parameter type-id='type-id-1342'/>
+      <return type-id='type-id-1292'/>
     </function-decl>
     <function-decl name='fputws' filepath='/usr/include/wchar.h' line='779' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-1424'/>
-      <parameter type-id='type-id-1343'/>
+      <parameter type-id='type-id-1342'/>
       <return type-id='type-id-1'/>
     </function-decl>
     <function-decl name='fwide' filepath='/usr/include/wchar.h' line='585' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-1343'/>
+      <parameter type-id='type-id-1342'/>
       <parameter type-id='type-id-1'/>
       <return type-id='type-id-1'/>
     </function-decl>
     <function-decl name='fwprintf' filepath='/usr/include/wchar.h' line='592' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-1343'/>
+      <parameter type-id='type-id-1342'/>
       <parameter type-id='type-id-1424'/>
       <parameter is-variadic='yes'/>
       <return type-id='type-id-1'/>
     </function-decl>
     <function-decl name='fwscanf' filepath='/usr/include/wchar.h' line='633' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-1343'/>
+      <parameter type-id='type-id-1342'/>
       <parameter type-id='type-id-1424'/>
       <parameter is-variadic='yes'/>
       <return type-id='type-id-1'/>
     </function-decl>
     <function-decl name='getwc' filepath='/usr/include/wchar.h' line='744' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-1343'/>
-      <return type-id='type-id-1298'/>
+      <parameter type-id='type-id-1342'/>
+      <return type-id='type-id-1292'/>
     </function-decl>
     <function-decl name='getwchar' filepath='/usr/include/wchar.h' line='750' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-1298'/>
+      <return type-id='type-id-1292'/>
     </function-decl>
     <function-decl name='mbrlen' filepath='/usr/include/wchar.h' line='374' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-52'/>
@@ -24089,13 +23858,13 @@
       <return type-id='type-id-57'/>
     </function-decl>
     <function-decl name='putwc' filepath='/usr/include/wchar.h' line='758' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-1276'/>
-      <parameter type-id='type-id-1343'/>
-      <return type-id='type-id-1298'/>
+      <parameter type-id='type-id-1270'/>
+      <parameter type-id='type-id-1342'/>
+      <return type-id='type-id-1292'/>
     </function-decl>
     <function-decl name='putwchar' filepath='/usr/include/wchar.h' line='764' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-1276'/>
-      <return type-id='type-id-1298'/>
+      <parameter type-id='type-id-1270'/>
+      <return type-id='type-id-1292'/>
     </function-decl>
     <function-decl name='swprintf' filepath='/usr/include/wchar.h' line='602' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-1484'/>
@@ -24111,18 +23880,18 @@
       <return type-id='type-id-1'/>
     </function-decl>
     <function-decl name='ungetwc' filepath='/usr/include/wchar.h' line='787' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-1298'/>
-      <parameter type-id='type-id-1343'/>
-      <return type-id='type-id-1298'/>
+      <parameter type-id='type-id-1292'/>
+      <parameter type-id='type-id-1342'/>
+      <return type-id='type-id-1292'/>
     </function-decl>
     <function-decl name='vfwprintf' filepath='/usr/include/wchar.h' line='610' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-1343'/>
+      <parameter type-id='type-id-1342'/>
       <parameter type-id='type-id-1424'/>
       <parameter type-id='type-id-64'/>
       <return type-id='type-id-1'/>
     </function-decl>
     <function-decl name='vfwscanf' filepath='/usr/include/wchar.h' line='687' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-1343'/>
+      <parameter type-id='type-id-1342'/>
       <parameter type-id='type-id-1424'/>
       <parameter type-id='type-id-64'/>
       <return type-id='type-id-1'/>
@@ -24152,7 +23921,7 @@
     </function-decl>
     <function-decl name='wcrtomb' filepath='/usr/include/wchar.h' line='368' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-90'/>
-      <parameter type-id='type-id-1276'/>
+      <parameter type-id='type-id-1270'/>
       <parameter type-id='type-id-1428'/>
       <return type-id='type-id-57'/>
     </function-decl>
@@ -24230,7 +23999,7 @@
     <function-decl name='wcstof' filepath='/usr/include/wchar.h' line='455' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-1424'/>
       <parameter type-id='type-id-1485'/>
-      <return type-id='type-id-1251'/>
+      <return type-id='type-id-1245'/>
     </function-decl>
     <function-decl name='wcstok' filepath='/usr/include/wchar.h' line='279' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-1484'/>
@@ -24257,7 +24026,7 @@
       <return type-id='type-id-57'/>
     </function-decl>
     <function-decl name='wctob' filepath='/usr/include/wchar.h' line='355' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-1298'/>
+      <parameter type-id='type-id-1292'/>
       <return type-id='type-id-1'/>
     </function-decl>
     <function-decl name='wmemcmp' filepath='/usr/include/wchar.h' line='322' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -24280,7 +24049,7 @@
     </function-decl>
     <function-decl name='wmemset' filepath='/usr/include/wchar.h' line='336' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-1484'/>
-      <parameter type-id='type-id-1276'/>
+      <parameter type-id='type-id-1270'/>
       <parameter type-id='type-id-57'/>
       <return type-id='type-id-1484'/>
     </function-decl>
@@ -24296,7 +24065,7 @@
     </function-decl>
     <function-decl name='wcschr' mangled-name='*wcschr' filepath='/usr/include/wchar.h' line='221' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-1424'/>
-      <parameter type-id='type-id-1276'/>
+      <parameter type-id='type-id-1270'/>
       <return type-id='type-id-1424'/>
     </function-decl>
     <function-decl name='wcspbrk' mangled-name='*wcspbrk' filepath='/usr/include/wchar.h' line='259' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -24306,7 +24075,7 @@
     </function-decl>
     <function-decl name='wcsrchr' mangled-name='*wcsrchr' filepath='/usr/include/wchar.h' line='231' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-1424'/>
-      <parameter type-id='type-id-1276'/>
+      <parameter type-id='type-id-1270'/>
       <return type-id='type-id-1424'/>
     </function-decl>
     <function-decl name='wcsstr' mangled-name='*wcsstr' filepath='/usr/include/wchar.h' line='270' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -24316,26 +24085,26 @@
     </function-decl>
     <function-decl name='wmemchr' mangled-name='*wmemchr' filepath='/usr/include/wchar.h' line='313' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-1424'/>
-      <parameter type-id='type-id-1276'/>
+      <parameter type-id='type-id-1270'/>
       <parameter type-id='type-id-57'/>
       <return type-id='type-id-1424'/>
     </function-decl>
     <function-decl name='wcstold' filepath='/usr/include/wchar.h' line='457' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-1424'/>
       <parameter type-id='type-id-1485'/>
-      <return type-id='type-id-1256'/>
+      <return type-id='type-id-1250'/>
     </function-decl>
     <function-decl name='wcstoll' filepath='/usr/include/wchar.h' line='481' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-1424'/>
       <parameter type-id='type-id-1485'/>
       <parameter type-id='type-id-1'/>
-      <return type-id='type-id-1257'/>
+      <return type-id='type-id-1251'/>
     </function-decl>
     <function-decl name='wcstoull' filepath='/usr/include/wchar.h' line='488' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-1424'/>
       <parameter type-id='type-id-1485'/>
       <parameter type-id='type-id-1'/>
-      <return type-id='type-id-1258'/>
+      <return type-id='type-id-1252'/>
     </function-decl>
     <function-decl name='setlocale' filepath='/usr/include/locale.h' line='125' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-1'/>
@@ -24347,7 +24116,7 @@
     </function-decl>
     <namespace-decl name='base'>
       <namespace-decl name='internal'>
-        <class-decl name='HookList&lt;void (*)(const void*, size_t)&gt;' size-in-bits='576' is-struct='yes' visibility='default' filepath='./src/malloc_hook-inl.h' line='59' column='1' id='type-id-947'>
+        <class-decl name='HookList&lt;void (*)(const void*, size_t)&gt;' size-in-bits='576' is-struct='yes' visibility='default' filepath='./src/malloc_hook-inl.h' line='59' column='1' id='type-id-941'>
           <data-member access='public' layout-offset-in-bits='0'>
             <var-decl name='priv_end' type-id='type-id-781' visibility='default' filepath='src/malloc_hook-inl.h' line='101' column='1'/>
           </data-member>
@@ -24356,20 +24125,20 @@
           </data-member>
           <member-function access='public'>
             <function-decl name='Add' mangled-name='_ZN4base8internal8HookListIPFvPKvmEE3AddES5_' filepath='src/malloc_hook-inl.h' line='65' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN4base8internal8HookListIPFvPKvmEE3AddES5_'>
-              <parameter type-id='type-id-1354' is-artificial='yes'/>
+              <parameter type-id='type-id-1353' is-artificial='yes'/>
               <parameter type-id='type-id-363'/>
               <return type-id='type-id-55'/>
             </function-decl>
           </member-function>
           <member-function access='public'>
             <function-decl name='FixupPrivEndLocked' mangled-name='_ZN4base8internal8HookListIPFvPKvmEE18FixupPrivEndLockedEv' filepath='src/malloc_hook-inl.h' line='67' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN4base8internal8HookListIPFvPKvmEE18FixupPrivEndLockedEv'>
-              <parameter type-id='type-id-1354' is-artificial='yes'/>
+              <parameter type-id='type-id-1353' is-artificial='yes'/>
               <return type-id='type-id-56'/>
             </function-decl>
           </member-function>
           <member-function access='public'>
             <function-decl name='Remove' mangled-name='_ZN4base8internal8HookListIPFvPKvmEE6RemoveES5_' filepath='src/malloc_hook-inl.h' line='72' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN4base8internal8HookListIPFvPKvmEE6RemoveES5_'>
-              <parameter type-id='type-id-1354' is-artificial='yes'/>
+              <parameter type-id='type-id-1353' is-artificial='yes'/>
               <parameter type-id='type-id-363'/>
               <return type-id='type-id-55'/>
             </function-decl>
@@ -24396,13 +24165,13 @@
           </member-function>
           <member-function access='public'>
             <function-decl name='ExchangeSingular' mangled-name='_ZN4base8internal8HookListIPFvPKvmEE16ExchangeSingularES5_' filepath='src/malloc_hook-inl.h' line='90' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN4base8internal8HookListIPFvPKvmEE16ExchangeSingularES5_'>
-              <parameter type-id='type-id-1354' is-artificial='yes'/>
+              <parameter type-id='type-id-1353' is-artificial='yes'/>
               <parameter type-id='type-id-363'/>
               <return type-id='type-id-363'/>
             </function-decl>
           </member-function>
         </class-decl>
-        <class-decl name='HookList&lt;void (*)(const void*)&gt;' size-in-bits='576' is-struct='yes' visibility='default' filepath='./src/malloc_hook-inl.h' line='59' column='1' id='type-id-948'>
+        <class-decl name='HookList&lt;void (*)(const void*)&gt;' size-in-bits='576' is-struct='yes' visibility='default' filepath='./src/malloc_hook-inl.h' line='59' column='1' id='type-id-942'>
           <data-member access='public' layout-offset-in-bits='0'>
             <var-decl name='priv_end' type-id='type-id-781' visibility='default' filepath='src/malloc_hook-inl.h' line='101' column='1'/>
           </data-member>
@@ -24411,20 +24180,20 @@
           </data-member>
           <member-function access='public'>
             <function-decl name='Add' mangled-name='_ZN4base8internal8HookListIPFvPKvEE3AddES5_' filepath='src/malloc_hook-inl.h' line='65' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-1353' is-artificial='yes'/>
+              <parameter type-id='type-id-1352' is-artificial='yes'/>
               <parameter type-id='type-id-218'/>
               <return type-id='type-id-55'/>
             </function-decl>
           </member-function>
           <member-function access='public'>
             <function-decl name='FixupPrivEndLocked' mangled-name='_ZN4base8internal8HookListIPFvPKvEE18FixupPrivEndLockedEv' filepath='src/malloc_hook-inl.h' line='67' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-1353' is-artificial='yes'/>
+              <parameter type-id='type-id-1352' is-artificial='yes'/>
               <return type-id='type-id-56'/>
             </function-decl>
           </member-function>
           <member-function access='public'>
             <function-decl name='Remove' mangled-name='_ZN4base8internal8HookListIPFvPKvEE6RemoveES5_' filepath='src/malloc_hook-inl.h' line='72' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-1353' is-artificial='yes'/>
+              <parameter type-id='type-id-1352' is-artificial='yes'/>
               <parameter type-id='type-id-218'/>
               <return type-id='type-id-55'/>
             </function-decl>
@@ -24451,7 +24220,7 @@
           </member-function>
           <member-function access='public'>
             <function-decl name='ExchangeSingular' mangled-name='_ZN4base8internal8HookListIPFvPKvEE16ExchangeSingularES5_' filepath='src/malloc_hook-inl.h' line='90' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-1353' is-artificial='yes'/>
+              <parameter type-id='type-id-1352' is-artificial='yes'/>
               <parameter type-id='type-id-218'/>
               <return type-id='type-id-218'/>
             </function-decl>
@@ -24470,10 +24239,10 @@
           <parameter type-id='type-id-82'/>
           <return type-id='type-id-82'/>
         </function-decl>
-        <typedef-decl name='Atomic64' type-id='type-id-1314' filepath='./src/base/atomicops-internals-x86.h' line='70' column='1' id='type-id-949'/>
+        <typedef-decl name='Atomic64' type-id='type-id-1313' filepath='./src/base/atomicops-internals-x86.h' line='70' column='1' id='type-id-943'/>
         <function-decl name='NoBarrier_Load' filepath='./src/base/atomicops-internals-x86.h' line='245' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-950'/>
-          <return type-id='type-id-949'/>
+          <parameter type-id='type-id-944'/>
+          <return type-id='type-id-943'/>
         </function-decl>
         <function-decl name='Acquire_CompareAndSwap' filepath='./src/base/atomicops-internals-x86.h' line='106' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-80'/>
@@ -24487,11 +24256,11 @@
           <return type-id='type-id-82'/>
         </function-decl>
       </namespace-decl>
-      <enum-decl name='LinkerInitialized' filepath='src/base/basictypes.h' line='381' column='1' id='type-id-1291'>
+      <enum-decl name='LinkerInitialized' filepath='src/base/basictypes.h' line='381' column='1' id='type-id-1285'>
         <underlying-type type-id='type-id-133'/>
         <enumerator name='LINKER_INITIALIZED' value='0'/>
       </enum-decl>
-      <class-decl name='MallocRange' size-in-bits='256' is-struct='yes' visibility='default' filepath='./src/gperftools/malloc_extension.h' line='399' column='1' id='type-id-1351'>
+      <class-decl name='MallocRange' size-in-bits='256' is-struct='yes' visibility='default' filepath='./src/gperftools/malloc_extension.h' line='399' column='1' id='type-id-1350'>
         <member-type access='public'>
           <enum-decl name='Type' filepath='./src/gperftools/malloc_extension.h' line='400' column='1' id='type-id-1501'>
             <underlying-type type-id='type-id-133'/>
@@ -24546,7 +24315,7 @@
               <var-decl name='ptr' type-id='type-id-53' visibility='default' filepath='src/internal_logging.h' line='93' column='1'/>
             </data-member>
             <data-member access='private'>
-              <var-decl name='snum' type-id='type-id-1314' visibility='default' filepath='src/internal_logging.h' line='94' column='1'/>
+              <var-decl name='snum' type-id='type-id-1313' visibility='default' filepath='src/internal_logging.h' line='94' column='1'/>
             </data-member>
             <data-member access='private'>
               <var-decl name='unum' type-id='type-id-15' visibility='default' filepath='src/internal_logging.h' line='95' column='1'/>
@@ -24589,14 +24358,14 @@
         <member-function access='private' constructor='yes'>
           <function-decl name='LogItem' filepath='src/internal_logging.h' line='76' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1449' is-artificial='yes'/>
-            <parameter type-id='type-id-1257'/>
+            <parameter type-id='type-id-1251'/>
             <return type-id='type-id-56'/>
           </function-decl>
         </member-function>
         <member-function access='private' constructor='yes'>
           <function-decl name='LogItem' filepath='src/internal_logging.h' line='77' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1449' is-artificial='yes'/>
-            <parameter type-id='type-id-1123'/>
+            <parameter type-id='type-id-1117'/>
             <return type-id='type-id-56'/>
           </function-decl>
         </member-function>
@@ -24610,7 +24379,7 @@
         <member-function access='private' constructor='yes'>
           <function-decl name='LogItem' filepath='src/internal_logging.h' line='79' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1449' is-artificial='yes'/>
-            <parameter type-id='type-id-1258'/>
+            <parameter type-id='type-id-1252'/>
             <return type-id='type-id-56'/>
           </function-decl>
         </member-function>
@@ -24652,13 +24421,13 @@
       </function-decl>
       <function-decl name='pages' filepath='src/common.h' line='151' column='1' visibility='default' binding='global' size-in-bits='64'>
         <parameter type-id='type-id-57'/>
-        <return type-id='type-id-1138'/>
+        <return type-id='type-id-1132'/>
       </function-decl>
       <namespace-decl name='commandlineflags'>
         <function-decl name='StringToLongLong' filepath='src/base/commandlineflags.h' line='132' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-52'/>
-          <parameter type-id='type-id-1257'/>
-          <return type-id='type-id-1257'/>
+          <parameter type-id='type-id-1251'/>
+          <return type-id='type-id-1251'/>
         </function-decl>
       </namespace-decl>
       <class-decl name='Static' size-in-bits='8' visibility='default' filepath='src/static_vars.h' line='50' column='1' id='type-id-1505'>
@@ -24669,7 +24438,7 @@
           <var-decl name='sizemap_' type-id='type-id-1463' mangled-name='_ZN8tcmalloc6Static8sizemap_E' visibility='default' filepath='src/static_vars.h' line='97' column='1' elf-symbol-id='_ZN8tcmalloc6Static8sizemap_E'/>
         </data-member>
         <data-member access='private' static='yes'>
-          <var-decl name='central_cache_' type-id='type-id-1264' mangled-name='_ZN8tcmalloc6Static14central_cache_E' visibility='default' filepath='src/static_vars.h' line='98' column='1' elf-symbol-id='_ZN8tcmalloc6Static14central_cache_E'/>
+          <var-decl name='central_cache_' type-id='type-id-1258' mangled-name='_ZN8tcmalloc6Static14central_cache_E' visibility='default' filepath='src/static_vars.h' line='98' column='1' elf-symbol-id='_ZN8tcmalloc6Static14central_cache_E'/>
         </data-member>
         <data-member access='private' static='yes'>
           <var-decl name='span_allocator_' type-id='type-id-1406' mangled-name='_ZN8tcmalloc6Static15span_allocator_E' visibility='default' filepath='src/static_vars.h' line='99' column='1' elf-symbol-id='_ZN8tcmalloc6Static15span_allocator_E'/>
@@ -24681,7 +24450,7 @@
           <var-decl name='sampled_objects_' type-id='type-id-117' mangled-name='_ZN8tcmalloc6Static16sampled_objects_E' visibility='default' filepath='src/static_vars.h' line='101' column='1' elf-symbol-id='_ZN8tcmalloc6Static16sampled_objects_E'/>
         </data-member>
         <data-member access='private' static='yes'>
-          <var-decl name='bucket_allocator_' type-id='type-id-1139' mangled-name='_ZN8tcmalloc6Static17bucket_allocator_E' visibility='default' filepath='src/static_vars.h' line='102' column='1' elf-symbol-id='_ZN8tcmalloc6Static17bucket_allocator_E'/>
+          <var-decl name='bucket_allocator_' type-id='type-id-1133' mangled-name='_ZN8tcmalloc6Static17bucket_allocator_E' visibility='default' filepath='src/static_vars.h' line='102' column='1' elf-symbol-id='_ZN8tcmalloc6Static17bucket_allocator_E'/>
         </data-member>
         <data-member access='private' static='yes'>
           <var-decl name='growth_stacks_' type-id='type-id-1465' mangled-name='_ZN8tcmalloc6Static14growth_stacks_E' visibility='default' filepath='src/static_vars.h' line='108' column='1' elf-symbol-id='_ZN8tcmalloc6Static14growth_stacks_E'/>
@@ -24737,7 +24506,7 @@
         </member-function>
         <member-function access='private' static='yes'>
           <function-decl name='sampled_objects' mangled-name='_ZN8tcmalloc6Static15sampled_objectsEv' filepath='src/static_vars.h' line='81' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <return type-id='type-id-1136'/>
+            <return type-id='type-id-1130'/>
           </function-decl>
         </member-function>
         <member-function access='private' static='yes'>
@@ -24753,7 +24522,7 @@
       </class-decl>
       <class-decl name='SizeMap' size-in-bits='31488' visibility='default' filepath='src/common.h' line='161' column='1' id='type-id-1463'>
         <data-member access='private' layout-offset-in-bits='0'>
-          <var-decl name='num_objects_to_move_' type-id='type-id-1254' visibility='default' filepath='src/common.h' line='168' column='1'/>
+          <var-decl name='num_objects_to_move_' type-id='type-id-1248' visibility='default' filepath='src/common.h' line='168' column='1'/>
         </data-member>
         <data-member access='private' static='yes'>
           <var-decl name='kMaxSmallSize' type-id='type-id-112' visibility='default' filepath='src/common.h' line='192' column='1'/>
@@ -24762,13 +24531,13 @@
           <var-decl name='kClassArraySize' type-id='type-id-89' visibility='default' filepath='src/common.h' line='194' column='1'/>
         </data-member>
         <data-member access='private' layout-offset-in-bits='2816'>
-          <var-decl name='class_array_' type-id='type-id-1269' visibility='default' filepath='src/common.h' line='195' column='1'/>
+          <var-decl name='class_array_' type-id='type-id-1263' visibility='default' filepath='src/common.h' line='195' column='1'/>
         </data-member>
         <data-member access='private' layout-offset-in-bits='20224'>
-          <var-decl name='class_to_size_' type-id='type-id-1260' visibility='default' filepath='src/common.h' line='212' column='1'/>
+          <var-decl name='class_to_size_' type-id='type-id-1254' visibility='default' filepath='src/common.h' line='212' column='1'/>
         </data-member>
         <data-member access='private' layout-offset-in-bits='25856'>
-          <var-decl name='class_to_pages_' type-id='type-id-1260' visibility='default' filepath='src/common.h' line='215' column='1'/>
+          <var-decl name='class_to_pages_' type-id='type-id-1254' visibility='default' filepath='src/common.h' line='215' column='1'/>
         </data-member>
         <member-function access='private' static='yes'>
           <function-decl name='ClassIndex' mangled-name='_ZN8tcmalloc7SizeMap10ClassIndexEi' filepath='src/common.h' line='198' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -24831,7 +24600,7 @@
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='CentralFreeListPadded' size-in-bits='9728' visibility='default' filepath='src/central_freelist.h' line='206' column='1' id='type-id-1263'>
+      <class-decl name='CentralFreeListPadded' size-in-bits='9728' visibility='default' filepath='src/central_freelist.h' line='206' column='1' id='type-id-1257'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1506'/>
       </class-decl>
       <class-decl name='CentralFreeListPaddedTo&lt;16&gt;' size-in-bits='9728' visibility='default' filepath='src/central_freelist.h' line='196' column='1' id='type-id-1506'>
@@ -24842,7 +24611,7 @@
       </class-decl>
       <class-decl name='CentralFreeList' size-in-bits='9344' visibility='default' filepath='src/central_freelist.h' line='50' column='1' id='type-id-1446'>
         <member-type access='private'>
-          <class-decl name='TCEntry' size-in-bits='128' is-struct='yes' visibility='default' filepath='src/central_freelist.h' line='97' column='1' id='type-id-1261'>
+          <class-decl name='TCEntry' size-in-bits='128' is-struct='yes' visibility='default' filepath='src/central_freelist.h' line='97' column='1' id='type-id-1255'>
             <data-member access='public' layout-offset-in-bits='0'>
               <var-decl name='head' type-id='type-id-53' visibility='default' filepath='src/central_freelist.h' line='98' column='1'/>
             </data-member>
@@ -24873,7 +24642,7 @@
           <var-decl name='counter_' type-id='type-id-57' visibility='default' filepath='src/central_freelist.h' line='171' column='1'/>
         </data-member>
         <data-member access='private' layout-offset-in-bits='1024'>
-          <var-decl name='tc_slots_' type-id='type-id-1262' visibility='default' filepath='src/central_freelist.h' line='178' column='1'/>
+          <var-decl name='tc_slots_' type-id='type-id-1256' visibility='default' filepath='src/central_freelist.h' line='178' column='1'/>
         </data-member>
         <data-member access='private' layout-offset-in-bits='9216'>
           <var-decl name='used_slots_' type-id='type-id-114' visibility='default' filepath='src/central_freelist.h' line='182' column='1'/>
@@ -25007,31 +24776,31 @@
       </class-decl>
       <class-decl name='Span' size-in-bits='384' is-struct='yes' visibility='default' filepath='src/span.h' line='45' column='1' id='type-id-117'>
         <data-member access='public' layout-offset-in-bits='0'>
-          <var-decl name='start' type-id='type-id-1137' visibility='default' filepath='src/span.h' line='46' column='1'/>
+          <var-decl name='start' type-id='type-id-1131' visibility='default' filepath='src/span.h' line='46' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='64'>
-          <var-decl name='length' type-id='type-id-1138' visibility='default' filepath='src/span.h' line='47' column='1'/>
+          <var-decl name='length' type-id='type-id-1132' visibility='default' filepath='src/span.h' line='47' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='128'>
-          <var-decl name='next' type-id='type-id-1136' visibility='default' filepath='src/span.h' line='48' column='1'/>
+          <var-decl name='next' type-id='type-id-1130' visibility='default' filepath='src/span.h' line='48' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='192'>
-          <var-decl name='prev' type-id='type-id-1136' visibility='default' filepath='src/span.h' line='49' column='1'/>
+          <var-decl name='prev' type-id='type-id-1130' visibility='default' filepath='src/span.h' line='49' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='256'>
           <var-decl name='objects' type-id='type-id-53' visibility='default' filepath='src/span.h' line='50' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='16'>
-          <var-decl name='refcount' type-id='type-id-1123' visibility='default' filepath='src/span.h' line='51' column='1'/>
+          <var-decl name='refcount' type-id='type-id-1117' visibility='default' filepath='src/span.h' line='51' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='8'>
-          <var-decl name='sizeclass' type-id='type-id-1123' visibility='default' filepath='src/span.h' line='52' column='1'/>
+          <var-decl name='sizeclass' type-id='type-id-1117' visibility='default' filepath='src/span.h' line='52' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='6'>
-          <var-decl name='location' type-id='type-id-1123' visibility='default' filepath='src/span.h' line='53' column='1'/>
+          <var-decl name='location' type-id='type-id-1117' visibility='default' filepath='src/span.h' line='53' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='5'>
-          <var-decl name='sample' type-id='type-id-1123' visibility='default' filepath='src/span.h' line='54' column='1'/>
+          <var-decl name='sample' type-id='type-id-1117' visibility='default' filepath='src/span.h' line='54' column='1'/>
         </data-member>
       </class-decl>
       <class-decl name='PageHeapAllocator&lt;tcmalloc::Span&gt;' size-in-bits='256' visibility='default' filepath='src/page_heap_allocator.h' line='47' column='1' id='type-id-1406'>
@@ -25059,13 +24828,13 @@
         <member-function access='private'>
           <function-decl name='New' mangled-name='_ZN8tcmalloc17PageHeapAllocatorINS_4SpanEE3NewEv' filepath='src/page_heap_allocator.h' line='62' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1457' is-artificial='yes'/>
-            <return type-id='type-id-1136'/>
+            <return type-id='type-id-1130'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='Delete' mangled-name='_ZN8tcmalloc17PageHeapAllocatorINS_4SpanEE6DeleteEPS1_' filepath='src/page_heap_allocator.h' line='89' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1457' is-artificial='yes'/>
-            <parameter type-id='type-id-1136'/>
+            <parameter type-id='type-id-1130'/>
             <return type-id='type-id-56'/>
           </function-decl>
         </member-function>
@@ -25118,7 +24887,7 @@
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='PageHeapAllocator&lt;tcmalloc::StackTraceTable::Bucket&gt;' size-in-bits='256' visibility='default' filepath='src/page_heap_allocator.h' line='47' column='1' id='type-id-1139'>
+      <class-decl name='PageHeapAllocator&lt;tcmalloc::StackTraceTable::Bucket&gt;' size-in-bits='256' visibility='default' filepath='src/page_heap_allocator.h' line='47' column='1' id='type-id-1133'>
         <data-member access='private' static='yes'>
           <var-decl name='kAllocIncrement' type-id='type-id-112' visibility='default' filepath='src/page_heap_allocator.h' line='99' column='1'/>
         </data-member>
@@ -25143,24 +24912,24 @@
         <member-function access='private'>
           <function-decl name='New' mangled-name='_ZN8tcmalloc17PageHeapAllocatorINS_15StackTraceTable6BucketEE3NewEv' filepath='src/page_heap_allocator.h' line='62' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1459' is-artificial='yes'/>
-            <return type-id='type-id-1152'/>
+            <return type-id='type-id-1146'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='Delete' mangled-name='_ZN8tcmalloc17PageHeapAllocatorINS_15StackTraceTable6BucketEE6DeleteEPS2_' filepath='src/page_heap_allocator.h' line='89' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1459' is-artificial='yes'/>
-            <parameter type-id='type-id-1152'/>
+            <parameter type-id='type-id-1146'/>
             <return type-id='type-id-56'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='inuse' mangled-name='_ZNK8tcmalloc17PageHeapAllocatorINS_15StackTraceTable6BucketEE5inuseEv' filepath='src/page_heap_allocator.h' line='95' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1141' is-artificial='yes'/>
+            <parameter type-id='type-id-1135' is-artificial='yes'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='StackTrace' size-in-bits='2112' is-struct='yes' visibility='default' filepath='src/common.h' line='266' column='1' id='type-id-1142'>
+      <class-decl name='StackTrace' size-in-bits='2112' is-struct='yes' visibility='default' filepath='src/common.h' line='266' column='1' id='type-id-1136'>
         <data-member access='public' layout-offset-in-bits='0'>
           <var-decl name='size' type-id='type-id-130' visibility='default' filepath='src/common.h' line='267' column='1'/>
         </data-member>
@@ -25168,12 +24937,12 @@
           <var-decl name='depth' type-id='type-id-130' visibility='default' filepath='src/common.h' line='268' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='128'>
-          <var-decl name='stack' type-id='type-id-1271' visibility='default' filepath='src/common.h' line='269' column='1'/>
+          <var-decl name='stack' type-id='type-id-1265' visibility='default' filepath='src/common.h' line='269' column='1'/>
         </data-member>
       </class-decl>
       <class-decl name='PageHeap' size-in-bits='4293888' visibility='default' filepath='src/page_heap.h' line='104' column='1' id='type-id-1403'>
         <member-type access='private'>
-          <class-decl name='Stats' size-in-bits='256' is-struct='yes' visibility='default' filepath='src/page_heap.h' line='145' column='1' id='type-id-1330'>
+          <class-decl name='Stats' size-in-bits='256' is-struct='yes' visibility='default' filepath='src/page_heap.h' line='145' column='1' id='type-id-1329'>
             <data-member access='public' layout-offset-in-bits='0'>
               <var-decl name='system_bytes' type-id='type-id-15' visibility='default' filepath='src/page_heap.h' line='147' column='1'/>
             </data-member>
@@ -25197,10 +24966,10 @@
         <member-type access='private'>
           <class-decl name='SmallSpanStats' size-in-bits='16384' is-struct='yes' visibility='default' filepath='src/page_heap.h' line='155' column='1' id='type-id-1453'>
             <data-member access='public' layout-offset-in-bits='0'>
-              <var-decl name='normal_length' type-id='type-id-1252' visibility='default' filepath='src/page_heap.h' line='158' column='1'/>
+              <var-decl name='normal_length' type-id='type-id-1246' visibility='default' filepath='src/page_heap.h' line='158' column='1'/>
             </data-member>
             <data-member access='public' layout-offset-in-bits='8192'>
-              <var-decl name='returned_length' type-id='type-id-1252' visibility='default' filepath='src/page_heap.h' line='159' column='1'/>
+              <var-decl name='returned_length' type-id='type-id-1246' visibility='default' filepath='src/page_heap.h' line='159' column='1'/>
             </data-member>
           </class-decl>
         </member-type>
@@ -25218,7 +24987,7 @@
           </class-decl>
         </member-type>
         <member-type access='private'>
-          <class-decl name='SpanList' size-in-bits='768' is-struct='yes' visibility='default' filepath='src/page_heap.h' line='232' column='1' id='type-id-1265'>
+          <class-decl name='SpanList' size-in-bits='768' is-struct='yes' visibility='default' filepath='src/page_heap.h' line='232' column='1' id='type-id-1259'>
             <data-member access='public' layout-offset-in-bits='0'>
               <var-decl name='normal' type-id='type-id-117' visibility='default' filepath='src/page_heap.h' line='233' column='1'/>
             </data-member>
@@ -25228,10 +24997,10 @@
           </class-decl>
         </member-type>
         <member-type access='private'>
-          <typedef-decl name='PageMap' type-id='type-id-1278' filepath='src/page_heap.h' line='224' column='1' id='type-id-1507'/>
+          <typedef-decl name='PageMap' type-id='type-id-1272' filepath='src/page_heap.h' line='224' column='1' id='type-id-1507'/>
         </member-type>
         <member-type access='private'>
-          <typedef-decl name='PageMapCache' type-id='type-id-1299' filepath='src/page_heap.h' line='225' column='1' id='type-id-1508'/>
+          <typedef-decl name='PageMapCache' type-id='type-id-1293' filepath='src/page_heap.h' line='225' column='1' id='type-id-1508'/>
         </member-type>
         <data-member access='private' static='yes'>
           <var-decl name='kPageMapBigAllocationThreshold' type-id='type-id-89' visibility='default' filepath='src/page_heap.h' line='203' column='1'/>
@@ -25252,16 +25021,16 @@
           <var-decl name='pagemap_cache_' type-id='type-id-1508' visibility='default' filepath='src/page_heap.h' line='227' column='1'/>
         </data-member>
         <data-member access='private' layout-offset-in-bits='4194432'>
-          <var-decl name='large_' type-id='type-id-1265' visibility='default' filepath='src/page_heap.h' line='238' column='1'/>
+          <var-decl name='large_' type-id='type-id-1259' visibility='default' filepath='src/page_heap.h' line='238' column='1'/>
         </data-member>
         <data-member access='private' layout-offset-in-bits='4195200'>
-          <var-decl name='free_' type-id='type-id-1266' visibility='default' filepath='src/page_heap.h' line='241' column='1'/>
+          <var-decl name='free_' type-id='type-id-1260' visibility='default' filepath='src/page_heap.h' line='241' column='1'/>
         </data-member>
         <data-member access='private' layout-offset-in-bits='4293504'>
-          <var-decl name='stats_' type-id='type-id-1330' visibility='default' filepath='src/page_heap.h' line='244' column='1'/>
+          <var-decl name='stats_' type-id='type-id-1329' visibility='default' filepath='src/page_heap.h' line='244' column='1'/>
         </data-member>
         <data-member access='private' layout-offset-in-bits='4293760'>
-          <var-decl name='scavenge_counter_' type-id='type-id-1314' visibility='default' filepath='src/page_heap.h' line='302' column='1'/>
+          <var-decl name='scavenge_counter_' type-id='type-id-1313' visibility='default' filepath='src/page_heap.h' line='302' column='1'/>
         </data-member>
         <data-member access='private' layout-offset-in-bits='4293824'>
           <var-decl name='release_index_' type-id='type-id-1' visibility='default' filepath='src/page_heap.h' line='305' column='1'/>
@@ -25278,21 +25047,21 @@
         <member-function access='private'>
           <function-decl name='New' mangled-name='_ZN8tcmalloc8PageHeap3NewEm' filepath='src/page_heap.h' line='111' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN8tcmalloc8PageHeap3NewEm'>
             <parameter type-id='type-id-1450' is-artificial='yes'/>
-            <parameter type-id='type-id-1138'/>
-            <return type-id='type-id-1136'/>
+            <parameter type-id='type-id-1132'/>
+            <return type-id='type-id-1130'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='Delete' mangled-name='_ZN8tcmalloc8PageHeap6DeleteEPNS_4SpanE' filepath='src/page_heap.h' line='116' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN8tcmalloc8PageHeap6DeleteEPNS_4SpanE'>
             <parameter type-id='type-id-1450' is-artificial='yes'/>
-            <parameter type-id='type-id-1136'/>
+            <parameter type-id='type-id-1130'/>
             <return type-id='type-id-56'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='RegisterSizeClass' mangled-name='_ZN8tcmalloc8PageHeap17RegisterSizeClassEPNS_4SpanEm' filepath='src/page_heap.h' line='122' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN8tcmalloc8PageHeap17RegisterSizeClassEPNS_4SpanEm'>
             <parameter type-id='type-id-1450' is-artificial='yes'/>
-            <parameter type-id='type-id-1136'/>
+            <parameter type-id='type-id-1130'/>
             <parameter type-id='type-id-57'/>
             <return type-id='type-id-56'/>
           </function-decl>
@@ -25300,30 +25069,30 @@
         <member-function access='private'>
           <function-decl name='Split' mangled-name='_ZN8tcmalloc8PageHeap5SplitEPNS_4SpanEm' filepath='src/page_heap.h' line='132' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN8tcmalloc8PageHeap5SplitEPNS_4SpanEm'>
             <parameter type-id='type-id-1450' is-artificial='yes'/>
-            <parameter type-id='type-id-1136'/>
-            <parameter type-id='type-id-1138'/>
-            <return type-id='type-id-1136'/>
+            <parameter type-id='type-id-1130'/>
+            <parameter type-id='type-id-1132'/>
+            <return type-id='type-id-1130'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='GetDescriptor' mangled-name='_ZNK8tcmalloc8PageHeap13GetDescriptorEm' filepath='src/page_heap.h' line='136' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1405' is-artificial='yes'/>
-            <parameter type-id='type-id-1137'/>
-            <return type-id='type-id-1136'/>
+            <parameter type-id='type-id-1131'/>
+            <return type-id='type-id-1130'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='GetNextRange' mangled-name='_ZN8tcmalloc8PageHeap12GetNextRangeEmPN4base11MallocRangeE' filepath='src/page_heap.h' line='142' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN8tcmalloc8PageHeap12GetNextRangeEmPN4base11MallocRangeE'>
             <parameter type-id='type-id-1450' is-artificial='yes'/>
-            <parameter type-id='type-id-1137'/>
-            <parameter type-id='type-id-1352'/>
+            <parameter type-id='type-id-1131'/>
+            <parameter type-id='type-id-1351'/>
             <return type-id='type-id-55'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='stats' mangled-name='_ZNK8tcmalloc8PageHeap5statsEv' filepath='src/page_heap.h' line='153' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1405' is-artificial='yes'/>
-            <return type-id='type-id-1330'/>
+            <return type-id='type-id-1329'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
@@ -25355,9 +25124,9 @@
         <member-function access='private'>
           <function-decl name='CheckList' mangled-name='_ZN8tcmalloc8PageHeap9CheckListEPNS_4SpanEmmi' filepath='src/page_heap.h' line='174' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN8tcmalloc8PageHeap9CheckListEPNS_4SpanEmmi'>
             <parameter type-id='type-id-1450' is-artificial='yes'/>
-            <parameter type-id='type-id-1136'/>
-            <parameter type-id='type-id-1138'/>
-            <parameter type-id='type-id-1138'/>
+            <parameter type-id='type-id-1130'/>
+            <parameter type-id='type-id-1132'/>
+            <parameter type-id='type-id-1132'/>
             <parameter type-id='type-id-1'/>
             <return type-id='type-id-55'/>
           </function-decl>
@@ -25365,21 +25134,21 @@
         <member-function access='private'>
           <function-decl name='ReleaseAtLeastNPages' mangled-name='_ZN8tcmalloc8PageHeap20ReleaseAtLeastNPagesEm' filepath='src/page_heap.h' line='183' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN8tcmalloc8PageHeap20ReleaseAtLeastNPagesEm'>
             <parameter type-id='type-id-1450' is-artificial='yes'/>
-            <parameter type-id='type-id-1138'/>
-            <return type-id='type-id-1138'/>
+            <parameter type-id='type-id-1132'/>
+            <return type-id='type-id-1132'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='GetSizeClassIfCached' mangled-name='_ZNK8tcmalloc8PageHeap20GetSizeClassIfCachedEm' filepath='src/page_heap.h' line='190' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1405' is-artificial='yes'/>
-            <parameter type-id='type-id-1137'/>
+            <parameter type-id='type-id-1131'/>
             <return type-id='type-id-57'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='CacheSizeClass' mangled-name='_ZNK8tcmalloc8PageHeap14CacheSizeClassEmm' filepath='src/page_heap.h' line='193' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1405' is-artificial='yes'/>
-            <parameter type-id='type-id-1137'/>
+            <parameter type-id='type-id-1131'/>
             <parameter type-id='type-id-57'/>
             <return type-id='type-id-56'/>
           </function-decl>
@@ -25400,78 +25169,78 @@
         <member-function access='private'>
           <function-decl name='SearchFreeAndLargeLists' mangled-name='_ZN8tcmalloc8PageHeap23SearchFreeAndLargeListsEm' filepath='src/page_heap.h' line='246' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN8tcmalloc8PageHeap23SearchFreeAndLargeListsEm'>
             <parameter type-id='type-id-1450' is-artificial='yes'/>
-            <parameter type-id='type-id-1138'/>
-            <return type-id='type-id-1136'/>
+            <parameter type-id='type-id-1132'/>
+            <return type-id='type-id-1130'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='GrowHeap' mangled-name='_ZN8tcmalloc8PageHeap8GrowHeapEm' filepath='src/page_heap.h' line='248' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN8tcmalloc8PageHeap8GrowHeapEm'>
             <parameter type-id='type-id-1450' is-artificial='yes'/>
-            <parameter type-id='type-id-1138'/>
+            <parameter type-id='type-id-1132'/>
             <return type-id='type-id-55'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='Carve' mangled-name='_ZN8tcmalloc8PageHeap5CarveEPNS_4SpanEm' filepath='src/page_heap.h' line='257' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN8tcmalloc8PageHeap5CarveEPNS_4SpanEm'>
             <parameter type-id='type-id-1450' is-artificial='yes'/>
-            <parameter type-id='type-id-1136'/>
-            <parameter type-id='type-id-1138'/>
-            <return type-id='type-id-1136'/>
+            <parameter type-id='type-id-1130'/>
+            <parameter type-id='type-id-1132'/>
+            <return type-id='type-id-1130'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='RecordSpan' mangled-name='_ZN8tcmalloc8PageHeap10RecordSpanEPNS_4SpanE' filepath='src/page_heap.h' line='259' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1450' is-artificial='yes'/>
-            <parameter type-id='type-id-1136'/>
+            <parameter type-id='type-id-1130'/>
             <return type-id='type-id-56'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='AllocLarge' mangled-name='_ZN8tcmalloc8PageHeap10AllocLargeEm' filepath='src/page_heap.h' line='268' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN8tcmalloc8PageHeap10AllocLargeEm'>
             <parameter type-id='type-id-1450' is-artificial='yes'/>
-            <parameter type-id='type-id-1138'/>
-            <return type-id='type-id-1136'/>
+            <parameter type-id='type-id-1132'/>
+            <return type-id='type-id-1130'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='MergeIntoFreeList' mangled-name='_ZN8tcmalloc8PageHeap17MergeIntoFreeListEPNS_4SpanE' filepath='src/page_heap.h' line='272' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN8tcmalloc8PageHeap17MergeIntoFreeListEPNS_4SpanE'>
             <parameter type-id='type-id-1450' is-artificial='yes'/>
-            <parameter type-id='type-id-1136'/>
+            <parameter type-id='type-id-1130'/>
             <return type-id='type-id-56'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='CommitSpan' mangled-name='_ZN8tcmalloc8PageHeap10CommitSpanEPNS_4SpanE' filepath='src/page_heap.h' line='275' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN8tcmalloc8PageHeap10CommitSpanEPNS_4SpanE'>
             <parameter type-id='type-id-1450' is-artificial='yes'/>
-            <parameter type-id='type-id-1136'/>
+            <parameter type-id='type-id-1130'/>
             <return type-id='type-id-56'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='DecommitSpan' mangled-name='_ZN8tcmalloc8PageHeap12DecommitSpanEPNS_4SpanE' filepath='src/page_heap.h' line='278' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN8tcmalloc8PageHeap12DecommitSpanEPNS_4SpanE'>
             <parameter type-id='type-id-1450' is-artificial='yes'/>
-            <parameter type-id='type-id-1136'/>
+            <parameter type-id='type-id-1130'/>
             <return type-id='type-id-55'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='PrependToFreeList' mangled-name='_ZN8tcmalloc8PageHeap17PrependToFreeListEPNS_4SpanE' filepath='src/page_heap.h' line='281' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN8tcmalloc8PageHeap17PrependToFreeListEPNS_4SpanE'>
             <parameter type-id='type-id-1450' is-artificial='yes'/>
-            <parameter type-id='type-id-1136'/>
+            <parameter type-id='type-id-1130'/>
             <return type-id='type-id-56'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='RemoveFromFreeList' mangled-name='_ZN8tcmalloc8PageHeap18RemoveFromFreeListEPNS_4SpanE' filepath='src/page_heap.h' line='284' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN8tcmalloc8PageHeap18RemoveFromFreeListEPNS_4SpanE'>
             <parameter type-id='type-id-1450' is-artificial='yes'/>
-            <parameter type-id='type-id-1136'/>
+            <parameter type-id='type-id-1130'/>
             <return type-id='type-id-56'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='IncrementalScavenge' mangled-name='_ZN8tcmalloc8PageHeap19IncrementalScavengeEm' filepath='src/page_heap.h' line='288' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN8tcmalloc8PageHeap19IncrementalScavengeEm'>
             <parameter type-id='type-id-1450' is-artificial='yes'/>
-            <parameter type-id='type-id-1138'/>
+            <parameter type-id='type-id-1132'/>
             <return type-id='type-id-56'/>
           </function-decl>
         </member-function>
@@ -25479,13 +25248,13 @@
           <function-decl name='ReleaseLastNormalSpan' mangled-name='_ZN8tcmalloc8PageHeap21ReleaseLastNormalSpanEPNS0_8SpanListE' filepath='src/page_heap.h' line='292' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN8tcmalloc8PageHeap21ReleaseLastNormalSpanEPNS0_8SpanListE'>
             <parameter type-id='type-id-1450' is-artificial='yes'/>
             <parameter type-id='type-id-1455'/>
-            <return type-id='type-id-1138'/>
+            <return type-id='type-id-1132'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='EnsureLimit' mangled-name='_ZN8tcmalloc8PageHeap11EnsureLimitEmb' filepath='src/page_heap.h' line='297' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN8tcmalloc8PageHeap11EnsureLimitEmb'>
             <parameter type-id='type-id-1450' is-artificial='yes'/>
-            <parameter type-id='type-id-1138'/>
+            <parameter type-id='type-id-1132'/>
             <parameter type-id='type-id-55'/>
             <return type-id='type-id-55'/>
           </function-decl>
@@ -25493,15 +25262,15 @@
         <member-function access='private'>
           <function-decl name='MayMergeSpans' mangled-name='_ZN8tcmalloc8PageHeap13MayMergeSpansEPNS_4SpanES2_' filepath='src/page_heap.h' line='299' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN8tcmalloc8PageHeap13MayMergeSpansEPNS_4SpanES2_'>
             <parameter type-id='type-id-1450' is-artificial='yes'/>
-            <parameter type-id='type-id-1136'/>
-            <parameter type-id='type-id-1136'/>
+            <parameter type-id='type-id-1130'/>
+            <parameter type-id='type-id-1130'/>
             <return type-id='type-id-55'/>
           </function-decl>
         </member-function>
       </class-decl>
       <class-decl name='ThreadCache' size-in-bits='17408' visibility='default' filepath='src/thread_cache.h' line='66' column='1' id='type-id-1415'>
         <member-type access='private'>
-          <class-decl name='FreeList' size-in-bits='192' visibility='default' filepath='src/thread_cache.h' line='132' column='1' id='type-id-1267'>
+          <class-decl name='FreeList' size-in-bits='192' visibility='default' filepath='src/thread_cache.h' line='132' column='1' id='type-id-1261'>
             <data-member access='private' layout-offset-in-bits='0'>
               <var-decl name='list_' type-id='type-id-53' visibility='default' filepath='src/thread_cache.h' line='134' column='1'/>
             </data-member>
@@ -25641,7 +25410,7 @@
           <var-decl name='tsd_inited_' type-id='type-id-55' mangled-name='_ZN8tcmalloc11ThreadCache11tsd_inited_E' visibility='default' filepath='src/thread_cache.h' line='280' column='1' elf-symbol-id='_ZN8tcmalloc11ThreadCache11tsd_inited_E'/>
         </data-member>
         <data-member access='private' static='yes'>
-          <var-decl name='heap_key_' type-id='type-id-953' mangled-name='_ZN8tcmalloc11ThreadCache9heap_key_E' visibility='default' filepath='src/thread_cache.h' line='281' column='1' elf-symbol-id='_ZN8tcmalloc11ThreadCache9heap_key_E'/>
+          <var-decl name='heap_key_' type-id='type-id-946' mangled-name='_ZN8tcmalloc11ThreadCache9heap_key_E' visibility='default' filepath='src/thread_cache.h' line='281' column='1' elf-symbol-id='_ZN8tcmalloc11ThreadCache9heap_key_E'/>
         </data-member>
         <data-member access='private' static='yes'>
           <var-decl name='thread_heaps_' type-id='type-id-1466' mangled-name='_ZN8tcmalloc11ThreadCache13thread_heaps_E' visibility='default' filepath='src/thread_cache.h' line='284' column='1' elf-symbol-id='_ZN8tcmalloc11ThreadCache13thread_heaps_E'/>
@@ -25671,7 +25440,7 @@
           <var-decl name='sampler_' type-id='type-id-1461' visibility='default' filepath='src/thread_cache.h' line='313' column='1'/>
         </data-member>
         <data-member access='private' layout-offset-in-bits='384'>
-          <var-decl name='list_' type-id='type-id-1268' visibility='default' filepath='src/thread_cache.h' line='315' column='1'/>
+          <var-decl name='list_' type-id='type-id-1262' visibility='default' filepath='src/thread_cache.h' line='315' column='1'/>
         </data-member>
         <data-member access='private' layout-offset-in-bits='17280'>
           <var-decl name='tid_' type-id='type-id-177' visibility='default' filepath='src/thread_cache.h' line='317' column='1'/>
@@ -25894,7 +25663,7 @@
           <var-decl name='kFastlogMask' type-id='type-id-112' visibility='default' filepath='src/sampler.h' line='137' column='1'/>
         </data-member>
         <data-member access='private' static='yes'>
-          <var-decl name='log_table_' type-id='type-id-1250' mangled-name='_ZN8tcmalloc7Sampler10log_table_E' visibility='default' filepath='src/sampler.h' line='138' column='1' elf-symbol-id='_ZN8tcmalloc7Sampler10log_table_E'/>
+          <var-decl name='log_table_' type-id='type-id-1244' mangled-name='_ZN8tcmalloc7Sampler10log_table_E' visibility='default' filepath='src/sampler.h' line='138' column='1' elf-symbol-id='_ZN8tcmalloc7Sampler10log_table_E'/>
         </data-member>
         <member-function access='private'>
           <function-decl name='Init' mangled-name='_ZN8tcmalloc7Sampler4InitEj' filepath='src/sampler.h' line='108' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN8tcmalloc7Sampler4InitEj'>
@@ -25941,7 +25710,7 @@
         </member-function>
         <member-function access='private' static='yes'>
           <function-decl name='FastLog2' mangled-name='_ZN8tcmalloc7Sampler8FastLog2ERKd' filepath='src/sampler.h' line='126' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1135'/>
+            <parameter type-id='type-id-1129'/>
             <return type-id='type-id-2'/>
           </function-decl>
         </member-function>
@@ -25998,30 +25767,6 @@
       <var-decl name='FLAGS_tcmalloc_large_alloc_report_threshold' type-id='type-id-76' mangled-name='_ZN61FLAG__namespace_do_not_use_directly_use_DECLARE_int64_instead43FLAGS_tcmalloc_large_alloc_report_thresholdE' visibility='default' filepath='src/tcmalloc.cc' line='183' column='1' elf-symbol-id='_ZN61FLAG__namespace_do_not_use_directly_use_DECLARE_int64_instead43FLAGS_tcmalloc_large_alloc_report_thresholdE'/>
       <var-decl name='FLAGS_notcmalloc_large_alloc_report_threshold' type-id='type-id-66' mangled-name='_ZN61FLAG__namespace_do_not_use_directly_use_DECLARE_int64_instead45FLAGS_notcmalloc_large_alloc_report_thresholdE' visibility='default' filepath='src/tcmalloc.cc' line='195' column='1' elf-symbol-id='_ZN61FLAG__namespace_do_not_use_directly_use_DECLARE_int64_instead45FLAGS_notcmalloc_large_alloc_report_thresholdE'/>
     </namespace-decl>
-    <class-decl name='SysAllocator' size-in-bits='64' visibility='default' filepath='src/gperftools/malloc_extension.h' line='75' column='1' is-declaration-only='yes' id='type-id-958'>
-      <member-function access='private' constructor='yes'>
-        <function-decl name='SysAllocator' filepath='./src/gperftools/malloc_extension.h' line='77' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-902' is-artificial='yes'/>
-          <return type-id='type-id-56'/>
-        </function-decl>
-      </member-function>
-      <member-function access='private' destructor='yes' vtable-offset='-1'>
-        <function-decl name='~SysAllocator' mangled-name='_ZN12SysAllocatorD1Ev' filepath='src/malloc_extension.cc' line='108' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN12SysAllocatorD1Ev'>
-          <parameter type-id='type-id-902' is-artificial='yes'/>
-          <parameter type-id='type-id-1' is-artificial='yes'/>
-          <return type-id='type-id-56'/>
-        </function-decl>
-      </member-function>
-      <member-function access='private' vtable-offset='2'>
-        <function-decl name='Alloc' mangled-name='_ZN12SysAllocator5AllocEmPmm' filepath='src/gperftools/malloc_extension.h' line='84' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-902' is-artificial='yes'/>
-          <parameter type-id='type-id-57'/>
-          <parameter type-id='type-id-230'/>
-          <parameter type-id='type-id-57'/>
-          <return type-id='type-id-53'/>
-        </function-decl>
-      </member-function>
-    </class-decl>
     <function-decl name='tc_version' mangled-name='tc_version' filepath='src/tcmalloc.cc' line='1547' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='tc_version'>
       <parameter type-id='type-id-897' name='major' filepath='src/tcmalloc.cc' line='1548' column='1'/>
       <parameter type-id='type-id-897' name='minor' filepath='src/tcmalloc.cc' line='1548' column='1'/>
@@ -26045,7 +25790,7 @@
       <return type-id='type-id-56'/>
     </function-decl>
     <function-decl name='tc_mallinfo' mangled-name='tc_mallinfo' filepath='src/tcmalloc.cc' line='1725' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='tc_mallinfo'>
-      <return type-id='type-id-1338'/>
+      <return type-id='type-id-1337'/>
     </function-decl>
     <function-decl name='tc_posix_memalign' mangled-name='posix_memalign' filepath='src/tcmalloc.cc' line='1676' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='posix_memalign'>
       <parameter type-id='type-id-120' name='result_ptr' filepath='src/tcmalloc.cc' line='1677' column='1'/>
@@ -26144,6 +25889,11 @@
       <parameter type-id='type-id-53'/>
       <return type-id='type-id-56'/>
     </function-type>
+    <function-type size-in-bits='64' id='type-id-1300'>
+      <parameter type-id='type-id-53'/>
+      <parameter type-id='type-id-1370'/>
+      <return type-id='type-id-56'/>
+    </function-type>
     <function-type size-in-bits='64' id='type-id-1472'>
       <parameter type-id='type-id-53'/>
       <parameter type-id='type-id-57'/>
@@ -26189,9 +25939,9 @@
     </namespace-decl>
     <namespace-decl name='std'>
       <function-decl name='max&lt;double&gt;' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_algobase.h' line='209' column='1' visibility='default' binding='global' size-in-bits='64'>
-        <parameter type-id='type-id-1135'/>
-        <parameter type-id='type-id-1135'/>
-        <return type-id='type-id-1135'/>
+        <parameter type-id='type-id-1129'/>
+        <parameter type-id='type-id-1129'/>
+        <return type-id='type-id-1129'/>
       </function-decl>
       <function-decl name='min&lt;int&gt;' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_algobase.h' line='186' column='1' visibility='default' binding='global' size-in-bits='64'>
         <parameter type-id='type-id-113'/>
diff --git a/tests/data/test-read-dwarf/test20-pr19025-libvtkParallelCore-6.1.so.abi b/tests/data/test-read-dwarf/test20-pr19025-libvtkParallelCore-6.1.so.abi
index 76f9f183..f080ec60 100644
--- a/tests/data/test-read-dwarf/test20-pr19025-libvtkParallelCore-6.1.so.abi
+++ b/tests/data/test-read-dwarf/test20-pr19025-libvtkParallelCore-6.1.so.abi
@@ -1518,47 +1518,47 @@
         </enum-decl>
       </member-type>
       <member-type access='private'>
-        <enum-decl name='StandardOperations' filepath='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Parallel/Core/vtkCommunicator.h' line='76' column='1' id='type-id-119'>
-          <underlying-type type-id='type-id-25'/>
-          <enumerator name='MAX_OP' value='0'/>
-          <enumerator name='MIN_OP' value='1'/>
-          <enumerator name='SUM_OP' value='2'/>
-          <enumerator name='PRODUCT_OP' value='3'/>
-          <enumerator name='LOGICAL_AND_OP' value='4'/>
-          <enumerator name='BITWISE_AND_OP' value='5'/>
-          <enumerator name='LOGICAL_OR_OP' value='6'/>
-          <enumerator name='BITWISE_OR_OP' value='7'/>
-          <enumerator name='LOGICAL_XOR_OP' value='8'/>
-          <enumerator name='BITWISE_XOR_OP' value='9'/>
-        </enum-decl>
-      </member-type>
-      <member-type access='private'>
-        <class-decl name='Operation' size-in-bits='64' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Parallel/Core/vtkCommunicator.h' line='94' column='1' is-declaration-only='yes' id='type-id-120'>
+        <class-decl name='Operation' size-in-bits='64' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Parallel/Core/vtkCommunicator.h' line='94' column='1' id='type-id-119'>
           <member-function access='private' destructor='yes' vtable-offset='-1'>
             <function-decl name='~Operation' filepath='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Parallel/Core/vtkCommunicator.h' line='113' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-121' is-artificial='yes'/>
+              <parameter type-id='type-id-120' is-artificial='yes'/>
               <parameter type-id='type-id-19' is-artificial='yes'/>
               <return type-id='type-id-28'/>
             </function-decl>
           </member-function>
           <member-function access='private' vtable-offset='0'>
             <function-decl name='Function' mangled-name='_ZN15vtkCommunicator9Operation8FunctionEPKvPvxi' filepath='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Parallel/Core/vtkCommunicator.h' line='105' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-121' is-artificial='yes'/>
+              <parameter type-id='type-id-120' is-artificial='yes'/>
               <parameter type-id='type-id-14'/>
               <parameter type-id='type-id-14'/>
-              <parameter type-id='type-id-122'/>
+              <parameter type-id='type-id-121'/>
               <parameter type-id='type-id-19'/>
               <return type-id='type-id-28'/>
             </function-decl>
           </member-function>
           <member-function access='private' vtable-offset='1'>
             <function-decl name='Commutative' mangled-name='_ZN15vtkCommunicator9Operation11CommutativeEv' filepath='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Parallel/Core/vtkCommunicator.h' line='111' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-121' is-artificial='yes'/>
+              <parameter type-id='type-id-120' is-artificial='yes'/>
               <return type-id='type-id-19'/>
             </function-decl>
           </member-function>
         </class-decl>
       </member-type>
+      <member-type access='private'>
+        <enum-decl name='StandardOperations' filepath='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Parallel/Core/vtkCommunicator.h' line='76' column='1' id='type-id-122'>
+          <underlying-type type-id='type-id-25'/>
+          <enumerator name='MAX_OP' value='0'/>
+          <enumerator name='MIN_OP' value='1'/>
+          <enumerator name='SUM_OP' value='2'/>
+          <enumerator name='PRODUCT_OP' value='3'/>
+          <enumerator name='LOGICAL_AND_OP' value='4'/>
+          <enumerator name='BITWISE_AND_OP' value='5'/>
+          <enumerator name='LOGICAL_OR_OP' value='6'/>
+          <enumerator name='BITWISE_OR_OP' value='7'/>
+          <enumerator name='LOGICAL_XOR_OP' value='8'/>
+          <enumerator name='BITWISE_XOR_OP' value='9'/>
+        </enum-decl>
+      </member-type>
       <data-member access='protected' layout-offset-in-bits='384'>
         <var-decl name='MaximumNumberOfProcesses' type-id='type-id-19' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Parallel/Core/vtkCommunicator.h' line='855' column='1'/>
       </data-member>
@@ -1572,7 +1572,7 @@
         <var-decl name='UseCopy' type-id='type-id-19' mangled-name='_ZN15vtkCommunicator7UseCopyE' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Parallel/Core/vtkCommunicator.cxx' line='117' column='1' elf-symbol-id='_ZN15vtkCommunicator7UseCopyE'/>
       </data-member>
       <data-member access='protected' layout-offset-in-bits='512'>
-        <var-decl name='Count' type-id='type-id-122' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Parallel/Core/vtkCommunicator.h' line='862' column='1'/>
+        <var-decl name='Count' type-id='type-id-121' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Parallel/Core/vtkCommunicator.h' line='862' column='1'/>
       </data-member>
       <member-function access='private' static='yes'>
         <function-decl name='IsTypeOf' mangled-name='_ZN15vtkCommunicator8IsTypeOfEPKc' filepath='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Parallel/Core/vtkCommunicator.h' line='49' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -1614,7 +1614,7 @@
         <function-decl name='Send' mangled-name='_ZN15vtkCommunicator4SendEPKixii' filepath='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Parallel/Core/vtkCommunicator.h' line='140' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-124' is-artificial='yes'/>
           <parameter type-id='type-id-128'/>
-          <parameter type-id='type-id-122'/>
+          <parameter type-id='type-id-121'/>
           <parameter type-id='type-id-19'/>
           <parameter type-id='type-id-19'/>
           <return type-id='type-id-19'/>
@@ -1624,7 +1624,7 @@
         <function-decl name='Send' mangled-name='_ZN15vtkCommunicator4SendEPKjxii' filepath='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Parallel/Core/vtkCommunicator.h' line='143' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-124' is-artificial='yes'/>
           <parameter type-id='type-id-129'/>
-          <parameter type-id='type-id-122'/>
+          <parameter type-id='type-id-121'/>
           <parameter type-id='type-id-19'/>
           <parameter type-id='type-id-19'/>
           <return type-id='type-id-19'/>
@@ -1634,7 +1634,7 @@
         <function-decl name='Send' mangled-name='_ZN15vtkCommunicator4SendEPKmxii' filepath='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Parallel/Core/vtkCommunicator.h' line='146' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-124' is-artificial='yes'/>
           <parameter type-id='type-id-130'/>
-          <parameter type-id='type-id-122'/>
+          <parameter type-id='type-id-121'/>
           <parameter type-id='type-id-19'/>
           <parameter type-id='type-id-19'/>
           <return type-id='type-id-19'/>
@@ -1644,7 +1644,7 @@
         <function-decl name='Send' mangled-name='_ZN15vtkCommunicator4SendEPKhxii' filepath='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Parallel/Core/vtkCommunicator.h' line='150' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-124' is-artificial='yes'/>
           <parameter type-id='type-id-57'/>
-          <parameter type-id='type-id-122'/>
+          <parameter type-id='type-id-121'/>
           <parameter type-id='type-id-19'/>
           <parameter type-id='type-id-19'/>
           <return type-id='type-id-19'/>
@@ -1654,7 +1654,7 @@
         <function-decl name='Send' mangled-name='_ZN15vtkCommunicator4SendEPKcxii' filepath='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Parallel/Core/vtkCommunicator.h' line='154' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-124' is-artificial='yes'/>
           <parameter type-id='type-id-98'/>
-          <parameter type-id='type-id-122'/>
+          <parameter type-id='type-id-121'/>
           <parameter type-id='type-id-19'/>
           <parameter type-id='type-id-19'/>
           <return type-id='type-id-19'/>
@@ -1664,7 +1664,7 @@
         <function-decl name='Send' mangled-name='_ZN15vtkCommunicator4SendEPKfxii' filepath='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Parallel/Core/vtkCommunicator.h' line='157' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-124' is-artificial='yes'/>
           <parameter type-id='type-id-131'/>
-          <parameter type-id='type-id-122'/>
+          <parameter type-id='type-id-121'/>
           <parameter type-id='type-id-19'/>
           <parameter type-id='type-id-19'/>
           <return type-id='type-id-19'/>
@@ -1674,7 +1674,7 @@
         <function-decl name='Send' mangled-name='_ZN15vtkCommunicator4SendEPKdxii' filepath='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Parallel/Core/vtkCommunicator.h' line='160' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-124' is-artificial='yes'/>
           <parameter type-id='type-id-112'/>
-          <parameter type-id='type-id-122'/>
+          <parameter type-id='type-id-121'/>
           <parameter type-id='type-id-19'/>
           <parameter type-id='type-id-19'/>
           <return type-id='type-id-19'/>
@@ -1684,7 +1684,7 @@
         <function-decl name='Send' mangled-name='_ZN15vtkCommunicator4SendEPKxxii' filepath='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Parallel/Core/vtkCommunicator.h' line='164' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-124' is-artificial='yes'/>
           <parameter type-id='type-id-132'/>
-          <parameter type-id='type-id-122'/>
+          <parameter type-id='type-id-121'/>
           <parameter type-id='type-id-19'/>
           <parameter type-id='type-id-19'/>
           <return type-id='type-id-19'/>
@@ -1729,7 +1729,7 @@
         <function-decl name='Receive' mangled-name='_ZN15vtkCommunicator7ReceiveEPixii' filepath='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Parallel/Core/vtkCommunicator.h' line='202' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-124' is-artificial='yes'/>
           <parameter type-id='type-id-76'/>
-          <parameter type-id='type-id-122'/>
+          <parameter type-id='type-id-121'/>
           <parameter type-id='type-id-19'/>
           <parameter type-id='type-id-19'/>
           <return type-id='type-id-19'/>
@@ -1739,7 +1739,7 @@
         <function-decl name='Receive' mangled-name='_ZN15vtkCommunicator7ReceiveEPjxii' filepath='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Parallel/Core/vtkCommunicator.h' line='205' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-124' is-artificial='yes'/>
           <parameter type-id='type-id-77'/>
-          <parameter type-id='type-id-122'/>
+          <parameter type-id='type-id-121'/>
           <parameter type-id='type-id-19'/>
           <parameter type-id='type-id-19'/>
           <return type-id='type-id-19'/>
@@ -1749,7 +1749,7 @@
         <function-decl name='Receive' mangled-name='_ZN15vtkCommunicator7ReceiveEPmxii' filepath='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Parallel/Core/vtkCommunicator.h' line='208' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-124' is-artificial='yes'/>
           <parameter type-id='type-id-133'/>
-          <parameter type-id='type-id-122'/>
+          <parameter type-id='type-id-121'/>
           <parameter type-id='type-id-19'/>
           <parameter type-id='type-id-19'/>
           <return type-id='type-id-19'/>
@@ -1759,7 +1759,7 @@
         <function-decl name='Receive' mangled-name='_ZN15vtkCommunicator7ReceiveEPhxii' filepath='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Parallel/Core/vtkCommunicator.h' line='212' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-124' is-artificial='yes'/>
           <parameter type-id='type-id-58'/>
-          <parameter type-id='type-id-122'/>
+          <parameter type-id='type-id-121'/>
           <parameter type-id='type-id-19'/>
           <parameter type-id='type-id-19'/>
           <return type-id='type-id-19'/>
@@ -1769,7 +1769,7 @@
         <function-decl name='Receive' mangled-name='_ZN15vtkCommunicator7ReceiveEPcxii' filepath='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Parallel/Core/vtkCommunicator.h' line='216' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-124' is-artificial='yes'/>
           <parameter type-id='type-id-33'/>
-          <parameter type-id='type-id-122'/>
+          <parameter type-id='type-id-121'/>
           <parameter type-id='type-id-19'/>
           <parameter type-id='type-id-19'/>
           <return type-id='type-id-19'/>
@@ -1779,7 +1779,7 @@
         <function-decl name='Receive' mangled-name='_ZN15vtkCommunicator7ReceiveEPfxii' filepath='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Parallel/Core/vtkCommunicator.h' line='219' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-124' is-artificial='yes'/>
           <parameter type-id='type-id-75'/>
-          <parameter type-id='type-id-122'/>
+          <parameter type-id='type-id-121'/>
           <parameter type-id='type-id-19'/>
           <parameter type-id='type-id-19'/>
           <return type-id='type-id-19'/>
@@ -1789,7 +1789,7 @@
         <function-decl name='Receive' mangled-name='_ZN15vtkCommunicator7ReceiveEPdxii' filepath='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Parallel/Core/vtkCommunicator.h' line='222' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-124' is-artificial='yes'/>
           <parameter type-id='type-id-74'/>
-          <parameter type-id='type-id-122'/>
+          <parameter type-id='type-id-121'/>
           <parameter type-id='type-id-19'/>
           <parameter type-id='type-id-19'/>
           <return type-id='type-id-19'/>
@@ -1799,7 +1799,7 @@
         <function-decl name='Receive' mangled-name='_ZN15vtkCommunicator7ReceiveEPxxii' filepath='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Parallel/Core/vtkCommunicator.h' line='226' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-124' is-artificial='yes'/>
           <parameter type-id='type-id-134'/>
-          <parameter type-id='type-id-122'/>
+          <parameter type-id='type-id-121'/>
           <parameter type-id='type-id-19'/>
           <parameter type-id='type-id-19'/>
           <return type-id='type-id-19'/>
@@ -1818,7 +1818,7 @@
         <function-decl name='Broadcast' mangled-name='_ZN15vtkCommunicator9BroadcastEPixi' filepath='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Parallel/Core/vtkCommunicator.h' line='254' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-124' is-artificial='yes'/>
           <parameter type-id='type-id-76'/>
-          <parameter type-id='type-id-122'/>
+          <parameter type-id='type-id-121'/>
           <parameter type-id='type-id-19'/>
           <return type-id='type-id-19'/>
         </function-decl>
@@ -1827,7 +1827,7 @@
         <function-decl name='Broadcast' mangled-name='_ZN15vtkCommunicator9BroadcastEPjxi' filepath='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Parallel/Core/vtkCommunicator.h' line='257' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-124' is-artificial='yes'/>
           <parameter type-id='type-id-77'/>
-          <parameter type-id='type-id-122'/>
+          <parameter type-id='type-id-121'/>
           <parameter type-id='type-id-19'/>
           <return type-id='type-id-19'/>
         </function-decl>
@@ -1836,7 +1836,7 @@
         <function-decl name='Broadcast' mangled-name='_ZN15vtkCommunicator9BroadcastEPmxi' filepath='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Parallel/Core/vtkCommunicator.h' line='260' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-124' is-artificial='yes'/>
           <parameter type-id='type-id-133'/>
-          <parameter type-id='type-id-122'/>
+          <parameter type-id='type-id-121'/>
           <parameter type-id='type-id-19'/>
           <return type-id='type-id-19'/>
         </function-decl>
@@ -1845,7 +1845,7 @@
         <function-decl name='Broadcast' mangled-name='_ZN15vtkCommunicator9BroadcastEPhxi' filepath='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Parallel/Core/vtkCommunicator.h' line='263' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-124' is-artificial='yes'/>
           <parameter type-id='type-id-58'/>
-          <parameter type-id='type-id-122'/>
+          <parameter type-id='type-id-121'/>
           <parameter type-id='type-id-19'/>
           <return type-id='type-id-19'/>
         </function-decl>
@@ -1854,7 +1854,7 @@
         <function-decl name='Broadcast' mangled-name='_ZN15vtkCommunicator9BroadcastEPcxi' filepath='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Parallel/Core/vtkCommunicator.h' line='266' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-124' is-artificial='yes'/>
           <parameter type-id='type-id-33'/>
-          <parameter type-id='type-id-122'/>
+          <parameter type-id='type-id-121'/>
           <parameter type-id='type-id-19'/>
           <return type-id='type-id-19'/>
         </function-decl>
@@ -1863,7 +1863,7 @@
         <function-decl name='Broadcast' mangled-name='_ZN15vtkCommunicator9BroadcastEPfxi' filepath='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Parallel/Core/vtkCommunicator.h' line='269' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-124' is-artificial='yes'/>
           <parameter type-id='type-id-75'/>
-          <parameter type-id='type-id-122'/>
+          <parameter type-id='type-id-121'/>
           <parameter type-id='type-id-19'/>
           <return type-id='type-id-19'/>
         </function-decl>
@@ -1872,7 +1872,7 @@
         <function-decl name='Broadcast' mangled-name='_ZN15vtkCommunicator9BroadcastEPdxi' filepath='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Parallel/Core/vtkCommunicator.h' line='272' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-124' is-artificial='yes'/>
           <parameter type-id='type-id-74'/>
-          <parameter type-id='type-id-122'/>
+          <parameter type-id='type-id-121'/>
           <parameter type-id='type-id-19'/>
           <return type-id='type-id-19'/>
         </function-decl>
@@ -1881,7 +1881,7 @@
         <function-decl name='Broadcast' mangled-name='_ZN15vtkCommunicator9BroadcastEPxxi' filepath='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Parallel/Core/vtkCommunicator.h' line='276' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-124' is-artificial='yes'/>
           <parameter type-id='type-id-134'/>
-          <parameter type-id='type-id-122'/>
+          <parameter type-id='type-id-121'/>
           <parameter type-id='type-id-19'/>
           <return type-id='type-id-19'/>
         </function-decl>
@@ -1915,7 +1915,7 @@
           <parameter type-id='type-id-124' is-artificial='yes'/>
           <parameter type-id='type-id-128'/>
           <parameter type-id='type-id-76'/>
-          <parameter type-id='type-id-122'/>
+          <parameter type-id='type-id-121'/>
           <parameter type-id='type-id-19'/>
           <return type-id='type-id-19'/>
         </function-decl>
@@ -1925,7 +1925,7 @@
           <parameter type-id='type-id-124' is-artificial='yes'/>
           <parameter type-id='type-id-130'/>
           <parameter type-id='type-id-133'/>
-          <parameter type-id='type-id-122'/>
+          <parameter type-id='type-id-121'/>
           <parameter type-id='type-id-19'/>
           <return type-id='type-id-19'/>
         </function-decl>
@@ -1935,7 +1935,7 @@
           <parameter type-id='type-id-124' is-artificial='yes'/>
           <parameter type-id='type-id-57'/>
           <parameter type-id='type-id-58'/>
-          <parameter type-id='type-id-122'/>
+          <parameter type-id='type-id-121'/>
           <parameter type-id='type-id-19'/>
           <return type-id='type-id-19'/>
         </function-decl>
@@ -1945,7 +1945,7 @@
           <parameter type-id='type-id-124' is-artificial='yes'/>
           <parameter type-id='type-id-98'/>
           <parameter type-id='type-id-33'/>
-          <parameter type-id='type-id-122'/>
+          <parameter type-id='type-id-121'/>
           <parameter type-id='type-id-19'/>
           <return type-id='type-id-19'/>
         </function-decl>
@@ -1955,7 +1955,7 @@
           <parameter type-id='type-id-124' is-artificial='yes'/>
           <parameter type-id='type-id-131'/>
           <parameter type-id='type-id-75'/>
-          <parameter type-id='type-id-122'/>
+          <parameter type-id='type-id-121'/>
           <parameter type-id='type-id-19'/>
           <return type-id='type-id-19'/>
         </function-decl>
@@ -1965,7 +1965,7 @@
           <parameter type-id='type-id-124' is-artificial='yes'/>
           <parameter type-id='type-id-112'/>
           <parameter type-id='type-id-74'/>
-          <parameter type-id='type-id-122'/>
+          <parameter type-id='type-id-121'/>
           <parameter type-id='type-id-19'/>
           <return type-id='type-id-19'/>
         </function-decl>
@@ -1975,7 +1975,7 @@
           <parameter type-id='type-id-124' is-artificial='yes'/>
           <parameter type-id='type-id-132'/>
           <parameter type-id='type-id-134'/>
-          <parameter type-id='type-id-122'/>
+          <parameter type-id='type-id-121'/>
           <parameter type-id='type-id-19'/>
           <return type-id='type-id-19'/>
         </function-decl>
@@ -1994,7 +1994,7 @@
           <parameter type-id='type-id-124' is-artificial='yes'/>
           <parameter type-id='type-id-128'/>
           <parameter type-id='type-id-76'/>
-          <parameter type-id='type-id-122'/>
+          <parameter type-id='type-id-121'/>
           <parameter type-id='type-id-134'/>
           <parameter type-id='type-id-134'/>
           <parameter type-id='type-id-19'/>
@@ -2006,7 +2006,7 @@
           <parameter type-id='type-id-124' is-artificial='yes'/>
           <parameter type-id='type-id-130'/>
           <parameter type-id='type-id-133'/>
-          <parameter type-id='type-id-122'/>
+          <parameter type-id='type-id-121'/>
           <parameter type-id='type-id-134'/>
           <parameter type-id='type-id-134'/>
           <parameter type-id='type-id-19'/>
@@ -2018,7 +2018,7 @@
           <parameter type-id='type-id-124' is-artificial='yes'/>
           <parameter type-id='type-id-57'/>
           <parameter type-id='type-id-58'/>
-          <parameter type-id='type-id-122'/>
+          <parameter type-id='type-id-121'/>
           <parameter type-id='type-id-134'/>
           <parameter type-id='type-id-134'/>
           <parameter type-id='type-id-19'/>
@@ -2030,7 +2030,7 @@
           <parameter type-id='type-id-124' is-artificial='yes'/>
           <parameter type-id='type-id-98'/>
           <parameter type-id='type-id-33'/>
-          <parameter type-id='type-id-122'/>
+          <parameter type-id='type-id-121'/>
           <parameter type-id='type-id-134'/>
           <parameter type-id='type-id-134'/>
           <parameter type-id='type-id-19'/>
@@ -2042,7 +2042,7 @@
           <parameter type-id='type-id-124' is-artificial='yes'/>
           <parameter type-id='type-id-131'/>
           <parameter type-id='type-id-75'/>
-          <parameter type-id='type-id-122'/>
+          <parameter type-id='type-id-121'/>
           <parameter type-id='type-id-134'/>
           <parameter type-id='type-id-134'/>
           <parameter type-id='type-id-19'/>
@@ -2054,7 +2054,7 @@
           <parameter type-id='type-id-124' is-artificial='yes'/>
           <parameter type-id='type-id-112'/>
           <parameter type-id='type-id-74'/>
-          <parameter type-id='type-id-122'/>
+          <parameter type-id='type-id-121'/>
           <parameter type-id='type-id-134'/>
           <parameter type-id='type-id-134'/>
           <parameter type-id='type-id-19'/>
@@ -2066,7 +2066,7 @@
           <parameter type-id='type-id-124' is-artificial='yes'/>
           <parameter type-id='type-id-132'/>
           <parameter type-id='type-id-134'/>
-          <parameter type-id='type-id-122'/>
+          <parameter type-id='type-id-121'/>
           <parameter type-id='type-id-134'/>
           <parameter type-id='type-id-134'/>
           <parameter type-id='type-id-19'/>
@@ -2098,7 +2098,7 @@
           <parameter type-id='type-id-124' is-artificial='yes'/>
           <parameter type-id='type-id-128'/>
           <parameter type-id='type-id-76'/>
-          <parameter type-id='type-id-122'/>
+          <parameter type-id='type-id-121'/>
           <parameter type-id='type-id-19'/>
           <return type-id='type-id-19'/>
         </function-decl>
@@ -2108,7 +2108,7 @@
           <parameter type-id='type-id-124' is-artificial='yes'/>
           <parameter type-id='type-id-130'/>
           <parameter type-id='type-id-133'/>
-          <parameter type-id='type-id-122'/>
+          <parameter type-id='type-id-121'/>
           <parameter type-id='type-id-19'/>
           <return type-id='type-id-19'/>
         </function-decl>
@@ -2118,7 +2118,7 @@
           <parameter type-id='type-id-124' is-artificial='yes'/>
           <parameter type-id='type-id-57'/>
           <parameter type-id='type-id-58'/>
-          <parameter type-id='type-id-122'/>
+          <parameter type-id='type-id-121'/>
           <parameter type-id='type-id-19'/>
           <return type-id='type-id-19'/>
         </function-decl>
@@ -2128,7 +2128,7 @@
           <parameter type-id='type-id-124' is-artificial='yes'/>
           <parameter type-id='type-id-98'/>
           <parameter type-id='type-id-33'/>
-          <parameter type-id='type-id-122'/>
+          <parameter type-id='type-id-121'/>
           <parameter type-id='type-id-19'/>
           <return type-id='type-id-19'/>
         </function-decl>
@@ -2138,7 +2138,7 @@
           <parameter type-id='type-id-124' is-artificial='yes'/>
           <parameter type-id='type-id-131'/>
           <parameter type-id='type-id-75'/>
-          <parameter type-id='type-id-122'/>
+          <parameter type-id='type-id-121'/>
           <parameter type-id='type-id-19'/>
           <return type-id='type-id-19'/>
         </function-decl>
@@ -2148,7 +2148,7 @@
           <parameter type-id='type-id-124' is-artificial='yes'/>
           <parameter type-id='type-id-112'/>
           <parameter type-id='type-id-74'/>
-          <parameter type-id='type-id-122'/>
+          <parameter type-id='type-id-121'/>
           <parameter type-id='type-id-19'/>
           <return type-id='type-id-19'/>
         </function-decl>
@@ -2158,7 +2158,7 @@
           <parameter type-id='type-id-124' is-artificial='yes'/>
           <parameter type-id='type-id-132'/>
           <parameter type-id='type-id-134'/>
-          <parameter type-id='type-id-122'/>
+          <parameter type-id='type-id-121'/>
           <parameter type-id='type-id-19'/>
           <return type-id='type-id-19'/>
         </function-decl>
@@ -2179,7 +2179,7 @@
           <parameter type-id='type-id-76'/>
           <parameter type-id='type-id-134'/>
           <parameter type-id='type-id-134'/>
-          <parameter type-id='type-id-122'/>
+          <parameter type-id='type-id-121'/>
           <parameter type-id='type-id-19'/>
           <return type-id='type-id-19'/>
         </function-decl>
@@ -2191,7 +2191,7 @@
           <parameter type-id='type-id-133'/>
           <parameter type-id='type-id-134'/>
           <parameter type-id='type-id-134'/>
-          <parameter type-id='type-id-122'/>
+          <parameter type-id='type-id-121'/>
           <parameter type-id='type-id-19'/>
           <return type-id='type-id-19'/>
         </function-decl>
@@ -2203,7 +2203,7 @@
           <parameter type-id='type-id-58'/>
           <parameter type-id='type-id-134'/>
           <parameter type-id='type-id-134'/>
-          <parameter type-id='type-id-122'/>
+          <parameter type-id='type-id-121'/>
           <parameter type-id='type-id-19'/>
           <return type-id='type-id-19'/>
         </function-decl>
@@ -2215,7 +2215,7 @@
           <parameter type-id='type-id-33'/>
           <parameter type-id='type-id-134'/>
           <parameter type-id='type-id-134'/>
-          <parameter type-id='type-id-122'/>
+          <parameter type-id='type-id-121'/>
           <parameter type-id='type-id-19'/>
           <return type-id='type-id-19'/>
         </function-decl>
@@ -2227,7 +2227,7 @@
           <parameter type-id='type-id-75'/>
           <parameter type-id='type-id-134'/>
           <parameter type-id='type-id-134'/>
-          <parameter type-id='type-id-122'/>
+          <parameter type-id='type-id-121'/>
           <parameter type-id='type-id-19'/>
           <return type-id='type-id-19'/>
         </function-decl>
@@ -2239,7 +2239,7 @@
           <parameter type-id='type-id-74'/>
           <parameter type-id='type-id-134'/>
           <parameter type-id='type-id-134'/>
-          <parameter type-id='type-id-122'/>
+          <parameter type-id='type-id-121'/>
           <parameter type-id='type-id-19'/>
           <return type-id='type-id-19'/>
         </function-decl>
@@ -2251,7 +2251,7 @@
           <parameter type-id='type-id-134'/>
           <parameter type-id='type-id-134'/>
           <parameter type-id='type-id-134'/>
-          <parameter type-id='type-id-122'/>
+          <parameter type-id='type-id-121'/>
           <parameter type-id='type-id-19'/>
           <return type-id='type-id-19'/>
         </function-decl>
@@ -2261,7 +2261,7 @@
           <parameter type-id='type-id-124' is-artificial='yes'/>
           <parameter type-id='type-id-128'/>
           <parameter type-id='type-id-76'/>
-          <parameter type-id='type-id-122'/>
+          <parameter type-id='type-id-121'/>
           <return type-id='type-id-19'/>
         </function-decl>
       </member-function>
@@ -2270,7 +2270,7 @@
           <parameter type-id='type-id-124' is-artificial='yes'/>
           <parameter type-id='type-id-130'/>
           <parameter type-id='type-id-133'/>
-          <parameter type-id='type-id-122'/>
+          <parameter type-id='type-id-121'/>
           <return type-id='type-id-19'/>
         </function-decl>
       </member-function>
@@ -2279,7 +2279,7 @@
           <parameter type-id='type-id-124' is-artificial='yes'/>
           <parameter type-id='type-id-57'/>
           <parameter type-id='type-id-58'/>
-          <parameter type-id='type-id-122'/>
+          <parameter type-id='type-id-121'/>
           <return type-id='type-id-19'/>
         </function-decl>
       </member-function>
@@ -2288,7 +2288,7 @@
           <parameter type-id='type-id-124' is-artificial='yes'/>
           <parameter type-id='type-id-98'/>
           <parameter type-id='type-id-33'/>
-          <parameter type-id='type-id-122'/>
+          <parameter type-id='type-id-121'/>
           <return type-id='type-id-19'/>
         </function-decl>
       </member-function>
@@ -2297,7 +2297,7 @@
           <parameter type-id='type-id-124' is-artificial='yes'/>
           <parameter type-id='type-id-131'/>
           <parameter type-id='type-id-75'/>
-          <parameter type-id='type-id-122'/>
+          <parameter type-id='type-id-121'/>
           <return type-id='type-id-19'/>
         </function-decl>
       </member-function>
@@ -2306,7 +2306,7 @@
           <parameter type-id='type-id-124' is-artificial='yes'/>
           <parameter type-id='type-id-112'/>
           <parameter type-id='type-id-74'/>
-          <parameter type-id='type-id-122'/>
+          <parameter type-id='type-id-121'/>
           <return type-id='type-id-19'/>
         </function-decl>
       </member-function>
@@ -2315,7 +2315,7 @@
           <parameter type-id='type-id-124' is-artificial='yes'/>
           <parameter type-id='type-id-132'/>
           <parameter type-id='type-id-134'/>
-          <parameter type-id='type-id-122'/>
+          <parameter type-id='type-id-121'/>
           <return type-id='type-id-19'/>
         </function-decl>
       </member-function>
@@ -2332,7 +2332,7 @@
           <parameter type-id='type-id-124' is-artificial='yes'/>
           <parameter type-id='type-id-128'/>
           <parameter type-id='type-id-76'/>
-          <parameter type-id='type-id-122'/>
+          <parameter type-id='type-id-121'/>
           <parameter type-id='type-id-134'/>
           <parameter type-id='type-id-134'/>
           <return type-id='type-id-19'/>
@@ -2343,7 +2343,7 @@
           <parameter type-id='type-id-124' is-artificial='yes'/>
           <parameter type-id='type-id-130'/>
           <parameter type-id='type-id-133'/>
-          <parameter type-id='type-id-122'/>
+          <parameter type-id='type-id-121'/>
           <parameter type-id='type-id-134'/>
           <parameter type-id='type-id-134'/>
           <return type-id='type-id-19'/>
@@ -2354,7 +2354,7 @@
           <parameter type-id='type-id-124' is-artificial='yes'/>
           <parameter type-id='type-id-57'/>
           <parameter type-id='type-id-58'/>
-          <parameter type-id='type-id-122'/>
+          <parameter type-id='type-id-121'/>
           <parameter type-id='type-id-134'/>
           <parameter type-id='type-id-134'/>
           <return type-id='type-id-19'/>
@@ -2365,7 +2365,7 @@
           <parameter type-id='type-id-124' is-artificial='yes'/>
           <parameter type-id='type-id-98'/>
           <parameter type-id='type-id-33'/>
-          <parameter type-id='type-id-122'/>
+          <parameter type-id='type-id-121'/>
           <parameter type-id='type-id-134'/>
           <parameter type-id='type-id-134'/>
           <return type-id='type-id-19'/>
@@ -2376,7 +2376,7 @@
           <parameter type-id='type-id-124' is-artificial='yes'/>
           <parameter type-id='type-id-131'/>
           <parameter type-id='type-id-75'/>
-          <parameter type-id='type-id-122'/>
+          <parameter type-id='type-id-121'/>
           <parameter type-id='type-id-134'/>
           <parameter type-id='type-id-134'/>
           <return type-id='type-id-19'/>
@@ -2387,7 +2387,7 @@
           <parameter type-id='type-id-124' is-artificial='yes'/>
           <parameter type-id='type-id-112'/>
           <parameter type-id='type-id-74'/>
-          <parameter type-id='type-id-122'/>
+          <parameter type-id='type-id-121'/>
           <parameter type-id='type-id-134'/>
           <parameter type-id='type-id-134'/>
           <return type-id='type-id-19'/>
@@ -2398,7 +2398,7 @@
           <parameter type-id='type-id-124' is-artificial='yes'/>
           <parameter type-id='type-id-132'/>
           <parameter type-id='type-id-134'/>
-          <parameter type-id='type-id-122'/>
+          <parameter type-id='type-id-121'/>
           <parameter type-id='type-id-134'/>
           <parameter type-id='type-id-134'/>
           <return type-id='type-id-19'/>
@@ -2427,7 +2427,7 @@
           <parameter type-id='type-id-124' is-artificial='yes'/>
           <parameter type-id='type-id-128'/>
           <parameter type-id='type-id-76'/>
-          <parameter type-id='type-id-122'/>
+          <parameter type-id='type-id-121'/>
           <parameter type-id='type-id-19'/>
           <parameter type-id='type-id-19'/>
           <return type-id='type-id-19'/>
@@ -2438,7 +2438,7 @@
           <parameter type-id='type-id-124' is-artificial='yes'/>
           <parameter type-id='type-id-129'/>
           <parameter type-id='type-id-77'/>
-          <parameter type-id='type-id-122'/>
+          <parameter type-id='type-id-121'/>
           <parameter type-id='type-id-19'/>
           <parameter type-id='type-id-19'/>
           <return type-id='type-id-19'/>
@@ -2449,7 +2449,7 @@
           <parameter type-id='type-id-124' is-artificial='yes'/>
           <parameter type-id='type-id-130'/>
           <parameter type-id='type-id-133'/>
-          <parameter type-id='type-id-122'/>
+          <parameter type-id='type-id-121'/>
           <parameter type-id='type-id-19'/>
           <parameter type-id='type-id-19'/>
           <return type-id='type-id-19'/>
@@ -2460,7 +2460,7 @@
           <parameter type-id='type-id-124' is-artificial='yes'/>
           <parameter type-id='type-id-57'/>
           <parameter type-id='type-id-58'/>
-          <parameter type-id='type-id-122'/>
+          <parameter type-id='type-id-121'/>
           <parameter type-id='type-id-19'/>
           <parameter type-id='type-id-19'/>
           <return type-id='type-id-19'/>
@@ -2471,7 +2471,7 @@
           <parameter type-id='type-id-124' is-artificial='yes'/>
           <parameter type-id='type-id-98'/>
           <parameter type-id='type-id-33'/>
-          <parameter type-id='type-id-122'/>
+          <parameter type-id='type-id-121'/>
           <parameter type-id='type-id-19'/>
           <parameter type-id='type-id-19'/>
           <return type-id='type-id-19'/>
@@ -2482,7 +2482,7 @@
           <parameter type-id='type-id-124' is-artificial='yes'/>
           <parameter type-id='type-id-131'/>
           <parameter type-id='type-id-75'/>
-          <parameter type-id='type-id-122'/>
+          <parameter type-id='type-id-121'/>
           <parameter type-id='type-id-19'/>
           <parameter type-id='type-id-19'/>
           <return type-id='type-id-19'/>
@@ -2493,7 +2493,7 @@
           <parameter type-id='type-id-124' is-artificial='yes'/>
           <parameter type-id='type-id-112'/>
           <parameter type-id='type-id-74'/>
-          <parameter type-id='type-id-122'/>
+          <parameter type-id='type-id-121'/>
           <parameter type-id='type-id-19'/>
           <parameter type-id='type-id-19'/>
           <return type-id='type-id-19'/>
@@ -2504,7 +2504,7 @@
           <parameter type-id='type-id-124' is-artificial='yes'/>
           <parameter type-id='type-id-132'/>
           <parameter type-id='type-id-134'/>
-          <parameter type-id='type-id-122'/>
+          <parameter type-id='type-id-121'/>
           <parameter type-id='type-id-19'/>
           <parameter type-id='type-id-19'/>
           <return type-id='type-id-19'/>
@@ -2525,8 +2525,8 @@
           <parameter type-id='type-id-124' is-artificial='yes'/>
           <parameter type-id='type-id-128'/>
           <parameter type-id='type-id-76'/>
-          <parameter type-id='type-id-122'/>
           <parameter type-id='type-id-121'/>
+          <parameter type-id='type-id-120'/>
           <parameter type-id='type-id-19'/>
           <return type-id='type-id-19'/>
         </function-decl>
@@ -2536,8 +2536,8 @@
           <parameter type-id='type-id-124' is-artificial='yes'/>
           <parameter type-id='type-id-130'/>
           <parameter type-id='type-id-133'/>
-          <parameter type-id='type-id-122'/>
           <parameter type-id='type-id-121'/>
+          <parameter type-id='type-id-120'/>
           <parameter type-id='type-id-19'/>
           <return type-id='type-id-19'/>
         </function-decl>
@@ -2547,8 +2547,8 @@
           <parameter type-id='type-id-124' is-artificial='yes'/>
           <parameter type-id='type-id-57'/>
           <parameter type-id='type-id-58'/>
-          <parameter type-id='type-id-122'/>
           <parameter type-id='type-id-121'/>
+          <parameter type-id='type-id-120'/>
           <parameter type-id='type-id-19'/>
           <return type-id='type-id-19'/>
         </function-decl>
@@ -2558,8 +2558,8 @@
           <parameter type-id='type-id-124' is-artificial='yes'/>
           <parameter type-id='type-id-98'/>
           <parameter type-id='type-id-33'/>
-          <parameter type-id='type-id-122'/>
           <parameter type-id='type-id-121'/>
+          <parameter type-id='type-id-120'/>
           <parameter type-id='type-id-19'/>
           <return type-id='type-id-19'/>
         </function-decl>
@@ -2569,8 +2569,8 @@
           <parameter type-id='type-id-124' is-artificial='yes'/>
           <parameter type-id='type-id-131'/>
           <parameter type-id='type-id-75'/>
-          <parameter type-id='type-id-122'/>
           <parameter type-id='type-id-121'/>
+          <parameter type-id='type-id-120'/>
           <parameter type-id='type-id-19'/>
           <return type-id='type-id-19'/>
         </function-decl>
@@ -2580,8 +2580,8 @@
           <parameter type-id='type-id-124' is-artificial='yes'/>
           <parameter type-id='type-id-112'/>
           <parameter type-id='type-id-74'/>
-          <parameter type-id='type-id-122'/>
           <parameter type-id='type-id-121'/>
+          <parameter type-id='type-id-120'/>
           <parameter type-id='type-id-19'/>
           <return type-id='type-id-19'/>
         </function-decl>
@@ -2591,8 +2591,8 @@
           <parameter type-id='type-id-124' is-artificial='yes'/>
           <parameter type-id='type-id-132'/>
           <parameter type-id='type-id-134'/>
-          <parameter type-id='type-id-122'/>
           <parameter type-id='type-id-121'/>
+          <parameter type-id='type-id-120'/>
           <parameter type-id='type-id-19'/>
           <return type-id='type-id-19'/>
         </function-decl>
@@ -2602,7 +2602,7 @@
           <parameter type-id='type-id-124' is-artificial='yes'/>
           <parameter type-id='type-id-127'/>
           <parameter type-id='type-id-127'/>
-          <parameter type-id='type-id-121'/>
+          <parameter type-id='type-id-120'/>
           <parameter type-id='type-id-19'/>
           <return type-id='type-id-19'/>
         </function-decl>
@@ -2612,7 +2612,7 @@
           <parameter type-id='type-id-124' is-artificial='yes'/>
           <parameter type-id='type-id-128'/>
           <parameter type-id='type-id-76'/>
-          <parameter type-id='type-id-122'/>
+          <parameter type-id='type-id-121'/>
           <parameter type-id='type-id-19'/>
           <return type-id='type-id-19'/>
         </function-decl>
@@ -2622,7 +2622,7 @@
           <parameter type-id='type-id-124' is-artificial='yes'/>
           <parameter type-id='type-id-130'/>
           <parameter type-id='type-id-133'/>
-          <parameter type-id='type-id-122'/>
+          <parameter type-id='type-id-121'/>
           <parameter type-id='type-id-19'/>
           <return type-id='type-id-19'/>
         </function-decl>
@@ -2632,7 +2632,7 @@
           <parameter type-id='type-id-124' is-artificial='yes'/>
           <parameter type-id='type-id-57'/>
           <parameter type-id='type-id-58'/>
-          <parameter type-id='type-id-122'/>
+          <parameter type-id='type-id-121'/>
           <parameter type-id='type-id-19'/>
           <return type-id='type-id-19'/>
         </function-decl>
@@ -2642,7 +2642,7 @@
           <parameter type-id='type-id-124' is-artificial='yes'/>
           <parameter type-id='type-id-98'/>
           <parameter type-id='type-id-33'/>
-          <parameter type-id='type-id-122'/>
+          <parameter type-id='type-id-121'/>
           <parameter type-id='type-id-19'/>
           <return type-id='type-id-19'/>
         </function-decl>
@@ -2652,7 +2652,7 @@
           <parameter type-id='type-id-124' is-artificial='yes'/>
           <parameter type-id='type-id-131'/>
           <parameter type-id='type-id-75'/>
-          <parameter type-id='type-id-122'/>
+          <parameter type-id='type-id-121'/>
           <parameter type-id='type-id-19'/>
           <return type-id='type-id-19'/>
         </function-decl>
@@ -2662,7 +2662,7 @@
           <parameter type-id='type-id-124' is-artificial='yes'/>
           <parameter type-id='type-id-112'/>
           <parameter type-id='type-id-74'/>
-          <parameter type-id='type-id-122'/>
+          <parameter type-id='type-id-121'/>
           <parameter type-id='type-id-19'/>
           <return type-id='type-id-19'/>
         </function-decl>
@@ -2672,7 +2672,7 @@
           <parameter type-id='type-id-124' is-artificial='yes'/>
           <parameter type-id='type-id-132'/>
           <parameter type-id='type-id-134'/>
-          <parameter type-id='type-id-122'/>
+          <parameter type-id='type-id-121'/>
           <parameter type-id='type-id-19'/>
           <return type-id='type-id-19'/>
         </function-decl>
@@ -2691,8 +2691,8 @@
           <parameter type-id='type-id-124' is-artificial='yes'/>
           <parameter type-id='type-id-128'/>
           <parameter type-id='type-id-76'/>
-          <parameter type-id='type-id-122'/>
           <parameter type-id='type-id-121'/>
+          <parameter type-id='type-id-120'/>
           <return type-id='type-id-19'/>
         </function-decl>
       </member-function>
@@ -2701,8 +2701,8 @@
           <parameter type-id='type-id-124' is-artificial='yes'/>
           <parameter type-id='type-id-130'/>
           <parameter type-id='type-id-133'/>
-          <parameter type-id='type-id-122'/>
           <parameter type-id='type-id-121'/>
+          <parameter type-id='type-id-120'/>
           <return type-id='type-id-19'/>
         </function-decl>
       </member-function>
@@ -2711,8 +2711,8 @@
           <parameter type-id='type-id-124' is-artificial='yes'/>
           <parameter type-id='type-id-57'/>
           <parameter type-id='type-id-58'/>
-          <parameter type-id='type-id-122'/>
           <parameter type-id='type-id-121'/>
+          <parameter type-id='type-id-120'/>
           <return type-id='type-id-19'/>
         </function-decl>
       </member-function>
@@ -2721,8 +2721,8 @@
           <parameter type-id='type-id-124' is-artificial='yes'/>
           <parameter type-id='type-id-98'/>
           <parameter type-id='type-id-33'/>
-          <parameter type-id='type-id-122'/>
           <parameter type-id='type-id-121'/>
+          <parameter type-id='type-id-120'/>
           <return type-id='type-id-19'/>
         </function-decl>
       </member-function>
@@ -2731,8 +2731,8 @@
           <parameter type-id='type-id-124' is-artificial='yes'/>
           <parameter type-id='type-id-131'/>
           <parameter type-id='type-id-75'/>
-          <parameter type-id='type-id-122'/>
           <parameter type-id='type-id-121'/>
+          <parameter type-id='type-id-120'/>
           <return type-id='type-id-19'/>
         </function-decl>
       </member-function>
@@ -2741,8 +2741,8 @@
           <parameter type-id='type-id-124' is-artificial='yes'/>
           <parameter type-id='type-id-112'/>
           <parameter type-id='type-id-74'/>
-          <parameter type-id='type-id-122'/>
           <parameter type-id='type-id-121'/>
+          <parameter type-id='type-id-120'/>
           <return type-id='type-id-19'/>
         </function-decl>
       </member-function>
@@ -2751,8 +2751,8 @@
           <parameter type-id='type-id-124' is-artificial='yes'/>
           <parameter type-id='type-id-132'/>
           <parameter type-id='type-id-134'/>
-          <parameter type-id='type-id-122'/>
           <parameter type-id='type-id-121'/>
+          <parameter type-id='type-id-120'/>
           <return type-id='type-id-19'/>
         </function-decl>
       </member-function>
@@ -2761,7 +2761,7 @@
           <parameter type-id='type-id-124' is-artificial='yes'/>
           <parameter type-id='type-id-127'/>
           <parameter type-id='type-id-127'/>
-          <parameter type-id='type-id-121'/>
+          <parameter type-id='type-id-120'/>
           <return type-id='type-id-19'/>
         </function-decl>
       </member-function>
@@ -2925,7 +2925,7 @@
         <function-decl name='SendVoidArray' mangled-name='_ZN15vtkCommunicator13SendVoidArrayEPKvxiii' filepath='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Parallel/Core/vtkCommunicator.h' line='135' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-124' is-artificial='yes'/>
           <parameter type-id='type-id-14'/>
-          <parameter type-id='type-id-122'/>
+          <parameter type-id='type-id-121'/>
           <parameter type-id='type-id-19'/>
           <parameter type-id='type-id-19'/>
           <parameter type-id='type-id-19'/>
@@ -2936,7 +2936,7 @@
         <function-decl name='ReceiveVoidArray' mangled-name='_ZN15vtkCommunicator16ReceiveVoidArrayEPvxiii' filepath='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Parallel/Core/vtkCommunicator.h' line='197' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-124' is-artificial='yes'/>
           <parameter type-id='type-id-14'/>
-          <parameter type-id='type-id-122'/>
+          <parameter type-id='type-id-121'/>
           <parameter type-id='type-id-19'/>
           <parameter type-id='type-id-19'/>
           <parameter type-id='type-id-19'/>
@@ -2946,7 +2946,7 @@
       <member-function access='private' vtable-offset='25'>
         <function-decl name='GetCount' mangled-name='_ZN15vtkCommunicator8GetCountEv' filepath='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Parallel/Core/vtkCommunicator.h' line='241' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-124' is-artificial='yes'/>
-          <return type-id='type-id-122'/>
+          <return type-id='type-id-121'/>
         </function-decl>
       </member-function>
       <member-function access='private' vtable-offset='26'>
@@ -2959,7 +2959,7 @@
         <function-decl name='BroadcastVoidArray' mangled-name='_ZN15vtkCommunicator18BroadcastVoidArrayEPvxii' filepath='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Parallel/Core/vtkCommunicator.cxx' line='791' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN15vtkCommunicator18BroadcastVoidArrayEPvxii'>
           <parameter type-id='type-id-124' is-artificial='yes'/>
           <parameter type-id='type-id-14'/>
-          <parameter type-id='type-id-122'/>
+          <parameter type-id='type-id-121'/>
           <parameter type-id='type-id-19'/>
           <parameter type-id='type-id-19'/>
           <return type-id='type-id-19'/>
@@ -2970,7 +2970,7 @@
           <parameter type-id='type-id-124' is-artificial='yes'/>
           <parameter type-id='type-id-14'/>
           <parameter type-id='type-id-14'/>
-          <parameter type-id='type-id-122'/>
+          <parameter type-id='type-id-121'/>
           <parameter type-id='type-id-19'/>
           <parameter type-id='type-id-19'/>
           <return type-id='type-id-19'/>
@@ -2981,7 +2981,7 @@
           <parameter type-id='type-id-124' is-artificial='yes'/>
           <parameter type-id='type-id-14'/>
           <parameter type-id='type-id-14'/>
-          <parameter type-id='type-id-122'/>
+          <parameter type-id='type-id-121'/>
           <parameter type-id='type-id-134'/>
           <parameter type-id='type-id-134'/>
           <parameter type-id='type-id-19'/>
@@ -2994,7 +2994,7 @@
           <parameter type-id='type-id-124' is-artificial='yes'/>
           <parameter type-id='type-id-14'/>
           <parameter type-id='type-id-14'/>
-          <parameter type-id='type-id-122'/>
+          <parameter type-id='type-id-121'/>
           <parameter type-id='type-id-19'/>
           <parameter type-id='type-id-19'/>
           <return type-id='type-id-19'/>
@@ -3007,7 +3007,7 @@
           <parameter type-id='type-id-14'/>
           <parameter type-id='type-id-134'/>
           <parameter type-id='type-id-134'/>
-          <parameter type-id='type-id-122'/>
+          <parameter type-id='type-id-121'/>
           <parameter type-id='type-id-19'/>
           <parameter type-id='type-id-19'/>
           <return type-id='type-id-19'/>
@@ -3018,7 +3018,7 @@
           <parameter type-id='type-id-124' is-artificial='yes'/>
           <parameter type-id='type-id-14'/>
           <parameter type-id='type-id-14'/>
-          <parameter type-id='type-id-122'/>
+          <parameter type-id='type-id-121'/>
           <parameter type-id='type-id-19'/>
           <return type-id='type-id-19'/>
         </function-decl>
@@ -3028,7 +3028,7 @@
           <parameter type-id='type-id-124' is-artificial='yes'/>
           <parameter type-id='type-id-14'/>
           <parameter type-id='type-id-14'/>
-          <parameter type-id='type-id-122'/>
+          <parameter type-id='type-id-121'/>
           <parameter type-id='type-id-134'/>
           <parameter type-id='type-id-134'/>
           <parameter type-id='type-id-19'/>
@@ -3040,7 +3040,7 @@
           <parameter type-id='type-id-124' is-artificial='yes'/>
           <parameter type-id='type-id-14'/>
           <parameter type-id='type-id-14'/>
-          <parameter type-id='type-id-122'/>
+          <parameter type-id='type-id-121'/>
           <parameter type-id='type-id-19'/>
           <parameter type-id='type-id-19'/>
           <parameter type-id='type-id-19'/>
@@ -3052,10 +3052,10 @@
           <parameter type-id='type-id-124' is-artificial='yes'/>
           <parameter type-id='type-id-14'/>
           <parameter type-id='type-id-14'/>
-          <parameter type-id='type-id-122'/>
-          <parameter type-id='type-id-19'/>
           <parameter type-id='type-id-121'/>
           <parameter type-id='type-id-19'/>
+          <parameter type-id='type-id-120'/>
+          <parameter type-id='type-id-19'/>
           <return type-id='type-id-19'/>
         </function-decl>
       </member-function>
@@ -3064,7 +3064,7 @@
           <parameter type-id='type-id-124' is-artificial='yes'/>
           <parameter type-id='type-id-14'/>
           <parameter type-id='type-id-14'/>
-          <parameter type-id='type-id-122'/>
+          <parameter type-id='type-id-121'/>
           <parameter type-id='type-id-19'/>
           <parameter type-id='type-id-19'/>
           <return type-id='type-id-19'/>
@@ -3075,9 +3075,9 @@
           <parameter type-id='type-id-124' is-artificial='yes'/>
           <parameter type-id='type-id-14'/>
           <parameter type-id='type-id-14'/>
-          <parameter type-id='type-id-122'/>
-          <parameter type-id='type-id-19'/>
           <parameter type-id='type-id-121'/>
+          <parameter type-id='type-id-19'/>
+          <parameter type-id='type-id-120'/>
           <return type-id='type-id-19'/>
         </function-decl>
       </member-function>
@@ -3096,7 +3096,7 @@
         </function-decl>
       </member-function>
     </class-decl>
-    <typedef-decl name='vtkIdType' type-id='type-id-22' filepath='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Common/Core/vtkType.h' line='255' column='1' id='type-id-122'/>
+    <typedef-decl name='vtkIdType' type-id='type-id-22' filepath='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Common/Core/vtkType.h' line='255' column='1' id='type-id-121'/>
     <typedef-decl name='vtkTypeInt64' type-id='type-id-22' filepath='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Common/Core/vtkType.h' line='212' column='1' id='type-id-62'/>
     <typedef-decl name='vtkTypeUInt64' type-id='type-id-23' filepath='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Common/Core/vtkType.h' line='211' column='1' id='type-id-63'/>
     <class-decl name='vtkTypeTraits&lt;int&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Common/Core/vtkTypeTraits.h' line='99' column='1' id='type-id-139'>
@@ -3112,13 +3112,13 @@
       </member-function>
     </class-decl>
     <class-decl name='vtkCommunicatorMaxClass' size-in-bits='64' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Parallel/Core/vtkCommunicator.cxx' line='85' column='1' id='type-id-140'>
-      <base-class access='public' layout-offset-in-bits='0' type-id='type-id-120'/>
+      <base-class access='public' layout-offset-in-bits='0' type-id='type-id-119'/>
       <member-function access='private' vtable-offset='0'>
         <function-decl name='Function' mangled-name='_ZN23vtkCommunicatorMaxClass8FunctionEPKvPvxi' filepath='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Parallel/Core/vtkCommunicator.cxx' line='85' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-141' is-artificial='yes'/>
           <parameter type-id='type-id-14'/>
           <parameter type-id='type-id-14'/>
-          <parameter type-id='type-id-122'/>
+          <parameter type-id='type-id-121'/>
           <parameter type-id='type-id-19'/>
           <return type-id='type-id-28'/>
         </function-decl>
@@ -3131,13 +3131,13 @@
       </member-function>
     </class-decl>
     <class-decl name='vtkCommunicatorMinClass' size-in-bits='64' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Parallel/Core/vtkCommunicator.cxx' line='86' column='1' id='type-id-142'>
-      <base-class access='public' layout-offset-in-bits='0' type-id='type-id-120'/>
+      <base-class access='public' layout-offset-in-bits='0' type-id='type-id-119'/>
       <member-function access='private' vtable-offset='0'>
         <function-decl name='Function' mangled-name='_ZN23vtkCommunicatorMinClass8FunctionEPKvPvxi' filepath='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Parallel/Core/vtkCommunicator.cxx' line='86' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-143' is-artificial='yes'/>
           <parameter type-id='type-id-14'/>
           <parameter type-id='type-id-14'/>
-          <parameter type-id='type-id-122'/>
+          <parameter type-id='type-id-121'/>
           <parameter type-id='type-id-19'/>
           <return type-id='type-id-28'/>
         </function-decl>
@@ -3150,13 +3150,13 @@
       </member-function>
     </class-decl>
     <class-decl name='vtkCommunicatorSumClass' size-in-bits='64' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Parallel/Core/vtkCommunicator.cxx' line='87' column='1' id='type-id-144'>
-      <base-class access='public' layout-offset-in-bits='0' type-id='type-id-120'/>
+      <base-class access='public' layout-offset-in-bits='0' type-id='type-id-119'/>
       <member-function access='private' vtable-offset='0'>
         <function-decl name='Function' mangled-name='_ZN23vtkCommunicatorSumClass8FunctionEPKvPvxi' filepath='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Parallel/Core/vtkCommunicator.cxx' line='87' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-145' is-artificial='yes'/>
           <parameter type-id='type-id-14'/>
           <parameter type-id='type-id-14'/>
-          <parameter type-id='type-id-122'/>
+          <parameter type-id='type-id-121'/>
           <parameter type-id='type-id-19'/>
           <return type-id='type-id-28'/>
         </function-decl>
@@ -3169,13 +3169,13 @@
       </member-function>
     </class-decl>
     <class-decl name='vtkCommunicatorProductClass' size-in-bits='64' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Parallel/Core/vtkCommunicator.cxx' line='88' column='1' id='type-id-146'>
-      <base-class access='public' layout-offset-in-bits='0' type-id='type-id-120'/>
+      <base-class access='public' layout-offset-in-bits='0' type-id='type-id-119'/>
       <member-function access='private' vtable-offset='0'>
         <function-decl name='Function' mangled-name='_ZN27vtkCommunicatorProductClass8FunctionEPKvPvxi' filepath='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Parallel/Core/vtkCommunicator.cxx' line='88' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-147' is-artificial='yes'/>
           <parameter type-id='type-id-14'/>
           <parameter type-id='type-id-14'/>
-          <parameter type-id='type-id-122'/>
+          <parameter type-id='type-id-121'/>
           <parameter type-id='type-id-19'/>
           <return type-id='type-id-28'/>
         </function-decl>
@@ -3188,13 +3188,13 @@
       </member-function>
     </class-decl>
     <class-decl name='vtkCommunicatorLogicalAndClass' size-in-bits='64' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Parallel/Core/vtkCommunicator.cxx' line='90' column='1' id='type-id-148'>
-      <base-class access='public' layout-offset-in-bits='0' type-id='type-id-120'/>
+      <base-class access='public' layout-offset-in-bits='0' type-id='type-id-119'/>
       <member-function access='private' vtable-offset='0'>
         <function-decl name='Function' mangled-name='_ZN30vtkCommunicatorLogicalAndClass8FunctionEPKvPvxi' filepath='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Parallel/Core/vtkCommunicator.cxx' line='90' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-149' is-artificial='yes'/>
           <parameter type-id='type-id-14'/>
           <parameter type-id='type-id-14'/>
-          <parameter type-id='type-id-122'/>
+          <parameter type-id='type-id-121'/>
           <parameter type-id='type-id-19'/>
           <return type-id='type-id-28'/>
         </function-decl>
@@ -3207,13 +3207,13 @@
       </member-function>
     </class-decl>
     <class-decl name='vtkCommunicatorBitwiseAndClass' size-in-bits='64' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Parallel/Core/vtkCommunicator.cxx' line='92' column='1' id='type-id-150'>
-      <base-class access='public' layout-offset-in-bits='0' type-id='type-id-120'/>
+      <base-class access='public' layout-offset-in-bits='0' type-id='type-id-119'/>
       <member-function access='private' vtable-offset='0'>
         <function-decl name='Function' mangled-name='_ZN30vtkCommunicatorBitwiseAndClass8FunctionEPKvPvxi' filepath='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Parallel/Core/vtkCommunicator.cxx' line='92' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-151' is-artificial='yes'/>
           <parameter type-id='type-id-14'/>
           <parameter type-id='type-id-14'/>
-          <parameter type-id='type-id-122'/>
+          <parameter type-id='type-id-121'/>
           <parameter type-id='type-id-19'/>
           <return type-id='type-id-28'/>
         </function-decl>
@@ -3226,13 +3226,13 @@
       </member-function>
     </class-decl>
     <class-decl name='vtkCommunicatorLogicalOrClass' size-in-bits='64' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Parallel/Core/vtkCommunicator.cxx' line='94' column='1' id='type-id-152'>
-      <base-class access='public' layout-offset-in-bits='0' type-id='type-id-120'/>
+      <base-class access='public' layout-offset-in-bits='0' type-id='type-id-119'/>
       <member-function access='private' vtable-offset='0'>
         <function-decl name='Function' mangled-name='_ZN29vtkCommunicatorLogicalOrClass8FunctionEPKvPvxi' filepath='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Parallel/Core/vtkCommunicator.cxx' line='94' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-153' is-artificial='yes'/>
           <parameter type-id='type-id-14'/>
           <parameter type-id='type-id-14'/>
-          <parameter type-id='type-id-122'/>
+          <parameter type-id='type-id-121'/>
           <parameter type-id='type-id-19'/>
           <return type-id='type-id-28'/>
         </function-decl>
@@ -3245,13 +3245,13 @@
       </member-function>
     </class-decl>
     <class-decl name='vtkCommunicatorBitwiseOrClass' size-in-bits='64' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Parallel/Core/vtkCommunicator.cxx' line='96' column='1' id='type-id-154'>
-      <base-class access='public' layout-offset-in-bits='0' type-id='type-id-120'/>
+      <base-class access='public' layout-offset-in-bits='0' type-id='type-id-119'/>
       <member-function access='private' vtable-offset='0'>
         <function-decl name='Function' mangled-name='_ZN29vtkCommunicatorBitwiseOrClass8FunctionEPKvPvxi' filepath='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Parallel/Core/vtkCommunicator.cxx' line='96' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-155' is-artificial='yes'/>
           <parameter type-id='type-id-14'/>
           <parameter type-id='type-id-14'/>
-          <parameter type-id='type-id-122'/>
+          <parameter type-id='type-id-121'/>
           <parameter type-id='type-id-19'/>
           <return type-id='type-id-28'/>
         </function-decl>
@@ -3264,13 +3264,13 @@
       </member-function>
     </class-decl>
     <class-decl name='vtkCommunicatorLogicalXorClass' size-in-bits='64' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Parallel/Core/vtkCommunicator.cxx' line='98' column='1' id='type-id-156'>
-      <base-class access='public' layout-offset-in-bits='0' type-id='type-id-120'/>
+      <base-class access='public' layout-offset-in-bits='0' type-id='type-id-119'/>
       <member-function access='private' vtable-offset='0'>
         <function-decl name='Function' mangled-name='_ZN30vtkCommunicatorLogicalXorClass8FunctionEPKvPvxi' filepath='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Parallel/Core/vtkCommunicator.cxx' line='98' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-157' is-artificial='yes'/>
           <parameter type-id='type-id-14'/>
           <parameter type-id='type-id-14'/>
-          <parameter type-id='type-id-122'/>
+          <parameter type-id='type-id-121'/>
           <parameter type-id='type-id-19'/>
           <return type-id='type-id-28'/>
         </function-decl>
@@ -3283,13 +3283,13 @@
       </member-function>
     </class-decl>
     <class-decl name='vtkCommunicatorBitwiseXorClass' size-in-bits='64' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Parallel/Core/vtkCommunicator.cxx' line='100' column='1' id='type-id-158'>
-      <base-class access='public' layout-offset-in-bits='0' type-id='type-id-120'/>
+      <base-class access='public' layout-offset-in-bits='0' type-id='type-id-119'/>
       <member-function access='private' vtable-offset='0'>
         <function-decl name='Function' mangled-name='_ZN30vtkCommunicatorBitwiseXorClass8FunctionEPKvPvxi' filepath='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Parallel/Core/vtkCommunicator.cxx' line='100' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-159' is-artificial='yes'/>
           <parameter type-id='type-id-14'/>
           <parameter type-id='type-id-14'/>
-          <parameter type-id='type-id-122'/>
+          <parameter type-id='type-id-121'/>
           <parameter type-id='type-id-19'/>
           <return type-id='type-id-28'/>
         </function-decl>
@@ -3908,7 +3908,7 @@
     <pointer-type-def type-id='type-id-296' size-in-bits='64' id='type-id-125'/>
     <qualified-type-def type-id='type-id-297' const='yes' id='type-id-298'/>
     <pointer-type-def type-id='type-id-298' size-in-bits='64' id='type-id-299'/>
-    <qualified-type-def type-id='type-id-122' const='yes' id='type-id-300'/>
+    <qualified-type-def type-id='type-id-121' const='yes' id='type-id-300'/>
     <pointer-type-def type-id='type-id-300' size-in-bits='64' id='type-id-132'/>
     <qualified-type-def type-id='type-id-51' const='yes' id='type-id-301'/>
     <reference-type-def kind='lvalue' type-id='type-id-301' size-in-bits='64' id='type-id-60'/>
@@ -3997,7 +3997,7 @@
     <reference-type-def kind='lvalue' type-id='type-id-369' size-in-bits='64' id='type-id-165'/>
     <pointer-type-def type-id='type-id-369' size-in-bits='64' id='type-id-135'/>
     <pointer-type-def type-id='type-id-116' size-in-bits='64' id='type-id-124'/>
-    <pointer-type-def type-id='type-id-120' size-in-bits='64' id='type-id-121'/>
+    <pointer-type-def type-id='type-id-119' size-in-bits='64' id='type-id-120'/>
     <pointer-type-def type-id='type-id-150' size-in-bits='64' id='type-id-151'/>
     <pointer-type-def type-id='type-id-154' size-in-bits='64' id='type-id-155'/>
     <pointer-type-def type-id='type-id-158' size-in-bits='64' id='type-id-159'/>
@@ -4019,7 +4019,7 @@
     <pointer-type-def type-id='type-id-378' size-in-bits='64' id='type-id-169'/>
     <reference-type-def kind='lvalue' type-id='type-id-379' size-in-bits='64' id='type-id-179'/>
     <pointer-type-def type-id='type-id-379' size-in-bits='64' id='type-id-175'/>
-    <pointer-type-def type-id='type-id-122' size-in-bits='64' id='type-id-134'/>
+    <pointer-type-def type-id='type-id-121' size-in-bits='64' id='type-id-134'/>
     <pointer-type-def type-id='type-id-380' size-in-bits='64' id='type-id-381'/>
     <pointer-type-def type-id='type-id-49' size-in-bits='64' id='type-id-50'/>
     <pointer-type-def type-id='type-id-382' size-in-bits='64' id='type-id-136'/>
@@ -8332,7 +8332,7 @@
       <member-function access='public'>
         <function-decl name='GetNumberOfTuples' mangled-name='_ZN16vtkAbstractArray17GetNumberOfTuplesEv' filepath='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Common/Core/vtkAbstractArray.h' line='128' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-368' is-artificial='yes'/>
-          <return type-id='type-id-122'/>
+          <return type-id='type-id-121'/>
         </function-decl>
       </member-function>
     </class-decl>
@@ -8521,7 +8521,7 @@
         <function-decl name='SendVoidArray' mangled-name='_ZN20vtkDummyCommunicator13SendVoidArrayEPKvxiii' filepath='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Parallel/Core/vtkDummyCommunicator.h' line='41' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-453' is-artificial='yes'/>
           <parameter type-id='type-id-14'/>
-          <parameter type-id='type-id-122'/>
+          <parameter type-id='type-id-121'/>
           <parameter type-id='type-id-19'/>
           <parameter type-id='type-id-19'/>
           <parameter type-id='type-id-19'/>
@@ -8532,7 +8532,7 @@
         <function-decl name='ReceiveVoidArray' mangled-name='_ZN20vtkDummyCommunicator16ReceiveVoidArrayEPvxiii' filepath='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Parallel/Core/vtkDummyCommunicator.h' line='45' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-453' is-artificial='yes'/>
           <parameter type-id='type-id-14'/>
-          <parameter type-id='type-id-122'/>
+          <parameter type-id='type-id-121'/>
           <parameter type-id='type-id-19'/>
           <parameter type-id='type-id-19'/>
           <parameter type-id='type-id-19'/>
@@ -8796,7 +8796,7 @@
         <function-decl name='Send' mangled-name='_ZN25vtkMultiProcessController4SendEPKixii' filepath='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Parallel/Core/vtkMultiProcessController.h' line='1055' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-471' is-artificial='yes'/>
           <parameter type-id='type-id-128'/>
-          <parameter type-id='type-id-122'/>
+          <parameter type-id='type-id-121'/>
           <parameter type-id='type-id-19'/>
           <parameter type-id='type-id-19'/>
           <return type-id='type-id-19'/>
@@ -8806,7 +8806,7 @@
         <function-decl name='Send' mangled-name='_ZN25vtkMultiProcessController4SendEPKjxii' filepath='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Parallel/Core/vtkMultiProcessController.h' line='1068' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-471' is-artificial='yes'/>
           <parameter type-id='type-id-129'/>
-          <parameter type-id='type-id-122'/>
+          <parameter type-id='type-id-121'/>
           <parameter type-id='type-id-19'/>
           <parameter type-id='type-id-19'/>
           <return type-id='type-id-19'/>
@@ -8816,7 +8816,7 @@
         <function-decl name='Send' mangled-name='_ZN25vtkMultiProcessController4SendEPKmxii' filepath='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Parallel/Core/vtkMultiProcessController.h' line='1081' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-471' is-artificial='yes'/>
           <parameter type-id='type-id-130'/>
-          <parameter type-id='type-id-122'/>
+          <parameter type-id='type-id-121'/>
           <parameter type-id='type-id-19'/>
           <parameter type-id='type-id-19'/>
           <return type-id='type-id-19'/>
@@ -8826,7 +8826,7 @@
         <function-decl name='Send' mangled-name='_ZN25vtkMultiProcessController4SendEPKcxii' filepath='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Parallel/Core/vtkMultiProcessController.h' line='1096' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-471' is-artificial='yes'/>
           <parameter type-id='type-id-98'/>
-          <parameter type-id='type-id-122'/>
+          <parameter type-id='type-id-121'/>
           <parameter type-id='type-id-19'/>
           <parameter type-id='type-id-19'/>
           <return type-id='type-id-19'/>
@@ -8836,7 +8836,7 @@
         <function-decl name='Send' mangled-name='_ZN25vtkMultiProcessController4SendEPKhxii' filepath='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Parallel/Core/vtkMultiProcessController.h' line='1109' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-471' is-artificial='yes'/>
           <parameter type-id='type-id-57'/>
-          <parameter type-id='type-id-122'/>
+          <parameter type-id='type-id-121'/>
           <parameter type-id='type-id-19'/>
           <parameter type-id='type-id-19'/>
           <return type-id='type-id-19'/>
@@ -8846,7 +8846,7 @@
         <function-decl name='Send' mangled-name='_ZN25vtkMultiProcessController4SendEPKfxii' filepath='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Parallel/Core/vtkMultiProcessController.h' line='1123' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-471' is-artificial='yes'/>
           <parameter type-id='type-id-131'/>
-          <parameter type-id='type-id-122'/>
+          <parameter type-id='type-id-121'/>
           <parameter type-id='type-id-19'/>
           <parameter type-id='type-id-19'/>
           <return type-id='type-id-19'/>
@@ -8856,7 +8856,7 @@
         <function-decl name='Send' mangled-name='_ZN25vtkMultiProcessController4SendEPKdxii' filepath='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Parallel/Core/vtkMultiProcessController.h' line='1136' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-471' is-artificial='yes'/>
           <parameter type-id='type-id-112'/>
-          <parameter type-id='type-id-122'/>
+          <parameter type-id='type-id-121'/>
           <parameter type-id='type-id-19'/>
           <parameter type-id='type-id-19'/>
           <return type-id='type-id-19'/>
@@ -8866,7 +8866,7 @@
         <function-decl name='Send' mangled-name='_ZN25vtkMultiProcessController4SendEPKxxii' filepath='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Parallel/Core/vtkMultiProcessController.h' line='1150' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-471' is-artificial='yes'/>
           <parameter type-id='type-id-132'/>
-          <parameter type-id='type-id-122'/>
+          <parameter type-id='type-id-121'/>
           <parameter type-id='type-id-19'/>
           <parameter type-id='type-id-19'/>
           <return type-id='type-id-19'/>
@@ -8903,7 +8903,7 @@
         <function-decl name='Receive' mangled-name='_ZN25vtkMultiProcessController7ReceiveEPixii' filepath='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Parallel/Core/vtkMultiProcessController.h' line='1214' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-471' is-artificial='yes'/>
           <parameter type-id='type-id-76'/>
-          <parameter type-id='type-id-122'/>
+          <parameter type-id='type-id-121'/>
           <parameter type-id='type-id-19'/>
           <parameter type-id='type-id-19'/>
           <return type-id='type-id-19'/>
@@ -8913,7 +8913,7 @@
         <function-decl name='Receive' mangled-name='_ZN25vtkMultiProcessController7ReceiveEPjxii' filepath='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Parallel/Core/vtkMultiProcessController.h' line='1227' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-471' is-artificial='yes'/>
           <parameter type-id='type-id-77'/>
-          <parameter type-id='type-id-122'/>
+          <parameter type-id='type-id-121'/>
           <parameter type-id='type-id-19'/>
           <parameter type-id='type-id-19'/>
           <return type-id='type-id-19'/>
@@ -8923,7 +8923,7 @@
         <function-decl name='Receive' mangled-name='_ZN25vtkMultiProcessController7ReceiveEPmxii' filepath='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Parallel/Core/vtkMultiProcessController.h' line='1240' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-471' is-artificial='yes'/>
           <parameter type-id='type-id-133'/>
-          <parameter type-id='type-id-122'/>
+          <parameter type-id='type-id-121'/>
           <parameter type-id='type-id-19'/>
           <parameter type-id='type-id-19'/>
           <return type-id='type-id-19'/>
@@ -8933,7 +8933,7 @@
         <function-decl name='Receive' mangled-name='_ZN25vtkMultiProcessController7ReceiveEPcxii' filepath='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Parallel/Core/vtkMultiProcessController.h' line='1255' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-471' is-artificial='yes'/>
           <parameter type-id='type-id-33'/>
-          <parameter type-id='type-id-122'/>
+          <parameter type-id='type-id-121'/>
           <parameter type-id='type-id-19'/>
           <parameter type-id='type-id-19'/>
           <return type-id='type-id-19'/>
@@ -8943,7 +8943,7 @@
         <function-decl name='Receive' mangled-name='_ZN25vtkMultiProcessController7ReceiveEPhxii' filepath='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Parallel/Core/vtkMultiProcessController.h' line='1268' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-471' is-artificial='yes'/>
           <parameter type-id='type-id-58'/>
-          <parameter type-id='type-id-122'/>
+          <parameter type-id='type-id-121'/>
           <parameter type-id='type-id-19'/>
           <parameter type-id='type-id-19'/>
           <return type-id='type-id-19'/>
@@ -8953,7 +8953,7 @@
         <function-decl name='Receive' mangled-name='_ZN25vtkMultiProcessController7ReceiveEPfxii' filepath='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Parallel/Core/vtkMultiProcessController.h' line='1282' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-471' is-artificial='yes'/>
           <parameter type-id='type-id-75'/>
-          <parameter type-id='type-id-122'/>
+          <parameter type-id='type-id-121'/>
           <parameter type-id='type-id-19'/>
           <parameter type-id='type-id-19'/>
           <return type-id='type-id-19'/>
@@ -8963,7 +8963,7 @@
         <function-decl name='Receive' mangled-name='_ZN25vtkMultiProcessController7ReceiveEPdxii' filepath='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Parallel/Core/vtkMultiProcessController.h' line='1295' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-471' is-artificial='yes'/>
           <parameter type-id='type-id-74'/>
-          <parameter type-id='type-id-122'/>
+          <parameter type-id='type-id-121'/>
           <parameter type-id='type-id-19'/>
           <parameter type-id='type-id-19'/>
           <return type-id='type-id-19'/>
@@ -8973,7 +8973,7 @@
         <function-decl name='Receive' mangled-name='_ZN25vtkMultiProcessController7ReceiveEPxxii' filepath='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Parallel/Core/vtkMultiProcessController.h' line='1309' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-471' is-artificial='yes'/>
           <parameter type-id='type-id-134'/>
-          <parameter type-id='type-id-122'/>
+          <parameter type-id='type-id-121'/>
           <parameter type-id='type-id-19'/>
           <parameter type-id='type-id-19'/>
           <return type-id='type-id-19'/>
@@ -9017,14 +9017,14 @@
       <member-function access='public'>
         <function-decl name='GetCount' mangled-name='_ZN25vtkMultiProcessController8GetCountEv' filepath='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Parallel/Core/vtkMultiProcessController.h' line='1343' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-471' is-artificial='yes'/>
-          <return type-id='type-id-122'/>
+          <return type-id='type-id-121'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
         <function-decl name='Broadcast' mangled-name='_ZN25vtkMultiProcessController9BroadcastEPixi' filepath='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Parallel/Core/vtkMultiProcessController.h' line='401' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-471' is-artificial='yes'/>
           <parameter type-id='type-id-76'/>
-          <parameter type-id='type-id-122'/>
+          <parameter type-id='type-id-121'/>
           <parameter type-id='type-id-19'/>
           <return type-id='type-id-19'/>
         </function-decl>
@@ -9033,7 +9033,7 @@
         <function-decl name='Broadcast' mangled-name='_ZN25vtkMultiProcessController9BroadcastEPjxi' filepath='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Parallel/Core/vtkMultiProcessController.h' line='404' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-471' is-artificial='yes'/>
           <parameter type-id='type-id-77'/>
-          <parameter type-id='type-id-122'/>
+          <parameter type-id='type-id-121'/>
           <parameter type-id='type-id-19'/>
           <return type-id='type-id-19'/>
         </function-decl>
@@ -9042,7 +9042,7 @@
         <function-decl name='Broadcast' mangled-name='_ZN25vtkMultiProcessController9BroadcastEPmxi' filepath='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Parallel/Core/vtkMultiProcessController.h' line='407' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-471' is-artificial='yes'/>
           <parameter type-id='type-id-133'/>
-          <parameter type-id='type-id-122'/>
+          <parameter type-id='type-id-121'/>
           <parameter type-id='type-id-19'/>
           <return type-id='type-id-19'/>
         </function-decl>
@@ -9051,7 +9051,7 @@
         <function-decl name='Broadcast' mangled-name='_ZN25vtkMultiProcessController9BroadcastEPhxi' filepath='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Parallel/Core/vtkMultiProcessController.h' line='410' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-471' is-artificial='yes'/>
           <parameter type-id='type-id-58'/>
-          <parameter type-id='type-id-122'/>
+          <parameter type-id='type-id-121'/>
           <parameter type-id='type-id-19'/>
           <return type-id='type-id-19'/>
         </function-decl>
@@ -9060,7 +9060,7 @@
         <function-decl name='Broadcast' mangled-name='_ZN25vtkMultiProcessController9BroadcastEPcxi' filepath='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Parallel/Core/vtkMultiProcessController.h' line='413' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-471' is-artificial='yes'/>
           <parameter type-id='type-id-33'/>
-          <parameter type-id='type-id-122'/>
+          <parameter type-id='type-id-121'/>
           <parameter type-id='type-id-19'/>
           <return type-id='type-id-19'/>
         </function-decl>
@@ -9069,7 +9069,7 @@
         <function-decl name='Broadcast' mangled-name='_ZN25vtkMultiProcessController9BroadcastEPfxi' filepath='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Parallel/Core/vtkMultiProcessController.h' line='416' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-471' is-artificial='yes'/>
           <parameter type-id='type-id-75'/>
-          <parameter type-id='type-id-122'/>
+          <parameter type-id='type-id-121'/>
           <parameter type-id='type-id-19'/>
           <return type-id='type-id-19'/>
         </function-decl>
@@ -9078,7 +9078,7 @@
         <function-decl name='Broadcast' mangled-name='_ZN25vtkMultiProcessController9BroadcastEPdxi' filepath='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Parallel/Core/vtkMultiProcessController.h' line='419' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-471' is-artificial='yes'/>
           <parameter type-id='type-id-74'/>
-          <parameter type-id='type-id-122'/>
+          <parameter type-id='type-id-121'/>
           <parameter type-id='type-id-19'/>
           <return type-id='type-id-19'/>
         </function-decl>
@@ -9087,7 +9087,7 @@
         <function-decl name='Broadcast' mangled-name='_ZN25vtkMultiProcessController9BroadcastEPxxi' filepath='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Parallel/Core/vtkMultiProcessController.h' line='423' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-471' is-artificial='yes'/>
           <parameter type-id='type-id-134'/>
-          <parameter type-id='type-id-122'/>
+          <parameter type-id='type-id-121'/>
           <parameter type-id='type-id-19'/>
           <return type-id='type-id-19'/>
         </function-decl>
@@ -9121,7 +9121,7 @@
           <parameter type-id='type-id-471' is-artificial='yes'/>
           <parameter type-id='type-id-128'/>
           <parameter type-id='type-id-76'/>
-          <parameter type-id='type-id-122'/>
+          <parameter type-id='type-id-121'/>
           <parameter type-id='type-id-19'/>
           <return type-id='type-id-19'/>
         </function-decl>
@@ -9131,7 +9131,7 @@
           <parameter type-id='type-id-471' is-artificial='yes'/>
           <parameter type-id='type-id-130'/>
           <parameter type-id='type-id-133'/>
-          <parameter type-id='type-id-122'/>
+          <parameter type-id='type-id-121'/>
           <parameter type-id='type-id-19'/>
           <return type-id='type-id-19'/>
         </function-decl>
@@ -9141,7 +9141,7 @@
           <parameter type-id='type-id-471' is-artificial='yes'/>
           <parameter type-id='type-id-57'/>
           <parameter type-id='type-id-58'/>
-          <parameter type-id='type-id-122'/>
+          <parameter type-id='type-id-121'/>
           <parameter type-id='type-id-19'/>
           <return type-id='type-id-19'/>
         </function-decl>
@@ -9151,7 +9151,7 @@
           <parameter type-id='type-id-471' is-artificial='yes'/>
           <parameter type-id='type-id-98'/>
           <parameter type-id='type-id-33'/>
-          <parameter type-id='type-id-122'/>
+          <parameter type-id='type-id-121'/>
           <parameter type-id='type-id-19'/>
           <return type-id='type-id-19'/>
         </function-decl>
@@ -9161,7 +9161,7 @@
           <parameter type-id='type-id-471' is-artificial='yes'/>
           <parameter type-id='type-id-131'/>
           <parameter type-id='type-id-75'/>
-          <parameter type-id='type-id-122'/>
+          <parameter type-id='type-id-121'/>
           <parameter type-id='type-id-19'/>
           <return type-id='type-id-19'/>
         </function-decl>
@@ -9171,7 +9171,7 @@
           <parameter type-id='type-id-471' is-artificial='yes'/>
           <parameter type-id='type-id-112'/>
           <parameter type-id='type-id-74'/>
-          <parameter type-id='type-id-122'/>
+          <parameter type-id='type-id-121'/>
           <parameter type-id='type-id-19'/>
           <return type-id='type-id-19'/>
         </function-decl>
@@ -9181,7 +9181,7 @@
           <parameter type-id='type-id-471' is-artificial='yes'/>
           <parameter type-id='type-id-132'/>
           <parameter type-id='type-id-134'/>
-          <parameter type-id='type-id-122'/>
+          <parameter type-id='type-id-121'/>
           <parameter type-id='type-id-19'/>
           <return type-id='type-id-19'/>
         </function-decl>
@@ -9200,7 +9200,7 @@
           <parameter type-id='type-id-471' is-artificial='yes'/>
           <parameter type-id='type-id-128'/>
           <parameter type-id='type-id-76'/>
-          <parameter type-id='type-id-122'/>
+          <parameter type-id='type-id-121'/>
           <parameter type-id='type-id-134'/>
           <parameter type-id='type-id-134'/>
           <parameter type-id='type-id-19'/>
@@ -9212,7 +9212,7 @@
           <parameter type-id='type-id-471' is-artificial='yes'/>
           <parameter type-id='type-id-130'/>
           <parameter type-id='type-id-133'/>
-          <parameter type-id='type-id-122'/>
+          <parameter type-id='type-id-121'/>
           <parameter type-id='type-id-134'/>
           <parameter type-id='type-id-134'/>
           <parameter type-id='type-id-19'/>
@@ -9224,7 +9224,7 @@
           <parameter type-id='type-id-471' is-artificial='yes'/>
           <parameter type-id='type-id-57'/>
           <parameter type-id='type-id-58'/>
-          <parameter type-id='type-id-122'/>
+          <parameter type-id='type-id-121'/>
           <parameter type-id='type-id-134'/>
           <parameter type-id='type-id-134'/>
           <parameter type-id='type-id-19'/>
@@ -9236,7 +9236,7 @@
           <parameter type-id='type-id-471' is-artificial='yes'/>
           <parameter type-id='type-id-98'/>
           <parameter type-id='type-id-33'/>
-          <parameter type-id='type-id-122'/>
+          <parameter type-id='type-id-121'/>
           <parameter type-id='type-id-134'/>
           <parameter type-id='type-id-134'/>
           <parameter type-id='type-id-19'/>
@@ -9248,7 +9248,7 @@
           <parameter type-id='type-id-471' is-artificial='yes'/>
           <parameter type-id='type-id-131'/>
           <parameter type-id='type-id-75'/>
-          <parameter type-id='type-id-122'/>
+          <parameter type-id='type-id-121'/>
           <parameter type-id='type-id-134'/>
           <parameter type-id='type-id-134'/>
           <parameter type-id='type-id-19'/>
@@ -9260,7 +9260,7 @@
           <parameter type-id='type-id-471' is-artificial='yes'/>
           <parameter type-id='type-id-112'/>
           <parameter type-id='type-id-74'/>
-          <parameter type-id='type-id-122'/>
+          <parameter type-id='type-id-121'/>
           <parameter type-id='type-id-134'/>
           <parameter type-id='type-id-134'/>
           <parameter type-id='type-id-19'/>
@@ -9272,7 +9272,7 @@
           <parameter type-id='type-id-471' is-artificial='yes'/>
           <parameter type-id='type-id-132'/>
           <parameter type-id='type-id-134'/>
-          <parameter type-id='type-id-122'/>
+          <parameter type-id='type-id-121'/>
           <parameter type-id='type-id-134'/>
           <parameter type-id='type-id-134'/>
           <parameter type-id='type-id-19'/>
@@ -9304,7 +9304,7 @@
           <parameter type-id='type-id-471' is-artificial='yes'/>
           <parameter type-id='type-id-128'/>
           <parameter type-id='type-id-76'/>
-          <parameter type-id='type-id-122'/>
+          <parameter type-id='type-id-121'/>
           <parameter type-id='type-id-19'/>
           <return type-id='type-id-19'/>
         </function-decl>
@@ -9314,7 +9314,7 @@
           <parameter type-id='type-id-471' is-artificial='yes'/>
           <parameter type-id='type-id-130'/>
           <parameter type-id='type-id-133'/>
-          <parameter type-id='type-id-122'/>
+          <parameter type-id='type-id-121'/>
           <parameter type-id='type-id-19'/>
           <return type-id='type-id-19'/>
         </function-decl>
@@ -9324,7 +9324,7 @@
           <parameter type-id='type-id-471' is-artificial='yes'/>
           <parameter type-id='type-id-57'/>
           <parameter type-id='type-id-58'/>
-          <parameter type-id='type-id-122'/>
+          <parameter type-id='type-id-121'/>
           <parameter type-id='type-id-19'/>
           <return type-id='type-id-19'/>
         </function-decl>
@@ -9334,7 +9334,7 @@
           <parameter type-id='type-id-471' is-artificial='yes'/>
           <parameter type-id='type-id-98'/>
           <parameter type-id='type-id-33'/>
-          <parameter type-id='type-id-122'/>
+          <parameter type-id='type-id-121'/>
           <parameter type-id='type-id-19'/>
           <return type-id='type-id-19'/>
         </function-decl>
@@ -9344,7 +9344,7 @@
           <parameter type-id='type-id-471' is-artificial='yes'/>
           <parameter type-id='type-id-131'/>
           <parameter type-id='type-id-75'/>
-          <parameter type-id='type-id-122'/>
+          <parameter type-id='type-id-121'/>
           <parameter type-id='type-id-19'/>
           <return type-id='type-id-19'/>
         </function-decl>
@@ -9354,7 +9354,7 @@
           <parameter type-id='type-id-471' is-artificial='yes'/>
           <parameter type-id='type-id-112'/>
           <parameter type-id='type-id-74'/>
-          <parameter type-id='type-id-122'/>
+          <parameter type-id='type-id-121'/>
           <parameter type-id='type-id-19'/>
           <return type-id='type-id-19'/>
         </function-decl>
@@ -9364,7 +9364,7 @@
           <parameter type-id='type-id-471' is-artificial='yes'/>
           <parameter type-id='type-id-132'/>
           <parameter type-id='type-id-134'/>
-          <parameter type-id='type-id-122'/>
+          <parameter type-id='type-id-121'/>
           <parameter type-id='type-id-19'/>
           <return type-id='type-id-19'/>
         </function-decl>
@@ -9385,7 +9385,7 @@
           <parameter type-id='type-id-76'/>
           <parameter type-id='type-id-134'/>
           <parameter type-id='type-id-134'/>
-          <parameter type-id='type-id-122'/>
+          <parameter type-id='type-id-121'/>
           <parameter type-id='type-id-19'/>
           <return type-id='type-id-19'/>
         </function-decl>
@@ -9397,7 +9397,7 @@
           <parameter type-id='type-id-133'/>
           <parameter type-id='type-id-134'/>
           <parameter type-id='type-id-134'/>
-          <parameter type-id='type-id-122'/>
+          <parameter type-id='type-id-121'/>
           <parameter type-id='type-id-19'/>
           <return type-id='type-id-19'/>
         </function-decl>
@@ -9409,7 +9409,7 @@
           <parameter type-id='type-id-58'/>
           <parameter type-id='type-id-134'/>
           <parameter type-id='type-id-134'/>
-          <parameter type-id='type-id-122'/>
+          <parameter type-id='type-id-121'/>
           <parameter type-id='type-id-19'/>
           <return type-id='type-id-19'/>
         </function-decl>
@@ -9421,7 +9421,7 @@
           <parameter type-id='type-id-33'/>
           <parameter type-id='type-id-134'/>
           <parameter type-id='type-id-134'/>
-          <parameter type-id='type-id-122'/>
+          <parameter type-id='type-id-121'/>
           <parameter type-id='type-id-19'/>
           <return type-id='type-id-19'/>
         </function-decl>
@@ -9433,7 +9433,7 @@
           <parameter type-id='type-id-75'/>
           <parameter type-id='type-id-134'/>
           <parameter type-id='type-id-134'/>
-          <parameter type-id='type-id-122'/>
+          <parameter type-id='type-id-121'/>
           <parameter type-id='type-id-19'/>
           <return type-id='type-id-19'/>
         </function-decl>
@@ -9445,7 +9445,7 @@
           <parameter type-id='type-id-74'/>
           <parameter type-id='type-id-134'/>
           <parameter type-id='type-id-134'/>
-          <parameter type-id='type-id-122'/>
+          <parameter type-id='type-id-121'/>
           <parameter type-id='type-id-19'/>
           <return type-id='type-id-19'/>
         </function-decl>
@@ -9457,7 +9457,7 @@
           <parameter type-id='type-id-134'/>
           <parameter type-id='type-id-134'/>
           <parameter type-id='type-id-134'/>
-          <parameter type-id='type-id-122'/>
+          <parameter type-id='type-id-121'/>
           <parameter type-id='type-id-19'/>
           <return type-id='type-id-19'/>
         </function-decl>
@@ -9467,7 +9467,7 @@
           <parameter type-id='type-id-471' is-artificial='yes'/>
           <parameter type-id='type-id-128'/>
           <parameter type-id='type-id-76'/>
-          <parameter type-id='type-id-122'/>
+          <parameter type-id='type-id-121'/>
           <return type-id='type-id-19'/>
         </function-decl>
       </member-function>
@@ -9476,7 +9476,7 @@
           <parameter type-id='type-id-471' is-artificial='yes'/>
           <parameter type-id='type-id-130'/>
           <parameter type-id='type-id-133'/>
-          <parameter type-id='type-id-122'/>
+          <parameter type-id='type-id-121'/>
           <return type-id='type-id-19'/>
         </function-decl>
       </member-function>
@@ -9485,7 +9485,7 @@
           <parameter type-id='type-id-471' is-artificial='yes'/>
           <parameter type-id='type-id-57'/>
           <parameter type-id='type-id-58'/>
-          <parameter type-id='type-id-122'/>
+          <parameter type-id='type-id-121'/>
           <return type-id='type-id-19'/>
         </function-decl>
       </member-function>
@@ -9494,7 +9494,7 @@
           <parameter type-id='type-id-471' is-artificial='yes'/>
           <parameter type-id='type-id-98'/>
           <parameter type-id='type-id-33'/>
-          <parameter type-id='type-id-122'/>
+          <parameter type-id='type-id-121'/>
           <return type-id='type-id-19'/>
         </function-decl>
       </member-function>
@@ -9503,7 +9503,7 @@
           <parameter type-id='type-id-471' is-artificial='yes'/>
           <parameter type-id='type-id-131'/>
           <parameter type-id='type-id-75'/>
-          <parameter type-id='type-id-122'/>
+          <parameter type-id='type-id-121'/>
           <return type-id='type-id-19'/>
         </function-decl>
       </member-function>
@@ -9512,7 +9512,7 @@
           <parameter type-id='type-id-471' is-artificial='yes'/>
           <parameter type-id='type-id-112'/>
           <parameter type-id='type-id-74'/>
-          <parameter type-id='type-id-122'/>
+          <parameter type-id='type-id-121'/>
           <return type-id='type-id-19'/>
         </function-decl>
       </member-function>
@@ -9521,7 +9521,7 @@
           <parameter type-id='type-id-471' is-artificial='yes'/>
           <parameter type-id='type-id-132'/>
           <parameter type-id='type-id-134'/>
-          <parameter type-id='type-id-122'/>
+          <parameter type-id='type-id-121'/>
           <return type-id='type-id-19'/>
         </function-decl>
       </member-function>
@@ -9538,7 +9538,7 @@
           <parameter type-id='type-id-471' is-artificial='yes'/>
           <parameter type-id='type-id-128'/>
           <parameter type-id='type-id-76'/>
-          <parameter type-id='type-id-122'/>
+          <parameter type-id='type-id-121'/>
           <parameter type-id='type-id-134'/>
           <parameter type-id='type-id-134'/>
           <return type-id='type-id-19'/>
@@ -9549,7 +9549,7 @@
           <parameter type-id='type-id-471' is-artificial='yes'/>
           <parameter type-id='type-id-130'/>
           <parameter type-id='type-id-133'/>
-          <parameter type-id='type-id-122'/>
+          <parameter type-id='type-id-121'/>
           <parameter type-id='type-id-134'/>
           <parameter type-id='type-id-134'/>
           <return type-id='type-id-19'/>
@@ -9560,7 +9560,7 @@
           <parameter type-id='type-id-471' is-artificial='yes'/>
           <parameter type-id='type-id-57'/>
           <parameter type-id='type-id-58'/>
-          <parameter type-id='type-id-122'/>
+          <parameter type-id='type-id-121'/>
           <parameter type-id='type-id-134'/>
           <parameter type-id='type-id-134'/>
           <return type-id='type-id-19'/>
@@ -9571,7 +9571,7 @@
           <parameter type-id='type-id-471' is-artificial='yes'/>
           <parameter type-id='type-id-98'/>
           <parameter type-id='type-id-33'/>
-          <parameter type-id='type-id-122'/>
+          <parameter type-id='type-id-121'/>
           <parameter type-id='type-id-134'/>
           <parameter type-id='type-id-134'/>
           <return type-id='type-id-19'/>
@@ -9582,7 +9582,7 @@
           <parameter type-id='type-id-471' is-artificial='yes'/>
           <parameter type-id='type-id-131'/>
           <parameter type-id='type-id-75'/>
-          <parameter type-id='type-id-122'/>
+          <parameter type-id='type-id-121'/>
           <parameter type-id='type-id-134'/>
           <parameter type-id='type-id-134'/>
           <return type-id='type-id-19'/>
@@ -9593,7 +9593,7 @@
           <parameter type-id='type-id-471' is-artificial='yes'/>
           <parameter type-id='type-id-112'/>
           <parameter type-id='type-id-74'/>
-          <parameter type-id='type-id-122'/>
+          <parameter type-id='type-id-121'/>
           <parameter type-id='type-id-134'/>
           <parameter type-id='type-id-134'/>
           <return type-id='type-id-19'/>
@@ -9604,7 +9604,7 @@
           <parameter type-id='type-id-471' is-artificial='yes'/>
           <parameter type-id='type-id-132'/>
           <parameter type-id='type-id-134'/>
-          <parameter type-id='type-id-122'/>
+          <parameter type-id='type-id-121'/>
           <parameter type-id='type-id-134'/>
           <parameter type-id='type-id-134'/>
           <return type-id='type-id-19'/>
@@ -9633,7 +9633,7 @@
           <parameter type-id='type-id-471' is-artificial='yes'/>
           <parameter type-id='type-id-128'/>
           <parameter type-id='type-id-76'/>
-          <parameter type-id='type-id-122'/>
+          <parameter type-id='type-id-121'/>
           <parameter type-id='type-id-19'/>
           <parameter type-id='type-id-19'/>
           <return type-id='type-id-19'/>
@@ -9644,7 +9644,7 @@
           <parameter type-id='type-id-471' is-artificial='yes'/>
           <parameter type-id='type-id-129'/>
           <parameter type-id='type-id-77'/>
-          <parameter type-id='type-id-122'/>
+          <parameter type-id='type-id-121'/>
           <parameter type-id='type-id-19'/>
           <parameter type-id='type-id-19'/>
           <return type-id='type-id-19'/>
@@ -9655,7 +9655,7 @@
           <parameter type-id='type-id-471' is-artificial='yes'/>
           <parameter type-id='type-id-130'/>
           <parameter type-id='type-id-133'/>
-          <parameter type-id='type-id-122'/>
+          <parameter type-id='type-id-121'/>
           <parameter type-id='type-id-19'/>
           <parameter type-id='type-id-19'/>
           <return type-id='type-id-19'/>
@@ -9666,7 +9666,7 @@
           <parameter type-id='type-id-471' is-artificial='yes'/>
           <parameter type-id='type-id-57'/>
           <parameter type-id='type-id-58'/>
-          <parameter type-id='type-id-122'/>
+          <parameter type-id='type-id-121'/>
           <parameter type-id='type-id-19'/>
           <parameter type-id='type-id-19'/>
           <return type-id='type-id-19'/>
@@ -9677,7 +9677,7 @@
           <parameter type-id='type-id-471' is-artificial='yes'/>
           <parameter type-id='type-id-98'/>
           <parameter type-id='type-id-33'/>
-          <parameter type-id='type-id-122'/>
+          <parameter type-id='type-id-121'/>
           <parameter type-id='type-id-19'/>
           <parameter type-id='type-id-19'/>
           <return type-id='type-id-19'/>
@@ -9688,7 +9688,7 @@
           <parameter type-id='type-id-471' is-artificial='yes'/>
           <parameter type-id='type-id-131'/>
           <parameter type-id='type-id-75'/>
-          <parameter type-id='type-id-122'/>
+          <parameter type-id='type-id-121'/>
           <parameter type-id='type-id-19'/>
           <parameter type-id='type-id-19'/>
           <return type-id='type-id-19'/>
@@ -9699,7 +9699,7 @@
           <parameter type-id='type-id-471' is-artificial='yes'/>
           <parameter type-id='type-id-112'/>
           <parameter type-id='type-id-74'/>
-          <parameter type-id='type-id-122'/>
+          <parameter type-id='type-id-121'/>
           <parameter type-id='type-id-19'/>
           <parameter type-id='type-id-19'/>
           <return type-id='type-id-19'/>
@@ -9710,7 +9710,7 @@
           <parameter type-id='type-id-471' is-artificial='yes'/>
           <parameter type-id='type-id-132'/>
           <parameter type-id='type-id-134'/>
-          <parameter type-id='type-id-122'/>
+          <parameter type-id='type-id-121'/>
           <parameter type-id='type-id-19'/>
           <parameter type-id='type-id-19'/>
           <return type-id='type-id-19'/>
@@ -9731,8 +9731,8 @@
           <parameter type-id='type-id-471' is-artificial='yes'/>
           <parameter type-id='type-id-128'/>
           <parameter type-id='type-id-76'/>
-          <parameter type-id='type-id-122'/>
           <parameter type-id='type-id-121'/>
+          <parameter type-id='type-id-120'/>
           <parameter type-id='type-id-19'/>
           <return type-id='type-id-19'/>
         </function-decl>
@@ -9742,8 +9742,8 @@
           <parameter type-id='type-id-471' is-artificial='yes'/>
           <parameter type-id='type-id-130'/>
           <parameter type-id='type-id-133'/>
-          <parameter type-id='type-id-122'/>
           <parameter type-id='type-id-121'/>
+          <parameter type-id='type-id-120'/>
           <parameter type-id='type-id-19'/>
           <return type-id='type-id-19'/>
         </function-decl>
@@ -9753,8 +9753,8 @@
           <parameter type-id='type-id-471' is-artificial='yes'/>
           <parameter type-id='type-id-57'/>
           <parameter type-id='type-id-58'/>
-          <parameter type-id='type-id-122'/>
           <parameter type-id='type-id-121'/>
+          <parameter type-id='type-id-120'/>
           <parameter type-id='type-id-19'/>
           <return type-id='type-id-19'/>
         </function-decl>
@@ -9764,8 +9764,8 @@
           <parameter type-id='type-id-471' is-artificial='yes'/>
           <parameter type-id='type-id-98'/>
           <parameter type-id='type-id-33'/>
-          <parameter type-id='type-id-122'/>
           <parameter type-id='type-id-121'/>
+          <parameter type-id='type-id-120'/>
           <parameter type-id='type-id-19'/>
           <return type-id='type-id-19'/>
         </function-decl>
@@ -9775,8 +9775,8 @@
           <parameter type-id='type-id-471' is-artificial='yes'/>
           <parameter type-id='type-id-131'/>
           <parameter type-id='type-id-75'/>
-          <parameter type-id='type-id-122'/>
           <parameter type-id='type-id-121'/>
+          <parameter type-id='type-id-120'/>
           <parameter type-id='type-id-19'/>
           <return type-id='type-id-19'/>
         </function-decl>
@@ -9786,8 +9786,8 @@
           <parameter type-id='type-id-471' is-artificial='yes'/>
           <parameter type-id='type-id-112'/>
           <parameter type-id='type-id-74'/>
-          <parameter type-id='type-id-122'/>
           <parameter type-id='type-id-121'/>
+          <parameter type-id='type-id-120'/>
           <parameter type-id='type-id-19'/>
           <return type-id='type-id-19'/>
         </function-decl>
@@ -9797,8 +9797,8 @@
           <parameter type-id='type-id-471' is-artificial='yes'/>
           <parameter type-id='type-id-132'/>
           <parameter type-id='type-id-134'/>
-          <parameter type-id='type-id-122'/>
           <parameter type-id='type-id-121'/>
+          <parameter type-id='type-id-120'/>
           <parameter type-id='type-id-19'/>
           <return type-id='type-id-19'/>
         </function-decl>
@@ -9808,7 +9808,7 @@
           <parameter type-id='type-id-471' is-artificial='yes'/>
           <parameter type-id='type-id-127'/>
           <parameter type-id='type-id-127'/>
-          <parameter type-id='type-id-121'/>
+          <parameter type-id='type-id-120'/>
           <parameter type-id='type-id-19'/>
           <return type-id='type-id-19'/>
         </function-decl>
@@ -9818,7 +9818,7 @@
           <parameter type-id='type-id-471' is-artificial='yes'/>
           <parameter type-id='type-id-128'/>
           <parameter type-id='type-id-76'/>
-          <parameter type-id='type-id-122'/>
+          <parameter type-id='type-id-121'/>
           <parameter type-id='type-id-19'/>
           <return type-id='type-id-19'/>
         </function-decl>
@@ -9828,7 +9828,7 @@
           <parameter type-id='type-id-471' is-artificial='yes'/>
           <parameter type-id='type-id-130'/>
           <parameter type-id='type-id-133'/>
-          <parameter type-id='type-id-122'/>
+          <parameter type-id='type-id-121'/>
           <parameter type-id='type-id-19'/>
           <return type-id='type-id-19'/>
         </function-decl>
@@ -9838,7 +9838,7 @@
           <parameter type-id='type-id-471' is-artificial='yes'/>
           <parameter type-id='type-id-57'/>
           <parameter type-id='type-id-58'/>
-          <parameter type-id='type-id-122'/>
+          <parameter type-id='type-id-121'/>
           <parameter type-id='type-id-19'/>
           <return type-id='type-id-19'/>
         </function-decl>
@@ -9848,7 +9848,7 @@
           <parameter type-id='type-id-471' is-artificial='yes'/>
           <parameter type-id='type-id-98'/>
           <parameter type-id='type-id-33'/>
-          <parameter type-id='type-id-122'/>
+          <parameter type-id='type-id-121'/>
           <parameter type-id='type-id-19'/>
           <return type-id='type-id-19'/>
         </function-decl>
@@ -9858,7 +9858,7 @@
           <parameter type-id='type-id-471' is-artificial='yes'/>
           <parameter type-id='type-id-131'/>
           <parameter type-id='type-id-75'/>
-          <parameter type-id='type-id-122'/>
+          <parameter type-id='type-id-121'/>
           <parameter type-id='type-id-19'/>
           <return type-id='type-id-19'/>
         </function-decl>
@@ -9868,7 +9868,7 @@
           <parameter type-id='type-id-471' is-artificial='yes'/>
           <parameter type-id='type-id-112'/>
           <parameter type-id='type-id-74'/>
-          <parameter type-id='type-id-122'/>
+          <parameter type-id='type-id-121'/>
           <parameter type-id='type-id-19'/>
           <return type-id='type-id-19'/>
         </function-decl>
@@ -9878,7 +9878,7 @@
           <parameter type-id='type-id-471' is-artificial='yes'/>
           <parameter type-id='type-id-132'/>
           <parameter type-id='type-id-134'/>
-          <parameter type-id='type-id-122'/>
+          <parameter type-id='type-id-121'/>
           <parameter type-id='type-id-19'/>
           <return type-id='type-id-19'/>
         </function-decl>
@@ -9897,8 +9897,8 @@
           <parameter type-id='type-id-471' is-artificial='yes'/>
           <parameter type-id='type-id-128'/>
           <parameter type-id='type-id-76'/>
-          <parameter type-id='type-id-122'/>
           <parameter type-id='type-id-121'/>
+          <parameter type-id='type-id-120'/>
           <return type-id='type-id-19'/>
         </function-decl>
       </member-function>
@@ -9907,8 +9907,8 @@
           <parameter type-id='type-id-471' is-artificial='yes'/>
           <parameter type-id='type-id-130'/>
           <parameter type-id='type-id-133'/>
-          <parameter type-id='type-id-122'/>
           <parameter type-id='type-id-121'/>
+          <parameter type-id='type-id-120'/>
           <return type-id='type-id-19'/>
         </function-decl>
       </member-function>
@@ -9917,8 +9917,8 @@
           <parameter type-id='type-id-471' is-artificial='yes'/>
           <parameter type-id='type-id-57'/>
           <parameter type-id='type-id-58'/>
-          <parameter type-id='type-id-122'/>
           <parameter type-id='type-id-121'/>
+          <parameter type-id='type-id-120'/>
           <return type-id='type-id-19'/>
         </function-decl>
       </member-function>
@@ -9927,8 +9927,8 @@
           <parameter type-id='type-id-471' is-artificial='yes'/>
           <parameter type-id='type-id-98'/>
           <parameter type-id='type-id-33'/>
-          <parameter type-id='type-id-122'/>
           <parameter type-id='type-id-121'/>
+          <parameter type-id='type-id-120'/>
           <return type-id='type-id-19'/>
         </function-decl>
       </member-function>
@@ -9937,8 +9937,8 @@
           <parameter type-id='type-id-471' is-artificial='yes'/>
           <parameter type-id='type-id-131'/>
           <parameter type-id='type-id-75'/>
-          <parameter type-id='type-id-122'/>
           <parameter type-id='type-id-121'/>
+          <parameter type-id='type-id-120'/>
           <return type-id='type-id-19'/>
         </function-decl>
       </member-function>
@@ -9947,8 +9947,8 @@
           <parameter type-id='type-id-471' is-artificial='yes'/>
           <parameter type-id='type-id-112'/>
           <parameter type-id='type-id-74'/>
-          <parameter type-id='type-id-122'/>
           <parameter type-id='type-id-121'/>
+          <parameter type-id='type-id-120'/>
           <return type-id='type-id-19'/>
         </function-decl>
       </member-function>
@@ -9957,8 +9957,8 @@
           <parameter type-id='type-id-471' is-artificial='yes'/>
           <parameter type-id='type-id-132'/>
           <parameter type-id='type-id-134'/>
-          <parameter type-id='type-id-122'/>
           <parameter type-id='type-id-121'/>
+          <parameter type-id='type-id-120'/>
           <return type-id='type-id-19'/>
         </function-decl>
       </member-function>
@@ -9967,7 +9967,7 @@
           <parameter type-id='type-id-471' is-artificial='yes'/>
           <parameter type-id='type-id-127'/>
           <parameter type-id='type-id-127'/>
-          <parameter type-id='type-id-121'/>
+          <parameter type-id='type-id-120'/>
           <return type-id='type-id-19'/>
         </function-decl>
       </member-function>
@@ -10599,14 +10599,14 @@
       <member-function access='private'>
         <function-decl name='GetNumberOfIds' mangled-name='_ZN9vtkIdList14GetNumberOfIdsEv' filepath='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Common/Core/vtkIdList.h' line='45' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-492' is-artificial='yes'/>
-          <return type-id='type-id-122'/>
+          <return type-id='type-id-121'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
         <function-decl name='GetId' mangled-name='_ZN9vtkIdList5GetIdEx' filepath='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Common/Core/vtkIdList.h' line='49' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-492' is-artificial='yes'/>
-          <parameter type-id='type-id-122'/>
-          <return type-id='type-id-122'/>
+          <parameter type-id='type-id-121'/>
+          <return type-id='type-id-121'/>
         </function-decl>
       </member-function>
     </class-decl>
@@ -21826,7 +21826,7 @@
         <function-decl name='SendVoidArray' mangled-name='_ZN21vtkSocketCommunicator13SendVoidArrayEPKvxiii' filepath='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Parallel/Core/vtkSocketCommunicator.cxx' line='244' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN21vtkSocketCommunicator13SendVoidArrayEPKvxiii'>
           <parameter type-id='type-id-1106' is-artificial='yes'/>
           <parameter type-id='type-id-14'/>
-          <parameter type-id='type-id-122'/>
+          <parameter type-id='type-id-121'/>
           <parameter type-id='type-id-19'/>
           <parameter type-id='type-id-19'/>
           <parameter type-id='type-id-19'/>
@@ -21837,7 +21837,7 @@
         <function-decl name='ReceiveVoidArray' mangled-name='_ZN21vtkSocketCommunicator16ReceiveVoidArrayEPvxiii' filepath='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Parallel/Core/vtkSocketCommunicator.cxx' line='318' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN21vtkSocketCommunicator16ReceiveVoidArrayEPvxiii'>
           <parameter type-id='type-id-1106' is-artificial='yes'/>
           <parameter type-id='type-id-14'/>
-          <parameter type-id='type-id-122'/>
+          <parameter type-id='type-id-121'/>
           <parameter type-id='type-id-19'/>
           <parameter type-id='type-id-19'/>
           <parameter type-id='type-id-19'/>
@@ -21854,7 +21854,7 @@
         <function-decl name='BroadcastVoidArray' mangled-name='_ZN21vtkSocketCommunicator18BroadcastVoidArrayEPvxii' filepath='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Parallel/Core/vtkSocketCommunicator.cxx' line='1114' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN21vtkSocketCommunicator18BroadcastVoidArrayEPvxii'>
           <parameter type-id='type-id-1106' is-artificial='yes'/>
           <parameter type-id='type-id-14'/>
-          <parameter type-id='type-id-122'/>
+          <parameter type-id='type-id-121'/>
           <parameter type-id='type-id-19'/>
           <parameter type-id='type-id-19'/>
           <return type-id='type-id-19'/>
@@ -21865,7 +21865,7 @@
           <parameter type-id='type-id-1106' is-artificial='yes'/>
           <parameter type-id='type-id-14'/>
           <parameter type-id='type-id-14'/>
-          <parameter type-id='type-id-122'/>
+          <parameter type-id='type-id-121'/>
           <parameter type-id='type-id-19'/>
           <parameter type-id='type-id-19'/>
           <return type-id='type-id-19'/>
@@ -21876,7 +21876,7 @@
           <parameter type-id='type-id-1106' is-artificial='yes'/>
           <parameter type-id='type-id-14'/>
           <parameter type-id='type-id-14'/>
-          <parameter type-id='type-id-122'/>
+          <parameter type-id='type-id-121'/>
           <parameter type-id='type-id-134'/>
           <parameter type-id='type-id-134'/>
           <parameter type-id='type-id-19'/>
@@ -21889,7 +21889,7 @@
           <parameter type-id='type-id-1106' is-artificial='yes'/>
           <parameter type-id='type-id-14'/>
           <parameter type-id='type-id-14'/>
-          <parameter type-id='type-id-122'/>
+          <parameter type-id='type-id-121'/>
           <parameter type-id='type-id-19'/>
           <parameter type-id='type-id-19'/>
           <return type-id='type-id-19'/>
@@ -21902,7 +21902,7 @@
           <parameter type-id='type-id-14'/>
           <parameter type-id='type-id-134'/>
           <parameter type-id='type-id-134'/>
-          <parameter type-id='type-id-122'/>
+          <parameter type-id='type-id-121'/>
           <parameter type-id='type-id-19'/>
           <parameter type-id='type-id-19'/>
           <return type-id='type-id-19'/>
@@ -21913,7 +21913,7 @@
           <parameter type-id='type-id-1106' is-artificial='yes'/>
           <parameter type-id='type-id-14'/>
           <parameter type-id='type-id-14'/>
-          <parameter type-id='type-id-122'/>
+          <parameter type-id='type-id-121'/>
           <parameter type-id='type-id-19'/>
           <return type-id='type-id-19'/>
         </function-decl>
@@ -21923,7 +21923,7 @@
           <parameter type-id='type-id-1106' is-artificial='yes'/>
           <parameter type-id='type-id-14'/>
           <parameter type-id='type-id-14'/>
-          <parameter type-id='type-id-122'/>
+          <parameter type-id='type-id-121'/>
           <parameter type-id='type-id-134'/>
           <parameter type-id='type-id-134'/>
           <parameter type-id='type-id-19'/>
@@ -21935,7 +21935,7 @@
           <parameter type-id='type-id-1106' is-artificial='yes'/>
           <parameter type-id='type-id-14'/>
           <parameter type-id='type-id-14'/>
-          <parameter type-id='type-id-122'/>
+          <parameter type-id='type-id-121'/>
           <parameter type-id='type-id-19'/>
           <parameter type-id='type-id-19'/>
           <parameter type-id='type-id-19'/>
@@ -21947,10 +21947,10 @@
           <parameter type-id='type-id-1106' is-artificial='yes'/>
           <parameter type-id='type-id-14'/>
           <parameter type-id='type-id-14'/>
-          <parameter type-id='type-id-122'/>
-          <parameter type-id='type-id-19'/>
           <parameter type-id='type-id-121'/>
           <parameter type-id='type-id-19'/>
+          <parameter type-id='type-id-120'/>
+          <parameter type-id='type-id-19'/>
           <return type-id='type-id-19'/>
         </function-decl>
       </member-function>
@@ -21959,7 +21959,7 @@
           <parameter type-id='type-id-1106' is-artificial='yes'/>
           <parameter type-id='type-id-14'/>
           <parameter type-id='type-id-14'/>
-          <parameter type-id='type-id-122'/>
+          <parameter type-id='type-id-121'/>
           <parameter type-id='type-id-19'/>
           <parameter type-id='type-id-19'/>
           <return type-id='type-id-19'/>
@@ -21970,9 +21970,9 @@
           <parameter type-id='type-id-1106' is-artificial='yes'/>
           <parameter type-id='type-id-14'/>
           <parameter type-id='type-id-14'/>
-          <parameter type-id='type-id-122'/>
-          <parameter type-id='type-id-19'/>
           <parameter type-id='type-id-121'/>
+          <parameter type-id='type-id-19'/>
+          <parameter type-id='type-id-120'/>
           <return type-id='type-id-19'/>
         </function-decl>
       </member-function>
@@ -25765,7 +25765,7 @@
         <function-decl name='SendVoidArray' mangled-name='_ZN18vtkSubCommunicator13SendVoidArrayEPKvxiii' filepath='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Parallel/Core/vtkSubCommunicator.cxx' line='49' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN18vtkSubCommunicator13SendVoidArrayEPKvxiii'>
           <parameter type-id='type-id-1319' is-artificial='yes'/>
           <parameter type-id='type-id-14'/>
-          <parameter type-id='type-id-122'/>
+          <parameter type-id='type-id-121'/>
           <parameter type-id='type-id-19'/>
           <parameter type-id='type-id-19'/>
           <parameter type-id='type-id-19'/>
@@ -25776,7 +25776,7 @@
         <function-decl name='ReceiveVoidArray' mangled-name='_ZN18vtkSubCommunicator16ReceiveVoidArrayEPvxiii' filepath='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Parallel/Core/vtkSubCommunicator.cxx' line='58' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN18vtkSubCommunicator16ReceiveVoidArrayEPvxiii'>
           <parameter type-id='type-id-1319' is-artificial='yes'/>
           <parameter type-id='type-id-14'/>
-          <parameter type-id='type-id-122'/>
+          <parameter type-id='type-id-121'/>
           <parameter type-id='type-id-19'/>
           <parameter type-id='type-id-19'/>
           <parameter type-id='type-id-19'/>
diff --git a/tests/data/test-read-dwarf/test22-pr19097-libstdc++.so.6.0.17.so.abi b/tests/data/test-read-dwarf/test22-pr19097-libstdc++.so.6.0.17.so.abi
index b6faf148..5a80c804 100644
--- a/tests/data/test-read-dwarf/test22-pr19097-libstdc++.so.6.0.17.so.abi
+++ b/tests/data/test-read-dwarf/test22-pr19097-libstdc++.so.6.0.17.so.abi
@@ -3750,81 +3750,44 @@
         </member-function>
       </class-decl>
     </namespace-decl>
-    <namespace-decl name='std'>
-      <class-decl name='exception' size-in-bits='64' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/libstdc++-v3/libsupc++/exception' line='62' column='1' is-declaration-only='yes' id='type-id-11'>
-        <member-function access='private' constructor='yes'>
-          <function-decl name='exception' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/libstdc++-v3/libsupc++/exception' line='65' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-12' is-artificial='yes'/>
-            <return type-id='type-id-5'/>
-          </function-decl>
-        </member-function>
-        <member-function access='private' destructor='yes' vtable-offset='-1'>
-          <function-decl name='~exception' filepath='../../.././libstdc++-v3/libsupc++/eh_exception.cc' line='31' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-12' is-artificial='yes'/>
-            <parameter type-id='type-id-6' is-artificial='yes'/>
-            <return type-id='type-id-5'/>
-          </function-decl>
-        </member-function>
-        <member-function access='private' destructor='yes' vtable-offset='-1'>
-          <function-decl name='~exception' mangled-name='_ZNSt9exceptionD0Ev' filepath='../../.././libstdc++-v3/libsupc++/eh_exception.cc' line='31' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt9exceptionD0Ev@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-12' is-artificial='yes'/>
-            <parameter type-id='type-id-6' is-artificial='yes'/>
-            <return type-id='type-id-5'/>
-          </function-decl>
-        </member-function>
-        <member-function access='private' destructor='yes' vtable-offset='-1'>
-          <function-decl name='~exception' mangled-name='_ZNSt9exceptionD2Ev' filepath='../../.././libstdc++-v3/libsupc++/eh_exception.cc' line='31' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt9exceptionD1Ev@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-12' is-artificial='yes'/>
-            <parameter type-id='type-id-6' is-artificial='yes'/>
-            <return type-id='type-id-5'/>
-          </function-decl>
-        </member-function>
-        <member-function access='private' const='yes' vtable-offset='2'>
-          <function-decl name='what' mangled-name='_ZNKSt9exception4whatEv' filepath='../../.././libstdc++-v3/libsupc++/eh_exception.cc' line='40' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSt9exception4whatEv@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-13' is-artificial='yes'/>
-            <return type-id='type-id-4'/>
-          </function-decl>
-        </member-function>
-      </class-decl>
-    </namespace-decl>
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='../../.././libstdc++-v3/libsupc++/bad_cast.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/libsupc++' language='LANG_C_plus_plus'>
-    <qualified-type-def type-id='type-id-14' const='yes' id='type-id-15'/>
-    <pointer-type-def type-id='type-id-15' size-in-bits='64' id='type-id-16'/>
-    <pointer-type-def type-id='type-id-14' size-in-bits='64' id='type-id-17'/>
+    <qualified-type-def type-id='type-id-12' const='yes' id='type-id-13'/>
+    <pointer-type-def type-id='type-id-13' size-in-bits='64' id='type-id-14'/>
+    <pointer-type-def type-id='type-id-12' size-in-bits='64' id='type-id-15'/>
     <namespace-decl name='std'>
-      <class-decl name='bad_cast' size-in-bits='64' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/libstdc++-v3/libsupc++/typeinfo' line='189' column='1' id='type-id-14'>
+      <class-decl name='bad_cast' size-in-bits='64' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/libstdc++-v3/libsupc++/typeinfo' line='189' column='1' id='type-id-12'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-11'/>
         <member-function access='private' constructor='yes'>
           <function-decl name='bad_cast' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/libstdc++-v3/libsupc++/typeinfo' line='192' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-17' is-artificial='yes'/>
+            <parameter type-id='type-id-15' is-artificial='yes'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='private' destructor='yes' vtable-offset='-1'>
           <function-decl name='~bad_cast' filepath='../../.././libstdc++-v3/libsupc++/bad_cast.cc' line='29' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-17' is-artificial='yes'/>
+            <parameter type-id='type-id-15' is-artificial='yes'/>
             <parameter type-id='type-id-6' is-artificial='yes'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='private' destructor='yes' vtable-offset='-1'>
           <function-decl name='~bad_cast' mangled-name='_ZNSt8bad_castD0Ev' filepath='../../.././libstdc++-v3/libsupc++/bad_cast.cc' line='29' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt8bad_castD0Ev@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-17' is-artificial='yes'/>
+            <parameter type-id='type-id-15' is-artificial='yes'/>
             <parameter type-id='type-id-6' is-artificial='yes'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='private' destructor='yes' vtable-offset='-1'>
           <function-decl name='~bad_cast' mangled-name='_ZNSt8bad_castD2Ev' filepath='../../.././libstdc++-v3/libsupc++/bad_cast.cc' line='29' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt8bad_castD2Ev@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-17' is-artificial='yes'/>
+            <parameter type-id='type-id-15' is-artificial='yes'/>
             <parameter type-id='type-id-6' is-artificial='yes'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='private' const='yes' vtable-offset='2'>
           <function-decl name='what' mangled-name='_ZNKSt8bad_cast4whatEv' filepath='../../.././libstdc++-v3/libsupc++/bad_cast.cc' line='32' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSt8bad_cast4whatEv@@GLIBCXX_3.4.9'>
-            <parameter type-id='type-id-16' is-artificial='yes'/>
+            <parameter type-id='type-id-14' is-artificial='yes'/>
             <return type-id='type-id-4'/>
           </function-decl>
         </member-function>
@@ -3832,42 +3795,42 @@
     </namespace-decl>
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='../../.././libstdc++-v3/libsupc++/bad_typeid.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/libsupc++' language='LANG_C_plus_plus'>
-    <qualified-type-def type-id='type-id-18' const='yes' id='type-id-19'/>
-    <pointer-type-def type-id='type-id-19' size-in-bits='64' id='type-id-20'/>
-    <pointer-type-def type-id='type-id-18' size-in-bits='64' id='type-id-21'/>
+    <qualified-type-def type-id='type-id-16' const='yes' id='type-id-17'/>
+    <pointer-type-def type-id='type-id-17' size-in-bits='64' id='type-id-18'/>
+    <pointer-type-def type-id='type-id-16' size-in-bits='64' id='type-id-19'/>
     <namespace-decl name='std'>
-      <class-decl name='bad_typeid' size-in-bits='64' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/libstdc++-v3/libsupc++/typeinfo' line='206' column='1' id='type-id-18'>
+      <class-decl name='bad_typeid' size-in-bits='64' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/libstdc++-v3/libsupc++/typeinfo' line='206' column='1' id='type-id-16'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-11'/>
         <member-function access='private' constructor='yes'>
           <function-decl name='bad_typeid' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/libstdc++-v3/libsupc++/typeinfo' line='209' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-21' is-artificial='yes'/>
+            <parameter type-id='type-id-19' is-artificial='yes'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='private' destructor='yes' vtable-offset='-1'>
           <function-decl name='~bad_typeid' filepath='../../.././libstdc++-v3/libsupc++/bad_typeid.cc' line='29' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-21' is-artificial='yes'/>
+            <parameter type-id='type-id-19' is-artificial='yes'/>
             <parameter type-id='type-id-6' is-artificial='yes'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='private' destructor='yes' vtable-offset='-1'>
           <function-decl name='~bad_typeid' mangled-name='_ZNSt10bad_typeidD0Ev' filepath='../../.././libstdc++-v3/libsupc++/bad_typeid.cc' line='29' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt10bad_typeidD0Ev@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-21' is-artificial='yes'/>
+            <parameter type-id='type-id-19' is-artificial='yes'/>
             <parameter type-id='type-id-6' is-artificial='yes'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='private' destructor='yes' vtable-offset='-1'>
           <function-decl name='~bad_typeid' mangled-name='_ZNSt10bad_typeidD2Ev' filepath='../../.././libstdc++-v3/libsupc++/bad_typeid.cc' line='29' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt10bad_typeidD2Ev@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-21' is-artificial='yes'/>
+            <parameter type-id='type-id-19' is-artificial='yes'/>
             <parameter type-id='type-id-6' is-artificial='yes'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='private' const='yes' vtable-offset='2'>
           <function-decl name='what' mangled-name='_ZNKSt10bad_typeid4whatEv' filepath='../../.././libstdc++-v3/libsupc++/bad_typeid.cc' line='32' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSt10bad_typeid4whatEv@@GLIBCXX_3.4.9'>
-            <parameter type-id='type-id-20' is-artificial='yes'/>
+            <parameter type-id='type-id-18' is-artificial='yes'/>
             <return type-id='type-id-4'/>
           </function-decl>
         </member-function>
@@ -3875,23 +3838,23 @@
     </namespace-decl>
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='../../.././libstdc++-v3/libsupc++/class_type_info.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/libsupc++' language='LANG_C_plus_plus'>
-    <typedef-decl name='ptrdiff_t' type-id='type-id-22' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/host-x86_64-unknown-linux-gnu/gcc/include/stddef.h' line='150' column='1' id='type-id-23'/>
-    <pointer-type-def type-id='type-id-24' size-in-bits='64' id='type-id-25'/>
-    <reference-type-def kind='lvalue' type-id='type-id-26' size-in-bits='64' id='type-id-27'/>
-    <pointer-type-def type-id='type-id-26' size-in-bits='64' id='type-id-28'/>
-    <reference-type-def kind='lvalue' type-id='type-id-29' size-in-bits='64' id='type-id-30'/>
-    <pointer-type-def type-id='type-id-29' size-in-bits='64' id='type-id-31'/>
+    <typedef-decl name='ptrdiff_t' type-id='type-id-20' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/host-x86_64-unknown-linux-gnu/gcc/include/stddef.h' line='150' column='1' id='type-id-21'/>
+    <pointer-type-def type-id='type-id-22' size-in-bits='64' id='type-id-23'/>
+    <reference-type-def kind='lvalue' type-id='type-id-24' size-in-bits='64' id='type-id-25'/>
+    <pointer-type-def type-id='type-id-24' size-in-bits='64' id='type-id-26'/>
+    <reference-type-def kind='lvalue' type-id='type-id-27' size-in-bits='64' id='type-id-28'/>
+    <pointer-type-def type-id='type-id-27' size-in-bits='64' id='type-id-29'/>
+    <qualified-type-def type-id='type-id-22' const='yes' id='type-id-30'/>
+    <pointer-type-def type-id='type-id-30' size-in-bits='64' id='type-id-31'/>
     <qualified-type-def type-id='type-id-24' const='yes' id='type-id-32'/>
-    <pointer-type-def type-id='type-id-32' size-in-bits='64' id='type-id-33'/>
-    <qualified-type-def type-id='type-id-26' const='yes' id='type-id-34'/>
-    <reference-type-def kind='lvalue' type-id='type-id-34' size-in-bits='64' id='type-id-35'/>
-    <pointer-type-def type-id='type-id-36' size-in-bits='64' id='type-id-37'/>
+    <reference-type-def kind='lvalue' type-id='type-id-32' size-in-bits='64' id='type-id-33'/>
+    <pointer-type-def type-id='type-id-34' size-in-bits='64' id='type-id-35'/>
     <namespace-decl name='__cxxabiv1'>
-      <class-decl name='__class_type_info' size-in-bits='128' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/libstdc++-v3/libsupc++/cxxabi.h' line='385' column='1' id='type-id-24'>
+      <class-decl name='__class_type_info' size-in-bits='128' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/libstdc++-v3/libsupc++/cxxabi.h' line='385' column='1' id='type-id-22'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-3'/>
         <member-type access='private'>
-          <enum-decl name='__sub_kind' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/libstdc++-v3/libsupc++/cxxabi.h' line='399' column='1' id='type-id-38'>
-            <underlying-type type-id='type-id-39'/>
+          <enum-decl name='__sub_kind' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/libstdc++-v3/libsupc++/cxxabi.h' line='399' column='1' id='type-id-36'>
+            <underlying-type type-id='type-id-37'/>
             <enumerator name='__unknown' value='0'/>
             <enumerator name='__not_contained' value='1'/>
             <enumerator name='__contained_ambig' value='2'/>
@@ -3903,62 +3866,62 @@
           </enum-decl>
         </member-type>
         <member-type access='private'>
-          <class-decl name='__dyncast_result' size-in-bits='192' is-struct='yes' visibility='default' filepath='../../.././libstdc++-v3/libsupc++/tinfo.h' line='148' column='1' id='type-id-26'>
+          <class-decl name='__dyncast_result' size-in-bits='192' is-struct='yes' visibility='default' filepath='../../.././libstdc++-v3/libsupc++/tinfo.h' line='148' column='1' id='type-id-24'>
             <data-member access='public' layout-offset-in-bits='0'>
-              <var-decl name='dst_ptr' type-id='type-id-36' visibility='default' filepath='../../.././libstdc++-v3/libsupc++/tinfo.h' line='150' column='1'/>
+              <var-decl name='dst_ptr' type-id='type-id-34' visibility='default' filepath='../../.././libstdc++-v3/libsupc++/tinfo.h' line='150' column='1'/>
             </data-member>
             <data-member access='public' layout-offset-in-bits='64'>
-              <var-decl name='whole2dst' type-id='type-id-38' visibility='default' filepath='../../.././libstdc++-v3/libsupc++/tinfo.h' line='151' column='1'/>
+              <var-decl name='whole2dst' type-id='type-id-36' visibility='default' filepath='../../.././libstdc++-v3/libsupc++/tinfo.h' line='151' column='1'/>
             </data-member>
             <data-member access='public' layout-offset-in-bits='96'>
-              <var-decl name='whole2src' type-id='type-id-38' visibility='default' filepath='../../.././libstdc++-v3/libsupc++/tinfo.h' line='152' column='1'/>
+              <var-decl name='whole2src' type-id='type-id-36' visibility='default' filepath='../../.././libstdc++-v3/libsupc++/tinfo.h' line='152' column='1'/>
             </data-member>
             <data-member access='public' layout-offset-in-bits='128'>
-              <var-decl name='dst2src' type-id='type-id-38' visibility='default' filepath='../../.././libstdc++-v3/libsupc++/tinfo.h' line='153' column='1'/>
+              <var-decl name='dst2src' type-id='type-id-36' visibility='default' filepath='../../.././libstdc++-v3/libsupc++/tinfo.h' line='153' column='1'/>
             </data-member>
             <data-member access='public' layout-offset-in-bits='160'>
               <var-decl name='whole_details' type-id='type-id-6' visibility='default' filepath='../../.././libstdc++-v3/libsupc++/tinfo.h' line='154' column='1'/>
             </data-member>
             <member-function access='public' constructor='yes'>
               <function-decl name='__dyncast_result' filepath='../../.././libstdc++-v3/libsupc++/tinfo.h' line='156' column='1' visibility='default' binding='global' size-in-bits='64'>
-                <parameter type-id='type-id-28' is-artificial='yes'/>
+                <parameter type-id='type-id-26' is-artificial='yes'/>
                 <parameter type-id='type-id-6'/>
                 <return type-id='type-id-5'/>
               </function-decl>
             </member-function>
             <member-function access='protected' constructor='yes'>
               <function-decl name='__dyncast_result' filepath='../../.././libstdc++-v3/libsupc++/tinfo.h' line='163' column='1' visibility='default' binding='global' size-in-bits='64'>
-                <parameter type-id='type-id-28' is-artificial='yes'/>
-                <parameter type-id='type-id-35'/>
+                <parameter type-id='type-id-26' is-artificial='yes'/>
+                <parameter type-id='type-id-33'/>
                 <return type-id='type-id-5'/>
               </function-decl>
             </member-function>
             <member-function access='protected'>
               <function-decl name='operator=' mangled-name='_ZN10__cxxabiv117__class_type_info16__dyncast_resultaSERKS1_' filepath='../../.././libstdc++-v3/libsupc++/tinfo.h' line='166' column='1' visibility='default' binding='global' size-in-bits='64'>
-                <parameter type-id='type-id-28' is-artificial='yes'/>
-                <parameter type-id='type-id-35'/>
-                <return type-id='type-id-27'/>
+                <parameter type-id='type-id-26' is-artificial='yes'/>
+                <parameter type-id='type-id-33'/>
+                <return type-id='type-id-25'/>
               </function-decl>
             </member-function>
           </class-decl>
         </member-type>
         <member-type access='private'>
-          <class-decl name='__upcast_result' size-in-bits='192' is-struct='yes' visibility='default' filepath='../../.././libstdc++-v3/libsupc++/tinfo.h' line='132' column='1' id='type-id-29'>
+          <class-decl name='__upcast_result' size-in-bits='192' is-struct='yes' visibility='default' filepath='../../.././libstdc++-v3/libsupc++/tinfo.h' line='132' column='1' id='type-id-27'>
             <data-member access='public' layout-offset-in-bits='0'>
-              <var-decl name='dst_ptr' type-id='type-id-36' visibility='default' filepath='../../.././libstdc++-v3/libsupc++/tinfo.h' line='134' column='1'/>
+              <var-decl name='dst_ptr' type-id='type-id-34' visibility='default' filepath='../../.././libstdc++-v3/libsupc++/tinfo.h' line='134' column='1'/>
             </data-member>
             <data-member access='public' layout-offset-in-bits='64'>
-              <var-decl name='part2dst' type-id='type-id-38' visibility='default' filepath='../../.././libstdc++-v3/libsupc++/tinfo.h' line='135' column='1'/>
+              <var-decl name='part2dst' type-id='type-id-36' visibility='default' filepath='../../.././libstdc++-v3/libsupc++/tinfo.h' line='135' column='1'/>
             </data-member>
             <data-member access='public' layout-offset-in-bits='96'>
               <var-decl name='src_details' type-id='type-id-6' visibility='default' filepath='../../.././libstdc++-v3/libsupc++/tinfo.h' line='136' column='1'/>
             </data-member>
             <data-member access='public' layout-offset-in-bits='128'>
-              <var-decl name='base_type' type-id='type-id-33' visibility='default' filepath='../../.././libstdc++-v3/libsupc++/tinfo.h' line='137' column='1'/>
+              <var-decl name='base_type' type-id='type-id-31' visibility='default' filepath='../../.././libstdc++-v3/libsupc++/tinfo.h' line='137' column='1'/>
             </data-member>
             <member-function access='public' constructor='yes'>
               <function-decl name='__upcast_result' filepath='../../.././libstdc++-v3/libsupc++/tinfo.h' line='141' column='1' visibility='default' binding='global' size-in-bits='64'>
-                <parameter type-id='type-id-31' is-artificial='yes'/>
+                <parameter type-id='type-id-29' is-artificial='yes'/>
                 <parameter type-id='type-id-6'/>
                 <return type-id='type-id-5'/>
               </function-decl>
@@ -3967,89 +3930,89 @@
         </member-type>
         <member-function access='private' constructor='yes'>
           <function-decl name='__class_type_info' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/libstdc++-v3/libsupc++/cxxabi.h' line='389' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-25' is-artificial='yes'/>
+            <parameter type-id='type-id-23' is-artificial='yes'/>
             <parameter type-id='type-id-4'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='private' const='yes'>
           <function-decl name='__find_public_src' mangled-name='_ZNK10__cxxabiv117__class_type_info17__find_public_srcElPKvPKS0_S2_' filepath='../../.././libstdc++-v3/libsupc++/tinfo.h' line='169' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-33' is-artificial='yes'/>
-            <parameter type-id='type-id-23'/>
-            <parameter type-id='type-id-36'/>
-            <parameter type-id='type-id-33'/>
-            <parameter type-id='type-id-36'/>
-            <return type-id='type-id-38'/>
+            <parameter type-id='type-id-31' is-artificial='yes'/>
+            <parameter type-id='type-id-21'/>
+            <parameter type-id='type-id-34'/>
+            <parameter type-id='type-id-31'/>
+            <parameter type-id='type-id-34'/>
+            <return type-id='type-id-36'/>
           </function-decl>
         </member-function>
         <member-function access='private' destructor='yes' vtable-offset='-1'>
           <function-decl name='~__class_type_info' filepath='../../.././libstdc++-v3/libsupc++/class_type_info.cc' line='29' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-25' is-artificial='yes'/>
+            <parameter type-id='type-id-23' is-artificial='yes'/>
             <parameter type-id='type-id-6' is-artificial='yes'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='private' destructor='yes' vtable-offset='-1'>
           <function-decl name='~__class_type_info' mangled-name='_ZN10__cxxabiv117__class_type_infoD0Ev' filepath='../../.././libstdc++-v3/libsupc++/class_type_info.cc' line='29' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN10__cxxabiv117__class_type_infoD0Ev@@CXXABI_1.3'>
-            <parameter type-id='type-id-25' is-artificial='yes'/>
+            <parameter type-id='type-id-23' is-artificial='yes'/>
             <parameter type-id='type-id-6' is-artificial='yes'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='private' destructor='yes' vtable-offset='-1'>
           <function-decl name='~__class_type_info' mangled-name='_ZN10__cxxabiv117__class_type_infoD2Ev' filepath='../../.././libstdc++-v3/libsupc++/class_type_info.cc' line='29' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN10__cxxabiv117__class_type_infoD1Ev@@CXXABI_1.3'>
-            <parameter type-id='type-id-25' is-artificial='yes'/>
+            <parameter type-id='type-id-23' is-artificial='yes'/>
             <parameter type-id='type-id-6' is-artificial='yes'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='protected' const='yes' vtable-offset='4'>
           <function-decl name='__do_catch' mangled-name='_ZNK10__cxxabiv117__class_type_info10__do_catchEPKSt9type_infoPPvj' filepath='../../.././libstdc++-v3/libsupc++/class_type_info.cc' line='33' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNK10__cxxabiv117__class_type_info10__do_catchEPKSt9type_infoPPvj@@CXXABI_1.3'>
-            <parameter type-id='type-id-33' is-artificial='yes'/>
-            <parameter type-id='type-id-40'/>
-            <parameter type-id='type-id-37'/>
-            <parameter type-id='type-id-41'/>
-            <return type-id='type-id-42'/>
+            <parameter type-id='type-id-31' is-artificial='yes'/>
+            <parameter type-id='type-id-38'/>
+            <parameter type-id='type-id-35'/>
+            <parameter type-id='type-id-39'/>
+            <return type-id='type-id-40'/>
           </function-decl>
         </member-function>
         <member-function access='protected' const='yes' vtable-offset='5'>
           <function-decl name='__do_upcast' mangled-name='_ZNK10__cxxabiv117__class_type_info11__do_upcastEPKS0_PPv' filepath='../../.././libstdc++-v3/libsupc++/class_type_info.cc' line='46' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNK10__cxxabiv117__class_type_info11__do_upcastEPKS0_PPv@@CXXABI_1.3'>
-            <parameter type-id='type-id-33' is-artificial='yes'/>
-            <parameter type-id='type-id-33'/>
-            <parameter type-id='type-id-37'/>
-            <return type-id='type-id-42'/>
+            <parameter type-id='type-id-31' is-artificial='yes'/>
+            <parameter type-id='type-id-31'/>
+            <parameter type-id='type-id-35'/>
+            <return type-id='type-id-40'/>
           </function-decl>
         </member-function>
         <member-function access='private' const='yes' vtable-offset='6'>
           <function-decl name='__do_upcast' mangled-name='_ZNK10__cxxabiv117__class_type_info11__do_upcastEPKS0_PKvRNS0_15__upcast_resultE' filepath='../../.././libstdc++-v3/libsupc++/class_type_info.cc' line='97' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNK10__cxxabiv117__class_type_info11__do_upcastEPKS0_PKvRNS0_15__upcast_resultE@@CXXABI_1.3'>
-            <parameter type-id='type-id-33' is-artificial='yes'/>
-            <parameter type-id='type-id-33'/>
-            <parameter type-id='type-id-36'/>
-            <parameter type-id='type-id-30'/>
-            <return type-id='type-id-42'/>
+            <parameter type-id='type-id-31' is-artificial='yes'/>
+            <parameter type-id='type-id-31'/>
+            <parameter type-id='type-id-34'/>
+            <parameter type-id='type-id-28'/>
+            <return type-id='type-id-40'/>
           </function-decl>
         </member-function>
         <member-function access='private' const='yes' vtable-offset='7'>
           <function-decl name='__do_dyncast' mangled-name='_ZNK10__cxxabiv117__class_type_info12__do_dyncastElNS0_10__sub_kindEPKS0_PKvS3_S5_RNS0_16__dyncast_resultE' filepath='../../.././libstdc++-v3/libsupc++/class_type_info.cc' line='71' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNK10__cxxabiv117__class_type_info12__do_dyncastElNS0_10__sub_kindEPKS0_PKvS3_S5_RNS0_16__dyncast_resultE@@CXXABI_1.3'>
-            <parameter type-id='type-id-33' is-artificial='yes'/>
-            <parameter type-id='type-id-23'/>
-            <parameter type-id='type-id-38'/>
-            <parameter type-id='type-id-33'/>
-            <parameter type-id='type-id-36'/>
-            <parameter type-id='type-id-33'/>
+            <parameter type-id='type-id-31' is-artificial='yes'/>
+            <parameter type-id='type-id-21'/>
             <parameter type-id='type-id-36'/>
-            <parameter type-id='type-id-27'/>
-            <return type-id='type-id-42'/>
+            <parameter type-id='type-id-31'/>
+            <parameter type-id='type-id-34'/>
+            <parameter type-id='type-id-31'/>
+            <parameter type-id='type-id-34'/>
+            <parameter type-id='type-id-25'/>
+            <return type-id='type-id-40'/>
           </function-decl>
         </member-function>
         <member-function access='private' const='yes' vtable-offset='8'>
           <function-decl name='__do_find_public_src' mangled-name='_ZNK10__cxxabiv117__class_type_info20__do_find_public_srcElPKvPKS0_S2_' filepath='../../.././libstdc++-v3/libsupc++/class_type_info.cc' line='59' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNK10__cxxabiv117__class_type_info20__do_find_public_srcElPKvPKS0_S2_@@CXXABI_1.3'>
-            <parameter type-id='type-id-33' is-artificial='yes'/>
-            <parameter type-id='type-id-23'/>
-            <parameter type-id='type-id-36'/>
-            <parameter type-id='type-id-33'/>
-            <parameter type-id='type-id-36'/>
-            <return type-id='type-id-38'/>
+            <parameter type-id='type-id-31' is-artificial='yes'/>
+            <parameter type-id='type-id-21'/>
+            <parameter type-id='type-id-34'/>
+            <parameter type-id='type-id-31'/>
+            <parameter type-id='type-id-34'/>
+            <return type-id='type-id-36'/>
           </function-decl>
         </member-function>
       </class-decl>
@@ -4057,68 +4020,68 @@
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='../../.././libstdc++-v3/libsupc++/del_op.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/libsupc++' language='LANG_C_plus_plus'>
     <function-decl name='free' filepath='/usr/include/stdlib.h' line='488' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-36'/>
+      <parameter type-id='type-id-34'/>
       <return type-id='type-id-5'/>
     </function-decl>
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='../../.././libstdc++-v3/libsupc++/del_opnt.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/libsupc++' language='LANG_C_plus_plus'>
-    <qualified-type-def type-id='type-id-43' const='yes' id='type-id-44'/>
-    <qualified-type-def type-id='type-id-45' id='type-id-46'/>
-    <reference-type-def kind='lvalue' type-id='type-id-44' size-in-bits='64' id='type-id-45'/>
+    <qualified-type-def type-id='type-id-41' const='yes' id='type-id-42'/>
+    <qualified-type-def type-id='type-id-43' id='type-id-44'/>
+    <reference-type-def kind='lvalue' type-id='type-id-42' size-in-bits='64' id='type-id-43'/>
     <namespace-decl name='std'>
-      <class-decl name='nothrow_t' size-in-bits='8' is-struct='yes' visibility='default' filepath='../../.././libstdc++-v3/libsupc++/new' line='69' column='1' id='type-id-43'/>
+      <class-decl name='nothrow_t' size-in-bits='8' is-struct='yes' visibility='default' filepath='../../.././libstdc++-v3/libsupc++/new' line='69' column='1' id='type-id-41'/>
     </namespace-decl>
     <function-decl name='operator delete' mangled-name='_ZdlPvRKSt9nothrow_t' filepath='../../.././libstdc++-v3/libsupc++/del_opnt.cc' line='33' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZdlPvRKSt9nothrow_t@@GLIBCXX_3.4'>
-      <parameter type-id='type-id-36' name='ptr' filepath='../../.././libstdc++-v3/libsupc++/del_opnt.cc' line='33' column='1'/>
-      <parameter type-id='type-id-46'/>
+      <parameter type-id='type-id-34' name='ptr' filepath='../../.././libstdc++-v3/libsupc++/del_opnt.cc' line='33' column='1'/>
+      <parameter type-id='type-id-44'/>
       <return type-id='type-id-5'/>
     </function-decl>
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='../../.././libstdc++-v3/libsupc++/del_opv.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/libsupc++' language='LANG_C_plus_plus'>
     <function-decl name='operator delete []' mangled-name='_ZdaPv' filepath='../../.././libstdc++-v3/libsupc++/del_opv.cc' line='31' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZdaPv@@GLIBCXX_3.4'>
-      <parameter type-id='type-id-36'/>
+      <parameter type-id='type-id-34'/>
       <return type-id='type-id-5'/>
     </function-decl>
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='../../.././libstdc++-v3/libsupc++/del_opvnt.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/libsupc++' language='LANG_C_plus_plus'>
     <function-decl name='operator delete []' mangled-name='_ZdaPvRKSt9nothrow_t' filepath='../../.././libstdc++-v3/libsupc++/del_opvnt.cc' line='31' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZdaPvRKSt9nothrow_t@@GLIBCXX_3.4'>
-      <parameter type-id='type-id-36' name='ptr' filepath='../../.././libstdc++-v3/libsupc++/del_opnt.cc' line='33' column='1'/>
-      <parameter type-id='type-id-46'/>
+      <parameter type-id='type-id-34' name='ptr' filepath='../../.././libstdc++-v3/libsupc++/del_opnt.cc' line='33' column='1'/>
+      <parameter type-id='type-id-44'/>
       <return type-id='type-id-5'/>
     </function-decl>
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='../../.././libstdc++-v3/libsupc++/dyncast.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/libsupc++' language='LANG_C_plus_plus'>
     <namespace-decl name='__cxxabiv1'>
       <function-decl name='__dynamic_cast' mangled-name='__dynamic_cast' filepath='../../.././libstdc++-v3/libsupc++/dyncast.cc' line='46' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__dynamic_cast@@CXXABI_1.3'>
-        <parameter type-id='type-id-36'/>
-        <parameter type-id='type-id-33'/>
-        <parameter type-id='type-id-33'/>
-        <parameter type-id='type-id-23'/>
-        <return type-id='type-id-36'/>
+        <parameter type-id='type-id-34'/>
+        <parameter type-id='type-id-31'/>
+        <parameter type-id='type-id-31'/>
+        <parameter type-id='type-id-21'/>
+        <return type-id='type-id-34'/>
       </function-decl>
     </namespace-decl>
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='../../.././libstdc++-v3/libsupc++/eh_alloc.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/libsupc++' language='LANG_C_plus_plus'>
-    <class-decl name='_Unwind_Exception' size-in-bits='256' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/host-x86_64-unknown-linux-gnu/gcc/include/unwind.h' line='85' column='1' id='type-id-47'>
+    <class-decl name='_Unwind_Exception' size-in-bits='256' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/host-x86_64-unknown-linux-gnu/gcc/include/unwind.h' line='85' column='1' id='type-id-45'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='exception_class' type-id='type-id-48' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/host-x86_64-unknown-linux-gnu/gcc/include/unwind.h' line='87' column='1'/>
+        <var-decl name='exception_class' type-id='type-id-46' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/host-x86_64-unknown-linux-gnu/gcc/include/unwind.h' line='87' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
-        <var-decl name='exception_cleanup' type-id='type-id-49' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/host-x86_64-unknown-linux-gnu/gcc/include/unwind.h' line='88' column='1'/>
+        <var-decl name='exception_cleanup' type-id='type-id-47' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/host-x86_64-unknown-linux-gnu/gcc/include/unwind.h' line='88' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
-        <var-decl name='private_1' type-id='type-id-50' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/host-x86_64-unknown-linux-gnu/gcc/include/unwind.h' line='89' column='1'/>
+        <var-decl name='private_1' type-id='type-id-48' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/host-x86_64-unknown-linux-gnu/gcc/include/unwind.h' line='89' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='192'>
-        <var-decl name='private_2' type-id='type-id-50' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/host-x86_64-unknown-linux-gnu/gcc/include/unwind.h' line='90' column='1'/>
+        <var-decl name='private_2' type-id='type-id-48' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/host-x86_64-unknown-linux-gnu/gcc/include/unwind.h' line='90' column='1'/>
       </data-member>
     </class-decl>
-    <typedef-decl name='_Unwind_Ptr' type-id='type-id-51' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/host-x86_64-unknown-linux-gnu/gcc/include/unwind.h' line='48' column='1' id='type-id-52'/>
-    <typedef-decl name='_Unwind_Exception_Class' type-id='type-id-51' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/host-x86_64-unknown-linux-gnu/gcc/include/unwind.h' line='56' column='1' id='type-id-48'/>
-    <typedef-decl name='_Unwind_Exception_Cleanup_Fn' type-id='type-id-53' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/host-x86_64-unknown-linux-gnu/gcc/include/unwind.h' line='82' column='1' id='type-id-49'/>
-    <typedef-decl name='_Unwind_Reason_Code' type-id='type-id-54' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/host-x86_64-unknown-linux-gnu/gcc/include/unwind.h' line='71' column='1' id='type-id-55'/>
-    <enum-decl name='__anonymous_enum__' is-anonymous='yes' linkage-name='19_Unwind_Reason_Code' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/host-x86_64-unknown-linux-gnu/gcc/include/unwind.h' line='61' column='1' id='type-id-54'>
-      <underlying-type type-id='type-id-39'/>
+    <typedef-decl name='_Unwind_Ptr' type-id='type-id-49' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/host-x86_64-unknown-linux-gnu/gcc/include/unwind.h' line='48' column='1' id='type-id-50'/>
+    <typedef-decl name='_Unwind_Exception_Class' type-id='type-id-49' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/host-x86_64-unknown-linux-gnu/gcc/include/unwind.h' line='56' column='1' id='type-id-46'/>
+    <typedef-decl name='_Unwind_Exception_Cleanup_Fn' type-id='type-id-51' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/host-x86_64-unknown-linux-gnu/gcc/include/unwind.h' line='82' column='1' id='type-id-47'/>
+    <typedef-decl name='_Unwind_Reason_Code' type-id='type-id-52' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/host-x86_64-unknown-linux-gnu/gcc/include/unwind.h' line='71' column='1' id='type-id-53'/>
+    <enum-decl name='__anonymous_enum__' is-anonymous='yes' linkage-name='19_Unwind_Reason_Code' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/host-x86_64-unknown-linux-gnu/gcc/include/unwind.h' line='61' column='1' id='type-id-52'>
+      <underlying-type type-id='type-id-37'/>
       <enumerator name='_URC_NO_REASON' value='0'/>
       <enumerator name='_URC_FOREIGN_EXCEPTION_CAUGHT' value='1'/>
       <enumerator name='_URC_FATAL_PHASE2_ERROR' value='2'/>
@@ -4129,34 +4092,34 @@
       <enumerator name='_URC_INSTALL_CONTEXT' value='7'/>
       <enumerator name='_URC_CONTINUE_UNWIND' value='8'/>
     </enum-decl>
-    <typedef-decl name='_Unwind_Word' type-id='type-id-51' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/host-x86_64-unknown-linux-gnu/gcc/include/unwind.h' line='43' column='1' id='type-id-50'/>
-    <pointer-type-def type-id='type-id-47' size-in-bits='64' id='type-id-56'/>
+    <typedef-decl name='_Unwind_Word' type-id='type-id-49' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/host-x86_64-unknown-linux-gnu/gcc/include/unwind.h' line='43' column='1' id='type-id-48'/>
+    <pointer-type-def type-id='type-id-45' size-in-bits='64' id='type-id-54'/>
+    <pointer-type-def type-id='type-id-55' size-in-bits='64' id='type-id-56'/>
     <pointer-type-def type-id='type-id-57' size-in-bits='64' id='type-id-58'/>
-    <pointer-type-def type-id='type-id-59' size-in-bits='64' id='type-id-60'/>
-    <reference-type-def kind='lvalue' type-id='type-id-61' size-in-bits='64' id='type-id-62'/>
-    <pointer-type-def type-id='type-id-61' size-in-bits='64' id='type-id-63'/>
-    <reference-type-def kind='lvalue' type-id='type-id-64' size-in-bits='64' id='type-id-65'/>
-    <pointer-type-def type-id='type-id-64' size-in-bits='64' id='type-id-66'/>
-    <qualified-type-def type-id='type-id-67' id='type-id-68'/>
-    <reference-type-def kind='lvalue' type-id='type-id-69' size-in-bits='64' id='type-id-67'/>
-    <pointer-type-def type-id='type-id-70' size-in-bits='64' id='type-id-71'/>
-    <qualified-type-def type-id='type-id-72' const='yes' id='type-id-73'/>
-    <pointer-type-def type-id='type-id-73' size-in-bits='64' id='type-id-74'/>
-    <qualified-type-def type-id='type-id-75' const='yes' id='type-id-76'/>
-    <pointer-type-def type-id='type-id-76' size-in-bits='64' id='type-id-77'/>
-    <qualified-type-def type-id='type-id-61' const='yes' id='type-id-78'/>
+    <reference-type-def kind='lvalue' type-id='type-id-59' size-in-bits='64' id='type-id-60'/>
+    <pointer-type-def type-id='type-id-59' size-in-bits='64' id='type-id-61'/>
+    <reference-type-def kind='lvalue' type-id='type-id-62' size-in-bits='64' id='type-id-63'/>
+    <pointer-type-def type-id='type-id-62' size-in-bits='64' id='type-id-64'/>
+    <qualified-type-def type-id='type-id-65' id='type-id-66'/>
+    <reference-type-def kind='lvalue' type-id='type-id-67' size-in-bits='64' id='type-id-65'/>
+    <pointer-type-def type-id='type-id-68' size-in-bits='64' id='type-id-69'/>
+    <qualified-type-def type-id='type-id-70' const='yes' id='type-id-71'/>
+    <pointer-type-def type-id='type-id-71' size-in-bits='64' id='type-id-72'/>
+    <qualified-type-def type-id='type-id-73' const='yes' id='type-id-74'/>
+    <pointer-type-def type-id='type-id-74' size-in-bits='64' id='type-id-75'/>
+    <qualified-type-def type-id='type-id-59' const='yes' id='type-id-76'/>
+    <reference-type-def kind='lvalue' type-id='type-id-76' size-in-bits='64' id='type-id-77'/>
+    <qualified-type-def type-id='type-id-62' const='yes' id='type-id-78'/>
     <reference-type-def kind='lvalue' type-id='type-id-78' size-in-bits='64' id='type-id-79'/>
-    <qualified-type-def type-id='type-id-64' const='yes' id='type-id-80'/>
-    <reference-type-def kind='lvalue' type-id='type-id-80' size-in-bits='64' id='type-id-81'/>
-    <qualified-type-def type-id='type-id-82' const='yes' id='type-id-83'/>
-    <pointer-type-def type-id='type-id-83' size-in-bits='64' id='type-id-84'/>
-    <pointer-type-def type-id='type-id-11' size-in-bits='64' id='type-id-12'/>
-    <pointer-type-def type-id='type-id-3' size-in-bits='64' id='type-id-85'/>
-    <pointer-type-def type-id='type-id-86' size-in-bits='64' id='type-id-53'/>
-    <pointer-type-def type-id='type-id-87' size-in-bits='64' id='type-id-88'/>
+    <qualified-type-def type-id='type-id-80' const='yes' id='type-id-81'/>
+    <pointer-type-def type-id='type-id-81' size-in-bits='64' id='type-id-82'/>
+    <pointer-type-def type-id='type-id-11' size-in-bits='64' id='type-id-83'/>
+    <pointer-type-def type-id='type-id-3' size-in-bits='64' id='type-id-84'/>
+    <pointer-type-def type-id='type-id-85' size-in-bits='64' id='type-id-51'/>
+    <pointer-type-def type-id='type-id-86' size-in-bits='64' id='type-id-87'/>
     <namespace-decl name='std'>
-      <typedef-decl name='unexpected_handler' type-id='type-id-89' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/libstdc++-v3/libsupc++/exception' line='92' column='1' id='type-id-90'/>
-      <typedef-decl name='terminate_handler' type-id='type-id-89' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/libstdc++-v3/libsupc++/exception' line='89' column='1' id='type-id-91'/>
+      <typedef-decl name='unexpected_handler' type-id='type-id-88' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/libstdc++-v3/libsupc++/exception' line='92' column='1' id='type-id-89'/>
+      <typedef-decl name='terminate_handler' type-id='type-id-88' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/libstdc++-v3/libsupc++/exception' line='89' column='1' id='type-id-90'/>
     </namespace-decl>
     <namespace-decl name='__gnu_cxx'>
       <function-decl name='__throw_concurrence_lock_error' mangled-name='_ZN9__gnu_cxx30__throw_concurrence_lock_errorEv' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ext/concurrence.h' line='102' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -4165,126 +4128,126 @@
       <function-decl name='__throw_concurrence_unlock_error' mangled-name='_ZN9__gnu_cxx32__throw_concurrence_unlock_errorEv' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ext/concurrence.h' line='112' column='1' visibility='default' binding='global' size-in-bits='64'>
         <return type-id='type-id-5'/>
       </function-decl>
-      <class-decl name='__concurrence_lock_error' size-in-bits='64' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ext/concurrence.h' line='68' column='1' id='type-id-72'>
+      <class-decl name='__concurrence_lock_error' size-in-bits='64' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ext/concurrence.h' line='68' column='1' id='type-id-70'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-11'/>
         <member-function access='private' const='yes' vtable-offset='2'>
           <function-decl name='what' mangled-name='_ZNK9__gnu_cxx24__concurrence_lock_error4whatEv' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ext/concurrence.h' line='72' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-74' is-artificial='yes'/>
+            <parameter type-id='type-id-72' is-artificial='yes'/>
             <return type-id='type-id-4'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='__concurrence_unlock_error' size-in-bits='64' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ext/concurrence.h' line='76' column='1' id='type-id-75'>
+      <class-decl name='__concurrence_unlock_error' size-in-bits='64' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ext/concurrence.h' line='76' column='1' id='type-id-73'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-11'/>
         <member-function access='private' const='yes' vtable-offset='2'>
           <function-decl name='what' mangled-name='_ZNK9__gnu_cxx26__concurrence_unlock_error4whatEv' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ext/concurrence.h' line='80' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-77' is-artificial='yes'/>
+            <parameter type-id='type-id-75' is-artificial='yes'/>
             <return type-id='type-id-4'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='__mutex' size-in-bits='320' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ext/concurrence.h' line='143' column='1' id='type-id-61'>
+      <class-decl name='__mutex' size-in-bits='320' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ext/concurrence.h' line='143' column='1' id='type-id-59'>
         <data-member access='private' layout-offset-in-bits='0'>
-          <var-decl name='_M_mutex' type-id='type-id-70' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ext/concurrence.h' line='147' column='1'/>
+          <var-decl name='_M_mutex' type-id='type-id-68' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ext/concurrence.h' line='147' column='1'/>
         </data-member>
         <member-function access='private' constructor='yes'>
           <function-decl name='__mutex' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ext/concurrence.h' line='152' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-63' is-artificial='yes'/>
-            <parameter type-id='type-id-79'/>
+            <parameter type-id='type-id-61' is-artificial='yes'/>
+            <parameter type-id='type-id-77'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='operator=' mangled-name='_ZN9__gnu_cxx7__mutexaSERKS0_' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ext/concurrence.h' line='153' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-63' is-artificial='yes'/>
-            <parameter type-id='type-id-79'/>
-            <return type-id='type-id-62'/>
+            <parameter type-id='type-id-61' is-artificial='yes'/>
+            <parameter type-id='type-id-77'/>
+            <return type-id='type-id-60'/>
           </function-decl>
         </member-function>
         <member-function access='private' constructor='yes'>
           <function-decl name='__mutex' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ext/concurrence.h' line='156' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-63' is-artificial='yes'/>
+            <parameter type-id='type-id-61' is-artificial='yes'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='lock' mangled-name='_ZN9__gnu_cxx7__mutex4lockEv' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ext/concurrence.h' line='172' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-63' is-artificial='yes'/>
+            <parameter type-id='type-id-61' is-artificial='yes'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='unlock' mangled-name='_ZN9__gnu_cxx7__mutex6unlockEv' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ext/concurrence.h' line='183' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-63' is-artificial='yes'/>
+            <parameter type-id='type-id-61' is-artificial='yes'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='gthread_mutex' mangled-name='_ZN9__gnu_cxx7__mutex13gthread_mutexEv' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ext/concurrence.h' line='194' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-63' is-artificial='yes'/>
-            <return type-id='type-id-71'/>
+            <parameter type-id='type-id-61' is-artificial='yes'/>
+            <return type-id='type-id-69'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='__scoped_lock' size-in-bits='64' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ext/concurrence.h' line='293' column='1' id='type-id-64'>
+      <class-decl name='__scoped_lock' size-in-bits='64' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ext/concurrence.h' line='293' column='1' id='type-id-62'>
         <member-type access='private'>
-          <typedef-decl name='__mutex_type' type-id='type-id-61' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ext/concurrence.h' line='296' column='1' id='type-id-69'/>
+          <typedef-decl name='__mutex_type' type-id='type-id-59' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ext/concurrence.h' line='296' column='1' id='type-id-67'/>
         </member-type>
         <data-member access='private' layout-offset-in-bits='0'>
-          <var-decl name='_M_device' type-id='type-id-68' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ext/concurrence.h' line='299' column='1'/>
+          <var-decl name='_M_device' type-id='type-id-66' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ext/concurrence.h' line='299' column='1'/>
         </data-member>
         <member-function access='private' constructor='yes'>
           <function-decl name='__scoped_lock' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ext/concurrence.h' line='301' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-66' is-artificial='yes'/>
-            <parameter type-id='type-id-81'/>
+            <parameter type-id='type-id-64' is-artificial='yes'/>
+            <parameter type-id='type-id-79'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='operator=' mangled-name='_ZN9__gnu_cxx13__scoped_lockaSERKS0_' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ext/concurrence.h' line='302' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-66' is-artificial='yes'/>
-            <parameter type-id='type-id-81'/>
-            <return type-id='type-id-65'/>
+            <parameter type-id='type-id-64' is-artificial='yes'/>
+            <parameter type-id='type-id-79'/>
+            <return type-id='type-id-63'/>
           </function-decl>
         </member-function>
         <member-function access='private' constructor='yes'>
           <function-decl name='__scoped_lock' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ext/concurrence.h' line='305' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-66' is-artificial='yes'/>
-            <parameter type-id='type-id-67'/>
+            <parameter type-id='type-id-64' is-artificial='yes'/>
+            <parameter type-id='type-id-65'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='private' destructor='yes'>
           <function-decl name='~__scoped_lock' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ext/concurrence.h' line='308' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-66' is-artificial='yes'/>
+            <parameter type-id='type-id-64' is-artificial='yes'/>
             <parameter type-id='type-id-6' is-artificial='yes'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='private' destructor='yes'>
           <function-decl name='~__scoped_lock' mangled-name='_ZN9__gnu_cxx13__scoped_lockD2Ev' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ext/concurrence.h' line='308' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-66' is-artificial='yes'/>
+            <parameter type-id='type-id-64' is-artificial='yes'/>
             <parameter type-id='type-id-6' is-artificial='yes'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='private' destructor='yes'>
           <function-decl name='~__scoped_lock' mangled-name='_ZN9__gnu_cxx13__scoped_lockD2Ev' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ext/concurrence.h' line='308' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-66' is-artificial='yes'/>
+            <parameter type-id='type-id-64' is-artificial='yes'/>
             <parameter type-id='type-id-6' is-artificial='yes'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='private' destructor='yes'>
           <function-decl name='~__scoped_lock' mangled-name='_ZN9__gnu_cxx13__scoped_lockD2Ev' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ext/concurrence.h' line='308' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-66' is-artificial='yes'/>
+            <parameter type-id='type-id-64' is-artificial='yes'/>
             <parameter type-id='type-id-6' is-artificial='yes'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='private' destructor='yes'>
           <function-decl name='~__scoped_lock' mangled-name='_ZN9__gnu_cxx13__scoped_lockD2Ev' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ext/concurrence.h' line='308' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-66' is-artificial='yes'/>
+            <parameter type-id='type-id-64' is-artificial='yes'/>
             <parameter type-id='type-id-6' is-artificial='yes'/>
             <return type-id='type-id-5'/>
           </function-decl>
@@ -4292,10 +4255,10 @@
       </class-decl>
     </namespace-decl>
     <function-decl name='memchr' mangled-name='memchr' filepath='/usr/include/string.h' line='88' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-36'/>
+      <parameter type-id='type-id-34'/>
       <parameter type-id='type-id-6'/>
-      <parameter type-id='type-id-92'/>
-      <return type-id='type-id-36'/>
+      <parameter type-id='type-id-91'/>
+      <return type-id='type-id-34'/>
     </function-decl>
     <function-decl name='strcoll' filepath='/usr/include/string.h' line='150' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-4'/>
@@ -4304,18 +4267,18 @@
     </function-decl>
     <function-decl name='strerror' filepath='/usr/include/string.h' line='413' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-6'/>
-      <return type-id='type-id-93'/>
+      <return type-id='type-id-92'/>
     </function-decl>
     <function-decl name='strtok' filepath='/usr/include/string.h' line='348' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-93'/>
+      <parameter type-id='type-id-92'/>
       <parameter type-id='type-id-4'/>
-      <return type-id='type-id-93'/>
+      <return type-id='type-id-92'/>
     </function-decl>
     <function-decl name='strxfrm' filepath='/usr/include/string.h' line='153' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-93'/>
-      <parameter type-id='type-id-4'/>
       <parameter type-id='type-id-92'/>
-      <return type-id='type-id-92'/>
+      <parameter type-id='type-id-4'/>
+      <parameter type-id='type-id-91'/>
+      <return type-id='type-id-91'/>
     </function-decl>
     <function-decl name='strchr' mangled-name='strchr' filepath='/usr/include/string.h' line='228' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-4'/>
@@ -4339,25 +4302,25 @@
     </function-decl>
     <namespace-decl name='__cxxabiv1'>
       <function-decl name='__cxa_allocate_exception' mangled-name='__cxa_allocate_exception' filepath='../../.././libstdc++-v3/libsupc++/eh_alloc.cc' line='97' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__cxa_allocate_exception@@CXXABI_1.3'>
-        <parameter type-id='type-id-94'/>
-        <return type-id='type-id-36'/>
+        <parameter type-id='type-id-93'/>
+        <return type-id='type-id-34'/>
       </function-decl>
       <function-decl name='__cxa_free_exception' mangled-name='__cxa_free_exception' filepath='../../.././libstdc++-v3/libsupc++/eh_alloc.cc' line='136' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__cxa_free_exception@@CXXABI_1.3'>
-        <parameter type-id='type-id-36'/>
+        <parameter type-id='type-id-34'/>
         <return type-id='type-id-5'/>
       </function-decl>
-      <class-decl name='__cxa_dependent_exception' size-in-bits='896' is-struct='yes' visibility='default' filepath='../../.././libstdc++-v3/libsupc++/unwind-cxx.h' line='100' column='1' id='type-id-57'>
+      <class-decl name='__cxa_dependent_exception' size-in-bits='896' is-struct='yes' visibility='default' filepath='../../.././libstdc++-v3/libsupc++/unwind-cxx.h' line='100' column='1' id='type-id-55'>
         <data-member access='public' layout-offset-in-bits='0'>
-          <var-decl name='primaryException' type-id='type-id-36' visibility='default' filepath='../../.././libstdc++-v3/libsupc++/unwind-cxx.h' line='103' column='1'/>
+          <var-decl name='primaryException' type-id='type-id-34' visibility='default' filepath='../../.././libstdc++-v3/libsupc++/unwind-cxx.h' line='103' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='64'>
-          <var-decl name='unexpectedHandler' type-id='type-id-90' visibility='default' filepath='../../.././libstdc++-v3/libsupc++/unwind-cxx.h' line='107' column='1'/>
+          <var-decl name='unexpectedHandler' type-id='type-id-89' visibility='default' filepath='../../.././libstdc++-v3/libsupc++/unwind-cxx.h' line='107' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='128'>
-          <var-decl name='terminateHandler' type-id='type-id-91' visibility='default' filepath='../../.././libstdc++-v3/libsupc++/unwind-cxx.h' line='108' column='1'/>
+          <var-decl name='terminateHandler' type-id='type-id-90' visibility='default' filepath='../../.././libstdc++-v3/libsupc++/unwind-cxx.h' line='108' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='192'>
-          <var-decl name='nextException' type-id='type-id-60' visibility='default' filepath='../../.././libstdc++-v3/libsupc++/unwind-cxx.h' line='111' column='1'/>
+          <var-decl name='nextException' type-id='type-id-58' visibility='default' filepath='../../.././libstdc++-v3/libsupc++/unwind-cxx.h' line='111' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='256'>
           <var-decl name='handlerCount' type-id='type-id-6' visibility='default' filepath='../../.././libstdc++-v3/libsupc++/unwind-cxx.h' line='115' column='1'/>
@@ -4366,36 +4329,36 @@
           <var-decl name='handlerSwitchValue' type-id='type-id-6' visibility='default' filepath='../../.././libstdc++-v3/libsupc++/unwind-cxx.h' line='126' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='320'>
-          <var-decl name='actionRecord' type-id='type-id-84' visibility='default' filepath='../../.././libstdc++-v3/libsupc++/unwind-cxx.h' line='127' column='1'/>
+          <var-decl name='actionRecord' type-id='type-id-82' visibility='default' filepath='../../.././libstdc++-v3/libsupc++/unwind-cxx.h' line='127' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='384'>
-          <var-decl name='languageSpecificData' type-id='type-id-84' visibility='default' filepath='../../.././libstdc++-v3/libsupc++/unwind-cxx.h' line='128' column='1'/>
+          <var-decl name='languageSpecificData' type-id='type-id-82' visibility='default' filepath='../../.././libstdc++-v3/libsupc++/unwind-cxx.h' line='128' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='448'>
-          <var-decl name='catchTemp' type-id='type-id-52' visibility='default' filepath='../../.././libstdc++-v3/libsupc++/unwind-cxx.h' line='129' column='1'/>
+          <var-decl name='catchTemp' type-id='type-id-50' visibility='default' filepath='../../.././libstdc++-v3/libsupc++/unwind-cxx.h' line='129' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='512'>
-          <var-decl name='adjustedPtr' type-id='type-id-36' visibility='default' filepath='../../.././libstdc++-v3/libsupc++/unwind-cxx.h' line='130' column='1'/>
+          <var-decl name='adjustedPtr' type-id='type-id-34' visibility='default' filepath='../../.././libstdc++-v3/libsupc++/unwind-cxx.h' line='130' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='640'>
-          <var-decl name='unwindHeader' type-id='type-id-47' visibility='default' filepath='../../.././libstdc++-v3/libsupc++/unwind-cxx.h' line='134' column='1'/>
+          <var-decl name='unwindHeader' type-id='type-id-45' visibility='default' filepath='../../.././libstdc++-v3/libsupc++/unwind-cxx.h' line='134' column='1'/>
         </data-member>
       </class-decl>
-      <class-decl name='__cxa_exception' size-in-bits='896' is-struct='yes' visibility='default' filepath='../../.././libstdc++-v3/libsupc++/unwind-cxx.h' line='50' column='1' id='type-id-59'>
+      <class-decl name='__cxa_exception' size-in-bits='896' is-struct='yes' visibility='default' filepath='../../.././libstdc++-v3/libsupc++/unwind-cxx.h' line='50' column='1' id='type-id-57'>
         <data-member access='public' layout-offset-in-bits='0'>
-          <var-decl name='exceptionType' type-id='type-id-85' visibility='default' filepath='../../.././libstdc++-v3/libsupc++/unwind-cxx.h' line='53' column='1'/>
+          <var-decl name='exceptionType' type-id='type-id-84' visibility='default' filepath='../../.././libstdc++-v3/libsupc++/unwind-cxx.h' line='53' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='64'>
-          <var-decl name='exceptionDestructor' type-id='type-id-88' visibility='default' filepath='../../.././libstdc++-v3/libsupc++/unwind-cxx.h' line='54' column='1'/>
+          <var-decl name='exceptionDestructor' type-id='type-id-87' visibility='default' filepath='../../.././libstdc++-v3/libsupc++/unwind-cxx.h' line='54' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='128'>
-          <var-decl name='unexpectedHandler' type-id='type-id-90' visibility='default' filepath='../../.././libstdc++-v3/libsupc++/unwind-cxx.h' line='58' column='1'/>
+          <var-decl name='unexpectedHandler' type-id='type-id-89' visibility='default' filepath='../../.././libstdc++-v3/libsupc++/unwind-cxx.h' line='58' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='192'>
-          <var-decl name='terminateHandler' type-id='type-id-91' visibility='default' filepath='../../.././libstdc++-v3/libsupc++/unwind-cxx.h' line='59' column='1'/>
+          <var-decl name='terminateHandler' type-id='type-id-90' visibility='default' filepath='../../.././libstdc++-v3/libsupc++/unwind-cxx.h' line='59' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='256'>
-          <var-decl name='nextException' type-id='type-id-60' visibility='default' filepath='../../.././libstdc++-v3/libsupc++/unwind-cxx.h' line='62' column='1'/>
+          <var-decl name='nextException' type-id='type-id-58' visibility='default' filepath='../../.././libstdc++-v3/libsupc++/unwind-cxx.h' line='62' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='320'>
           <var-decl name='handlerCount' type-id='type-id-6' visibility='default' filepath='../../.././libstdc++-v3/libsupc++/unwind-cxx.h' line='66' column='1'/>
@@ -4404,40 +4367,40 @@
           <var-decl name='handlerSwitchValue' type-id='type-id-6' visibility='default' filepath='../../.././libstdc++-v3/libsupc++/unwind-cxx.h' line='77' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='384'>
-          <var-decl name='actionRecord' type-id='type-id-84' visibility='default' filepath='../../.././libstdc++-v3/libsupc++/unwind-cxx.h' line='78' column='1'/>
+          <var-decl name='actionRecord' type-id='type-id-82' visibility='default' filepath='../../.././libstdc++-v3/libsupc++/unwind-cxx.h' line='78' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='448'>
-          <var-decl name='languageSpecificData' type-id='type-id-84' visibility='default' filepath='../../.././libstdc++-v3/libsupc++/unwind-cxx.h' line='79' column='1'/>
+          <var-decl name='languageSpecificData' type-id='type-id-82' visibility='default' filepath='../../.././libstdc++-v3/libsupc++/unwind-cxx.h' line='79' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='512'>
-          <var-decl name='catchTemp' type-id='type-id-52' visibility='default' filepath='../../.././libstdc++-v3/libsupc++/unwind-cxx.h' line='80' column='1'/>
+          <var-decl name='catchTemp' type-id='type-id-50' visibility='default' filepath='../../.././libstdc++-v3/libsupc++/unwind-cxx.h' line='80' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='576'>
-          <var-decl name='adjustedPtr' type-id='type-id-36' visibility='default' filepath='../../.././libstdc++-v3/libsupc++/unwind-cxx.h' line='81' column='1'/>
+          <var-decl name='adjustedPtr' type-id='type-id-34' visibility='default' filepath='../../.././libstdc++-v3/libsupc++/unwind-cxx.h' line='81' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='640'>
-          <var-decl name='unwindHeader' type-id='type-id-47' visibility='default' filepath='../../.././libstdc++-v3/libsupc++/unwind-cxx.h' line='85' column='1'/>
+          <var-decl name='unwindHeader' type-id='type-id-45' visibility='default' filepath='../../.././libstdc++-v3/libsupc++/unwind-cxx.h' line='85' column='1'/>
         </data-member>
       </class-decl>
       <function-decl name='__cxa_allocate_dependent_exception' mangled-name='__cxa_allocate_dependent_exception' filepath='../../.././libstdc++-v3/libsupc++/eh_alloc.cc' line='155' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__cxa_allocate_dependent_exception@@CXXABI_1.3.6'>
-        <return type-id='type-id-58'/>
+        <return type-id='type-id-56'/>
       </function-decl>
       <function-decl name='__cxa_free_dependent_exception' mangled-name='__cxa_free_dependent_exception' filepath='../../.././libstdc++-v3/libsupc++/eh_alloc.cc' line='192' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__cxa_free_dependent_exception@@CXXABI_1.3.6'>
-        <parameter type-id='type-id-58'/>
+        <parameter type-id='type-id-56'/>
         <return type-id='type-id-5'/>
       </function-decl>
     </namespace-decl>
     <function-decl name='malloc' filepath='/usr/include/stdlib.h' line='471' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-92'/>
-      <return type-id='type-id-36'/>
+      <parameter type-id='type-id-91'/>
+      <return type-id='type-id-34'/>
     </function-decl>
-    <function-type size-in-bits='64' id='type-id-86'>
-      <parameter type-id='type-id-55'/>
-      <parameter type-id='type-id-56'/>
+    <function-type size-in-bits='64' id='type-id-85'>
+      <parameter type-id='type-id-53'/>
+      <parameter type-id='type-id-54'/>
       <return type-id='type-id-5'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-87'>
-      <parameter type-id='type-id-36'/>
+    <function-type size-in-bits='64' id='type-id-86'>
+      <parameter type-id='type-id-34'/>
       <return type-id='type-id-5'/>
     </function-type>
   </abi-instr>
@@ -4456,120 +4419,120 @@
   <abi-instr version='1.0' address-size='64' path='../../.././libstdc++-v3/libsupc++/eh_call.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/libsupc++' language='LANG_C_plus_plus'>
     <namespace-decl name='__cxxabiv1'>
       <function-decl name='__terminate' mangled-name='_ZN10__cxxabiv111__terminateEPFvvE' filepath='../../.././libstdc++-v3/libsupc++/unwind-cxx.h' line='175' column='1' visibility='default' binding='global' size-in-bits='64'>
-        <parameter type-id='type-id-91'/>
+        <parameter type-id='type-id-90'/>
         <return type-id='type-id-5'/>
       </function-decl>
       <function-decl name='__cxa_begin_catch' mangled-name='__cxa_begin_catch' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/libstdc++-v3/libsupc++/cxxabi.h' line='611' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__cxa_begin_catch@@CXXABI_1.3'>
-        <parameter type-id='type-id-36'/>
-        <return type-id='type-id-36'/>
+        <parameter type-id='type-id-34'/>
+        <return type-id='type-id-34'/>
       </function-decl>
     </namespace-decl>
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='../../.././libstdc++-v3/libsupc++/eh_catch.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/libsupc++' language='LANG_C_plus_plus'>
-    <pointer-type-def type-id='type-id-95' size-in-bits='64' id='type-id-96'/>
+    <pointer-type-def type-id='type-id-94' size-in-bits='64' id='type-id-95'/>
     <namespace-decl name='std'>
       <function-decl name='uncaught_exception' mangled-name='_ZSt18uncaught_exceptionv' filepath='../../.././libstdc++-v3/libsupc++/eh_catch.cc' line='134' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt18uncaught_exceptionv@@GLIBCXX_3.4'>
-        <return type-id='type-id-42'/>
+        <return type-id='type-id-40'/>
       </function-decl>
     </namespace-decl>
     <namespace-decl name='__cxxabiv1'>
       <function-decl name='__cxa_get_exception_ptr' mangled-name='__cxa_get_exception_ptr' filepath='../../.././libstdc++-v3/libsupc++/eh_catch.cc' line='31' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__cxa_get_exception_ptr@@CXXABI_1.3.1'>
-        <parameter type-id='type-id-36'/>
-        <return type-id='type-id-36'/>
+        <parameter type-id='type-id-34'/>
+        <return type-id='type-id-34'/>
       </function-decl>
       <function-decl name='__cxa_end_catch' mangled-name='__cxa_end_catch' filepath='../../.././libstdc++-v3/libsupc++/eh_catch.cc' line='91' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__cxa_end_catch@@CXXABI_1.3'>
         <return type-id='type-id-5'/>
       </function-decl>
-      <class-decl name='__cxa_eh_globals' size-in-bits='128' is-struct='yes' visibility='default' filepath='../../.././libstdc++-v3/libsupc++/unwind-cxx.h' line='138' column='1' id='type-id-95'>
+      <class-decl name='__cxa_eh_globals' size-in-bits='128' is-struct='yes' visibility='default' filepath='../../.././libstdc++-v3/libsupc++/unwind-cxx.h' line='138' column='1' id='type-id-94'>
         <data-member access='public' layout-offset-in-bits='0'>
-          <var-decl name='caughtExceptions' type-id='type-id-60' visibility='default' filepath='../../.././libstdc++-v3/libsupc++/unwind-cxx.h' line='140' column='1'/>
+          <var-decl name='caughtExceptions' type-id='type-id-58' visibility='default' filepath='../../.././libstdc++-v3/libsupc++/unwind-cxx.h' line='140' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='64'>
-          <var-decl name='uncaughtExceptions' type-id='type-id-41' visibility='default' filepath='../../.././libstdc++-v3/libsupc++/unwind-cxx.h' line='141' column='1'/>
+          <var-decl name='uncaughtExceptions' type-id='type-id-39' visibility='default' filepath='../../.././libstdc++-v3/libsupc++/unwind-cxx.h' line='141' column='1'/>
         </data-member>
       </class-decl>
       <function-decl name='__cxa_get_globals' mangled-name='__cxa_get_globals' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/libstdc++-v3/libsupc++/cxxabi.h' line='588' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__cxa_get_globals@@CXXABI_1.3'>
-        <return type-id='type-id-96'/>
+        <return type-id='type-id-95'/>
       </function-decl>
       <function-decl name='__cxa_get_globals_fast' mangled-name='__cxa_get_globals_fast' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/libstdc++-v3/libsupc++/cxxabi.h' line='591' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__cxa_get_globals_fast@@CXXABI_1.3'>
-        <return type-id='type-id-96'/>
+        <return type-id='type-id-95'/>
       </function-decl>
     </namespace-decl>
     <function-decl name='_Unwind_DeleteException' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/host-x86_64-unknown-linux-gnu/gcc/include/unwind.h' line='134' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-56'/>
+      <parameter type-id='type-id-54'/>
       <return type-id='type-id-5'/>
     </function-decl>
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='../../.././libstdc++-v3/libsupc++/eh_exception.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/libsupc++' language='LANG_C_plus_plus'>
-    <pointer-type-def type-id='type-id-97' size-in-bits='64' id='type-id-98'/>
-    <pointer-type-def type-id='type-id-99' size-in-bits='64' id='type-id-100'/>
-    <qualified-type-def type-id='type-id-101' const='yes' id='type-id-102'/>
-    <pointer-type-def type-id='type-id-102' size-in-bits='64' id='type-id-103'/>
-    <qualified-type-def type-id='type-id-11' const='yes' id='type-id-104'/>
-    <pointer-type-def type-id='type-id-104' size-in-bits='64' id='type-id-13'/>
-    <pointer-type-def type-id='type-id-101' size-in-bits='64' id='type-id-105'/>
+    <pointer-type-def type-id='type-id-96' size-in-bits='64' id='type-id-97'/>
+    <pointer-type-def type-id='type-id-98' size-in-bits='64' id='type-id-99'/>
+    <qualified-type-def type-id='type-id-100' const='yes' id='type-id-101'/>
+    <pointer-type-def type-id='type-id-101' size-in-bits='64' id='type-id-102'/>
+    <qualified-type-def type-id='type-id-11' const='yes' id='type-id-103'/>
+    <pointer-type-def type-id='type-id-103' size-in-bits='64' id='type-id-104'/>
+    <pointer-type-def type-id='type-id-100' size-in-bits='64' id='type-id-105'/>
     <namespace-decl name='__cxxabiv1'>
-      <class-decl name='__forced_unwind' size-in-bits='64' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/cxxabi_forced.h' line='48' column='1' id='type-id-97'>
+      <class-decl name='__forced_unwind' size-in-bits='64' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/cxxabi_forced.h' line='48' column='1' id='type-id-96'>
         <member-function access='private' destructor='yes' vtable-offset='-1'>
           <function-decl name='~__forced_unwind' filepath='../../.././libstdc++-v3/libsupc++/eh_exception.cc' line='35' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-98' is-artificial='yes'/>
+            <parameter type-id='type-id-97' is-artificial='yes'/>
             <parameter type-id='type-id-6' is-artificial='yes'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='private' destructor='yes' vtable-offset='-1'>
           <function-decl name='~__forced_unwind' mangled-name='_ZN10__cxxabiv115__forced_unwindD2Ev' filepath='../../.././libstdc++-v3/libsupc++/eh_exception.cc' line='35' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-98' is-artificial='yes'/>
+            <parameter type-id='type-id-97' is-artificial='yes'/>
             <parameter type-id='type-id-6' is-artificial='yes'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='private' destructor='yes' vtable-offset='-1'>
           <function-decl name='~__forced_unwind' mangled-name='_ZN10__cxxabiv115__forced_unwindD0Ev' filepath='../../.././libstdc++-v3/libsupc++/eh_exception.cc' line='35' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-98' is-artificial='yes'/>
+            <parameter type-id='type-id-97' is-artificial='yes'/>
             <parameter type-id='type-id-6' is-artificial='yes'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='private' vtable-offset='2'>
           <function-decl name='__pure_dummy' mangled-name='_ZN10__cxxabiv115__forced_unwind12__pure_dummyEv' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/cxxabi_forced.h' line='53' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-98' is-artificial='yes'/>
+            <parameter type-id='type-id-97' is-artificial='yes'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='__foreign_exception' size-in-bits='64' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/libstdc++-v3/libsupc++/cxxabi.h' line='638' column='1' id='type-id-99'>
+      <class-decl name='__foreign_exception' size-in-bits='64' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/libstdc++-v3/libsupc++/cxxabi.h' line='638' column='1' id='type-id-98'>
         <member-function access='private' destructor='yes' vtable-offset='-1'>
           <function-decl name='~__foreign_exception' filepath='../../.././libstdc++-v3/libsupc++/eh_exception.cc' line='37' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-100' is-artificial='yes'/>
+            <parameter type-id='type-id-99' is-artificial='yes'/>
             <parameter type-id='type-id-6' is-artificial='yes'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='private' destructor='yes' vtable-offset='-1'>
           <function-decl name='~__foreign_exception' mangled-name='_ZN10__cxxabiv119__foreign_exceptionD2Ev' filepath='../../.././libstdc++-v3/libsupc++/eh_exception.cc' line='37' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-100' is-artificial='yes'/>
+            <parameter type-id='type-id-99' is-artificial='yes'/>
             <parameter type-id='type-id-6' is-artificial='yes'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='private' destructor='yes' vtable-offset='-1'>
           <function-decl name='~__foreign_exception' mangled-name='_ZN10__cxxabiv119__foreign_exceptionD0Ev' filepath='../../.././libstdc++-v3/libsupc++/eh_exception.cc' line='37' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-100' is-artificial='yes'/>
+            <parameter type-id='type-id-99' is-artificial='yes'/>
             <parameter type-id='type-id-6' is-artificial='yes'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='private' vtable-offset='2'>
           <function-decl name='__pure_dummy' mangled-name='_ZN10__cxxabiv119__foreign_exception12__pure_dummyEv' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/libstdc++-v3/libsupc++/cxxabi.h' line='641' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-100' is-artificial='yes'/>
+            <parameter type-id='type-id-99' is-artificial='yes'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
       </class-decl>
     </namespace-decl>
     <namespace-decl name='std'>
-      <class-decl name='bad_exception' size-in-bits='64' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/libstdc++-v3/libsupc++/exception' line='75' column='1' id='type-id-101'>
+      <class-decl name='bad_exception' size-in-bits='64' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/libstdc++-v3/libsupc++/exception' line='75' column='1' id='type-id-100'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-11'/>
         <member-function access='private' constructor='yes'>
           <function-decl name='bad_exception' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/libstdc++-v3/libsupc++/exception' line='78' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -4600,7 +4563,7 @@
         </member-function>
         <member-function access='private' const='yes' vtable-offset='2'>
           <function-decl name='what' mangled-name='_ZNKSt13bad_exception4whatEv' filepath='../../.././libstdc++-v3/libsupc++/eh_exception.cc' line='49' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSt13bad_exception4whatEv@@GLIBCXX_3.4.9'>
-            <parameter type-id='type-id-103' is-artificial='yes'/>
+            <parameter type-id='type-id-102' is-artificial='yes'/>
             <return type-id='type-id-4'/>
           </function-decl>
         </member-function>
@@ -4622,21 +4585,21 @@
       <function-decl name='__gxx_personality_v0' mangled-name='__gxx_personality_v0' filepath='../../.././libstdc++-v3/libsupc++/eh_personality.cc' line='345' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__gxx_personality_v0@@CXXABI_1.3'>
         <parameter type-id='type-id-6'/>
         <parameter type-id='type-id-106'/>
-        <parameter type-id='type-id-48'/>
-        <parameter type-id='type-id-56'/>
+        <parameter type-id='type-id-46'/>
+        <parameter type-id='type-id-54'/>
         <parameter type-id='type-id-108'/>
-        <return type-id='type-id-55'/>
+        <return type-id='type-id-53'/>
       </function-decl>
       <function-decl name='__cxa_call_unexpected' mangled-name='__cxa_call_unexpected' filepath='../../.././libstdc++-v3/libsupc++/eh_personality.cc' line='719' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__cxa_call_unexpected@@CXXABI_1.3'>
-        <parameter type-id='type-id-36'/>
+        <parameter type-id='type-id-34'/>
         <return type-id='type-id-5'/>
       </function-decl>
       <function-decl name='__cxa_call_terminate' filepath='../../.././libstdc++-v3/libsupc++/unwind-cxx.h' line='153' column='1' visibility='default' binding='global' size-in-bits='64'>
-        <parameter type-id='type-id-56'/>
+        <parameter type-id='type-id-54'/>
         <return type-id='type-id-5'/>
       </function-decl>
       <function-decl name='__unexpected' mangled-name='_ZN10__cxxabiv112__unexpectedEPFvvE' filepath='../../.././libstdc++-v3/libsupc++/unwind-cxx.h' line='177' column='1' visibility='default' binding='global' size-in-bits='64'>
-        <parameter type-id='type-id-90'/>
+        <parameter type-id='type-id-89'/>
         <return type-id='type-id-5'/>
       </function-decl>
     </namespace-decl>
@@ -4645,35 +4608,35 @@
     </function-decl>
     <function-decl name='_Unwind_GetRegionStart' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/host-x86_64-unknown-linux-gnu/gcc/include/unwind.h' line='172' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-108'/>
-      <return type-id='type-id-52'/>
+      <return type-id='type-id-50'/>
     </function-decl>
     <function-decl name='_Unwind_GetTextRelBase' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/host-x86_64-unknown-linux-gnu/gcc/include/unwind.h' line='234' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-108'/>
-      <return type-id='type-id-52'/>
+      <return type-id='type-id-50'/>
     </function-decl>
     <function-decl name='_Unwind_GetDataRelBase' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/host-x86_64-unknown-linux-gnu/gcc/include/unwind.h' line='233' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-108'/>
-      <return type-id='type-id-52'/>
+      <return type-id='type-id-50'/>
     </function-decl>
     <function-decl name='_Unwind_SetGR' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/host-x86_64-unknown-linux-gnu/gcc/include/unwind.h' line='161' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-108'/>
       <parameter type-id='type-id-6'/>
-      <parameter type-id='type-id-50'/>
+      <parameter type-id='type-id-48'/>
       <return type-id='type-id-5'/>
     </function-decl>
     <function-decl name='_Unwind_SetIP' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/host-x86_64-unknown-linux-gnu/gcc/include/unwind.h' line='165' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-108'/>
-      <parameter type-id='type-id-52'/>
+      <parameter type-id='type-id-50'/>
       <return type-id='type-id-5'/>
     </function-decl>
     <function-decl name='_Unwind_GetLanguageSpecificData' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/host-x86_64-unknown-linux-gnu/gcc/include/unwind.h' line='170' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-108'/>
-      <return type-id='type-id-36'/>
+      <return type-id='type-id-34'/>
     </function-decl>
     <function-decl name='_Unwind_GetIPInfo' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/host-x86_64-unknown-linux-gnu/gcc/include/unwind.h' line='164' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-108'/>
       <parameter type-id='type-id-109'/>
-      <return type-id='type-id-52'/>
+      <return type-id='type-id-50'/>
     </function-decl>
     <class-decl name='_Unwind_Context' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-107'/>
   </abi-instr>
@@ -4691,12 +4654,12 @@
             <typedef-decl name='__safe_bool' type-id='type-id-119' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/exception_ptr.h' line='105' column='1' id='type-id-118'/>
           </member-type>
           <data-member access='private' layout-offset-in-bits='0'>
-            <var-decl name='_M_exception_object' type-id='type-id-36' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/exception_ptr.h' line='77' column='1'/>
+            <var-decl name='_M_exception_object' type-id='type-id-34' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/exception_ptr.h' line='77' column='1'/>
           </data-member>
           <member-function access='private' constructor='yes'>
             <function-decl name='exception_ptr' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/exception_ptr.h' line='79' column='1' visibility='default' binding='global' size-in-bits='64'>
               <parameter type-id='type-id-115' is-artificial='yes'/>
-              <parameter type-id='type-id-36'/>
+              <parameter type-id='type-id-34'/>
               <return type-id='type-id-5'/>
             </function-decl>
           </member-function>
@@ -4715,7 +4678,7 @@
           <member-function access='private' const='yes'>
             <function-decl name='_M_get' mangled-name='_ZNKSt15__exception_ptr13exception_ptr6_M_getEv' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/exception_ptr.h' line='84' column='1' visibility='default' binding='global' size-in-bits='64'>
               <parameter type-id='type-id-113' is-artificial='yes'/>
-              <return type-id='type-id-36'/>
+              <return type-id='type-id-34'/>
             </function-decl>
           </member-function>
           <member-function access='private' constructor='yes'>
@@ -4782,7 +4745,7 @@
           <member-function access='private' const='yes'>
             <function-decl name='operator!' mangled-name='_ZNKSt15__exception_ptr13exception_ptrntEv' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/exception_ptr.h' line='132' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSt15__exception_ptr13exception_ptrntEv@@CXXABI_1.3.3'>
               <parameter type-id='type-id-113' is-artificial='yes'/>
-              <return type-id='type-id-42'/>
+              <return type-id='type-id-40'/>
             </function-decl>
           </member-function>
           <member-function access='private' const='yes'>
@@ -4794,13 +4757,13 @@
           <member-function access='private' const='yes'>
             <function-decl name='operator bool' mangled-name='_ZNKSt15__exception_ptr13exception_ptrcvbEv' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/exception_ptr.h' line='138' column='1' visibility='default' binding='global' size-in-bits='64'>
               <parameter type-id='type-id-113' is-artificial='yes'/>
-              <return type-id='type-id-42'/>
+              <return type-id='type-id-40'/>
             </function-decl>
           </member-function>
           <member-function access='private' const='yes'>
             <function-decl name='__cxa_exception_type' mangled-name='_ZNKSt15__exception_ptr13exception_ptr20__cxa_exception_typeEv' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/exception_ptr.h' line='147' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSt15__exception_ptr13exception_ptr20__cxa_exception_typeEv@@CXXABI_1.3.3'>
               <parameter type-id='type-id-113' is-artificial='yes'/>
-              <return type-id='type-id-40'/>
+              <return type-id='type-id-38'/>
             </function-decl>
           </member-function>
           <member-function access='private' constructor='yes'>
@@ -4826,7 +4789,7 @@
           <member-function access='private' constructor='yes'>
             <function-decl name='exception_ptr' mangled-name='_ZNSt15__exception_ptr13exception_ptrC2EPv' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/exception_ptr.h' line='79' column='1' visibility='default' binding='global' size-in-bits='64'>
               <parameter type-id='type-id-115' is-artificial='yes'/>
-              <parameter type-id='type-id-36'/>
+              <parameter type-id='type-id-34'/>
               <return type-id='type-id-5'/>
             </function-decl>
           </member-function>
@@ -4841,12 +4804,12 @@
         <function-decl name='operator==' mangled-name='_ZNSt15__exception_ptreqERKNS_13exception_ptrES2_' filepath='../../.././libstdc++-v3/libsupc++/eh_ptr.cc' line='146' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt15__exception_ptreqERKNS_13exception_ptrES2_@@CXXABI_1.3.3'>
           <parameter type-id='type-id-112'/>
           <parameter type-id='type-id-112'/>
-          <return type-id='type-id-42'/>
+          <return type-id='type-id-40'/>
         </function-decl>
         <function-decl name='operator!=' mangled-name='_ZNSt15__exception_ptrneERKNS_13exception_ptrES2_' filepath='../../.././libstdc++-v3/libsupc++/eh_ptr.cc' line='152' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt15__exception_ptrneERKNS_13exception_ptrES2_@@CXXABI_1.3.3'>
           <parameter type-id='type-id-112'/>
           <parameter type-id='type-id-112'/>
-          <return type-id='type-id-42'/>
+          <return type-id='type-id-40'/>
         </function-decl>
       </namespace-decl>
       <function-decl name='current_exception' mangled-name='_ZSt17current_exceptionv' filepath='../../.././libstdc++-v3/libsupc++/eh_ptr.cc' line='159' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt17current_exceptionv@@CXXABI_1.3.3'>
@@ -4858,8 +4821,8 @@
       </function-decl>
     </namespace-decl>
     <function-decl name='_Unwind_RaiseException' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/host-x86_64-unknown-linux-gnu/gcc/include/unwind.h' line='122' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-56'/>
-      <return type-id='type-id-55'/>
+      <parameter type-id='type-id-54'/>
+      <return type-id='type-id-53'/>
     </function-decl>
     <function-type size-in-bits='64' method-class-id='type-id-110' id='type-id-116'>
       <parameter type-id='type-id-115' is-artificial='yes'/>
@@ -4870,33 +4833,33 @@
         <var-decl name='__pfn' type-id='type-id-117' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/exception_ptr.h' line='105' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
-        <var-decl name='__delta' type-id='type-id-22' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/exception_ptr.h' line='105' column='1'/>
+        <var-decl name='__delta' type-id='type-id-20' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/exception_ptr.h' line='105' column='1'/>
       </data-member>
     </class-decl>
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='../../.././libstdc++-v3/libsupc++/eh_term_handler.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/libsupc++' language='LANG_C_plus_plus'>
     <namespace-decl name='__cxxabiv1'>
-      <var-decl name='__terminate_handler' type-id='type-id-91' mangled-name='_ZN10__cxxabiv119__terminate_handlerE' visibility='default' filepath='../../.././libstdc++-v3/libsupc++/eh_term_handler.cc' line='40' column='1'/>
+      <var-decl name='__terminate_handler' type-id='type-id-90' mangled-name='_ZN10__cxxabiv119__terminate_handlerE' visibility='default' filepath='../../.././libstdc++-v3/libsupc++/eh_term_handler.cc' line='40' column='1'/>
     </namespace-decl>
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='../../.././libstdc++-v3/libsupc++/eh_terminate.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/libsupc++' language='LANG_C_plus_plus'>
     <namespace-decl name='std'>
       <function-decl name='set_terminate' mangled-name='_ZSt13set_terminatePFvvE' filepath='../../.././libstdc++-v3/libsupc++/eh_terminate.cc' line='67' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt13set_terminatePFvvE@@GLIBCXX_3.4'>
-        <parameter type-id='type-id-91'/>
-        <return type-id='type-id-91'/>
-      </function-decl>
-      <function-decl name='set_unexpected' mangled-name='_ZSt14set_unexpectedPFvvE' filepath='../../.././libstdc++-v3/libsupc++/eh_terminate.cc' line='75' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt14set_unexpectedPFvvE@@GLIBCXX_3.4'>
         <parameter type-id='type-id-90'/>
         <return type-id='type-id-90'/>
       </function-decl>
+      <function-decl name='set_unexpected' mangled-name='_ZSt14set_unexpectedPFvvE' filepath='../../.././libstdc++-v3/libsupc++/eh_terminate.cc' line='75' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt14set_unexpectedPFvvE@@GLIBCXX_3.4'>
+        <parameter type-id='type-id-89'/>
+        <return type-id='type-id-89'/>
+      </function-decl>
     </namespace-decl>
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='../../.././libstdc++-v3/libsupc++/eh_throw.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/libsupc++' language='LANG_C_plus_plus'>
     <namespace-decl name='__cxxabiv1'>
       <function-decl name='__cxa_throw' mangled-name='__cxa_throw' filepath='../../.././libstdc++-v3/libsupc++/eh_throw.cc' line='61' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__cxa_throw@@CXXABI_1.3'>
-        <parameter type-id='type-id-36'/>
-        <parameter type-id='type-id-85'/>
-        <parameter type-id='type-id-88'/>
+        <parameter type-id='type-id-34'/>
+        <parameter type-id='type-id-84'/>
+        <parameter type-id='type-id-87'/>
         <return type-id='type-id-5'/>
       </function-decl>
       <function-decl name='__cxa_rethrow' mangled-name='__cxa_rethrow' filepath='../../.././libstdc++-v3/libsupc++/eh_throw.cc' line='90' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__cxa_rethrow@@CXXABI_1.3'>
@@ -4904,16 +4867,16 @@
       </function-decl>
     </namespace-decl>
     <function-decl name='_Unwind_Resume_or_Rethrow' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/host-x86_64-unknown-linux-gnu/gcc/include/unwind.h' line='144' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-56'/>
-      <return type-id='type-id-55'/>
+      <parameter type-id='type-id-54'/>
+      <return type-id='type-id-53'/>
     </function-decl>
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='../../.././libstdc++-v3/libsupc++/eh_tm.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/libsupc++' language='LANG_C_plus_plus'>
     <namespace-decl name='__cxxabiv1'>
       <function-decl name='__cxa_tm_cleanup' mangled-name='__cxa_tm_cleanup' filepath='../../.././libstdc++-v3/libsupc++/eh_tm.cc' line='67' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__cxa_tm_cleanup@@CXXABI_TM_1'>
-        <parameter type-id='type-id-36'/>
-        <parameter type-id='type-id-36'/>
-        <parameter type-id='type-id-41'/>
+        <parameter type-id='type-id-34'/>
+        <parameter type-id='type-id-34'/>
+        <parameter type-id='type-id-39'/>
         <return type-id='type-id-5'/>
       </function-decl>
     </namespace-decl>
@@ -4921,13 +4884,13 @@
   <abi-instr version='1.0' address-size='64' path='../../.././libstdc++-v3/libsupc++/eh_type.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/libsupc++' language='LANG_C_plus_plus'>
     <namespace-decl name='__cxxabiv1'>
       <function-decl name='__cxa_current_exception_type' mangled-name='__cxa_current_exception_type' filepath='../../.././libstdc++-v3/libsupc++/eh_type.cc' line='36' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__cxa_current_exception_type@@CXXABI_1.3'>
-        <return type-id='type-id-85'/>
+        <return type-id='type-id-84'/>
       </function-decl>
     </namespace-decl>
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='../../.././libstdc++-v3/libsupc++/eh_unex_handler.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/libsupc++' language='LANG_C_plus_plus'>
     <namespace-decl name='__cxxabiv1'>
-      <var-decl name='__unexpected_handler' type-id='type-id-90' mangled-name='_ZN10__cxxabiv120__unexpected_handlerE' visibility='default' filepath='../../.././libstdc++-v3/libsupc++/eh_unex_handler.cc' line='28' column='1'/>
+      <var-decl name='__unexpected_handler' type-id='type-id-89' mangled-name='_ZN10__cxxabiv120__unexpected_handlerE' visibility='default' filepath='../../.././libstdc++-v3/libsupc++/eh_unex_handler.cc' line='28' column='1'/>
     </namespace-decl>
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='../../.././libstdc++-v3/libsupc++/enum_type_info.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/libsupc++' language='LANG_C_plus_plus'>
@@ -5004,7 +4967,7 @@
         <member-function access='protected' const='yes' vtable-offset='3'>
           <function-decl name='__is_function_p' mangled-name='_ZNK10__cxxabiv120__function_type_info15__is_function_pEv' filepath='../../.././libstdc++-v3/libsupc++/function_type_info.cc' line='33' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNK10__cxxabiv120__function_type_info15__is_function_pEv@@CXXABI_1.3'>
             <parameter type-id='type-id-125' is-artificial='yes'/>
-            <return type-id='type-id-42'/>
+            <return type-id='type-id-40'/>
           </function-decl>
         </member-function>
       </class-decl>
@@ -5050,7 +5013,7 @@
     <pointer-type-def type-id='type-id-128' size-in-bits='64' id='type-id-129'/>
     <pointer-type-def type-id='type-id-130' size-in-bits='64' id='type-id-131'/>
     <namespace-decl name='__cxxabiv1'>
-      <typedef-decl name='__guard' type-id='type-id-22' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/x86_64-unknown-linux-gnu/bits/cxxabi_tweaks.h' line='46' column='1' id='type-id-128'/>
+      <typedef-decl name='__guard' type-id='type-id-20' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/x86_64-unknown-linux-gnu/bits/cxxabi_tweaks.h' line='46' column='1' id='type-id-128'/>
       <function-decl name='__cxa_guard_acquire' mangled-name='__cxa_guard_acquire' filepath='../../.././libstdc++-v3/libsupc++/guard.cc' line='232' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__cxa_guard_acquire@@CXXABI_1.3'>
         <parameter type-id='type-id-129'/>
         <return type-id='type-id-6'/>
@@ -5097,9 +5060,9 @@
       </class-decl>
     </namespace-decl>
     <function-decl name='syscall' filepath='/usr/include/unistd.h' line='1068' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-22'/>
+      <parameter type-id='type-id-20'/>
       <parameter is-variadic='yes'/>
-      <return type-id='type-id-22'/>
+      <return type-id='type-id-20'/>
     </function-decl>
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='../../.././libstdc++-v3/libsupc++/guard_error.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/libsupc++' language='LANG_C_plus_plus'>
@@ -5107,10 +5070,10 @@
   <abi-instr version='1.0' address-size='64' path='../../.././libstdc++-v3/libsupc++/hash_bytes.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/libsupc++' language='LANG_C_plus_plus'>
     <namespace-decl name='std'>
       <function-decl name='_Fnv_hash_bytes' mangled-name='_ZSt15_Fnv_hash_bytesPKvmm' filepath='../../.././libstdc++-v3/libsupc++/hash_bytes.cc' line='158' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt15_Fnv_hash_bytesPKvmm@@CXXABI_1.3.5'>
-        <parameter type-id='type-id-36'/>
-        <parameter type-id='type-id-94'/>
-        <parameter type-id='type-id-94'/>
-        <return type-id='type-id-94'/>
+        <parameter type-id='type-id-34'/>
+        <parameter type-id='type-id-93'/>
+        <parameter type-id='type-id-93'/>
+        <return type-id='type-id-93'/>
       </function-decl>
     </namespace-decl>
   </abi-instr>
@@ -5183,42 +5146,42 @@
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='../../.././libstdc++-v3/libsupc++/new_handler.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/libsupc++' language='LANG_C_plus_plus'>
     <namespace-decl name='std'>
-      <typedef-decl name='new_handler' type-id='type-id-89' filepath='../../.././libstdc++-v3/libsupc++/new' line='75' column='1' id='type-id-138'/>
+      <typedef-decl name='new_handler' type-id='type-id-88' filepath='../../.././libstdc++-v3/libsupc++/new' line='75' column='1' id='type-id-138'/>
       <function-decl name='set_new_handler' mangled-name='_ZSt15set_new_handlerPFvvE' filepath='../../.././libstdc++-v3/libsupc++/new_handler.cc' line='36' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt15set_new_handlerPFvvE@@GLIBCXX_3.4'>
         <parameter type-id='type-id-138'/>
         <return type-id='type-id-138'/>
       </function-decl>
-      <var-decl name='nothrow' type-id='type-id-44' mangled-name='_ZSt7nothrow' visibility='default' filepath='../../.././libstdc++-v3/libsupc++/new_handler.cc' line='30' column='1' elf-symbol-id='_ZSt7nothrow@@GLIBCXX_3.4'/>
+      <var-decl name='nothrow' type-id='type-id-42' mangled-name='_ZSt7nothrow' visibility='default' filepath='../../.././libstdc++-v3/libsupc++/new_handler.cc' line='30' column='1' elf-symbol-id='_ZSt7nothrow@@GLIBCXX_3.4'/>
     </namespace-decl>
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='../../.././libstdc++-v3/libsupc++/new_op.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/libsupc++' language='LANG_C_plus_plus'>
     <function-decl name='operator new' mangled-name='_Znwm' filepath='../../.././libstdc++-v3/libsupc++/new_op.cc' line='45' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Znwm@@GLIBCXX_3.4'>
-      <parameter type-id='type-id-94'/>
-      <return type-id='type-id-36'/>
+      <parameter type-id='type-id-93'/>
+      <return type-id='type-id-34'/>
     </function-decl>
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='../../.././libstdc++-v3/libsupc++/new_opnt.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/libsupc++' language='LANG_C_plus_plus'>
     <function-decl name='operator new' mangled-name='_ZnwmRKSt9nothrow_t' filepath='../../.././libstdc++-v3/libsupc++/new_opnt.cc' line='37' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZnwmRKSt9nothrow_t@@GLIBCXX_3.4'>
-      <parameter type-id='type-id-94' name='sz' filepath='../../.././libstdc++-v3/libsupc++/new_opnt.cc' line='37' column='1'/>
-      <parameter type-id='type-id-46'/>
-      <return type-id='type-id-36'/>
+      <parameter type-id='type-id-93' name='sz' filepath='../../.././libstdc++-v3/libsupc++/new_opnt.cc' line='37' column='1'/>
+      <parameter type-id='type-id-44'/>
+      <return type-id='type-id-34'/>
     </function-decl>
     <function-decl name='malloc' filepath='../../.././libstdc++-v3/libsupc++/new_opnt.cc' line='33' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-94'/>
-      <return type-id='type-id-36'/>
+      <parameter type-id='type-id-93'/>
+      <return type-id='type-id-34'/>
     </function-decl>
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='../../.././libstdc++-v3/libsupc++/new_opv.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/libsupc++' language='LANG_C_plus_plus'>
     <function-decl name='operator new []' mangled-name='_Znam' filepath='../../.././libstdc++-v3/libsupc++/new_opv.cc' line='31' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Znam@@GLIBCXX_3.4'>
-      <parameter type-id='type-id-94'/>
-      <return type-id='type-id-36'/>
+      <parameter type-id='type-id-93'/>
+      <return type-id='type-id-34'/>
     </function-decl>
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='../../.././libstdc++-v3/libsupc++/new_opvnt.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/libsupc++' language='LANG_C_plus_plus'>
     <function-decl name='operator new []' mangled-name='_ZnamRKSt9nothrow_t' filepath='../../.././libstdc++-v3/libsupc++/new_opvnt.cc' line='31' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZnamRKSt9nothrow_t@@GLIBCXX_3.4'>
-      <parameter type-id='type-id-94' name='sz' filepath='../../.././libstdc++-v3/libsupc++/new_opnt.cc' line='37' column='1'/>
-      <parameter type-id='type-id-46'/>
-      <return type-id='type-id-36'/>
+      <parameter type-id='type-id-93' name='sz' filepath='../../.././libstdc++-v3/libsupc++/new_opnt.cc' line='37' column='1'/>
+      <parameter type-id='type-id-44'/>
+      <return type-id='type-id-34'/>
     </function-decl>
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='../../.././libstdc++-v3/libsupc++/pbase_type_info.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/libsupc++' language='LANG_C_plus_plus'>
@@ -5232,7 +5195,7 @@
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-3'/>
         <member-type access='private'>
           <enum-decl name='__masks' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/libstdc++-v3/libsupc++/cxxabi.h' line='273' column='1' id='type-id-145'>
-            <underlying-type type-id='type-id-39'/>
+            <underlying-type type-id='type-id-37'/>
             <enumerator name='__const_mask' value='1'/>
             <enumerator name='__volatile_mask' value='2'/>
             <enumerator name='__restrict_mask' value='4'/>
@@ -5241,17 +5204,17 @@
           </enum-decl>
         </member-type>
         <data-member access='private' layout-offset-in-bits='128'>
-          <var-decl name='__flags' type-id='type-id-41' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/libstdc++-v3/libsupc++/cxxabi.h' line='260' column='1'/>
+          <var-decl name='__flags' type-id='type-id-39' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/libstdc++-v3/libsupc++/cxxabi.h' line='260' column='1'/>
         </data-member>
         <data-member access='private' layout-offset-in-bits='192'>
-          <var-decl name='__pointee' type-id='type-id-40' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/libstdc++-v3/libsupc++/cxxabi.h' line='261' column='1'/>
+          <var-decl name='__pointee' type-id='type-id-38' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/libstdc++-v3/libsupc++/cxxabi.h' line='261' column='1'/>
         </data-member>
         <member-function access='private' constructor='yes'>
           <function-decl name='__pbase_type_info' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/libstdc++-v3/libsupc++/cxxabi.h' line='264' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-141' is-artificial='yes'/>
             <parameter type-id='type-id-4'/>
             <parameter type-id='type-id-6'/>
-            <parameter type-id='type-id-40'/>
+            <parameter type-id='type-id-38'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
@@ -5293,19 +5256,19 @@
         <member-function access='protected' const='yes' vtable-offset='4'>
           <function-decl name='__do_catch' mangled-name='_ZNK10__cxxabiv117__pbase_type_info10__do_catchEPKSt9type_infoPPvj' filepath='../../.././libstdc++-v3/libsupc++/pbase_type_info.cc' line='34' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNK10__cxxabiv117__pbase_type_info10__do_catchEPKSt9type_infoPPvj@@CXXABI_1.3'>
             <parameter type-id='type-id-144' is-artificial='yes'/>
-            <parameter type-id='type-id-40'/>
-            <parameter type-id='type-id-37'/>
-            <parameter type-id='type-id-41'/>
-            <return type-id='type-id-42'/>
+            <parameter type-id='type-id-38'/>
+            <parameter type-id='type-id-35'/>
+            <parameter type-id='type-id-39'/>
+            <return type-id='type-id-40'/>
           </function-decl>
         </member-function>
         <member-function access='protected' const='yes' vtable-offset='6'>
           <function-decl name='__pointer_catch' mangled-name='_ZNK10__cxxabiv117__pbase_type_info15__pointer_catchEPKS0_PPvj' filepath='../../.././libstdc++-v3/libsupc++/tinfo.h' line='35' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNK10__cxxabiv117__pbase_type_info15__pointer_catchEPKS0_PPvj@@CXXABI_1.3'>
             <parameter type-id='type-id-144' is-artificial='yes'/>
             <parameter type-id='type-id-144'/>
-            <parameter type-id='type-id-37'/>
-            <parameter type-id='type-id-41'/>
-            <return type-id='type-id-42'/>
+            <parameter type-id='type-id-35'/>
+            <parameter type-id='type-id-39'/>
+            <return type-id='type-id-40'/>
           </function-decl>
         </member-function>
       </class-decl>
@@ -5321,15 +5284,15 @@
       <class-decl name='__pointer_to_member_type_info' size-in-bits='320' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/libstdc++-v3/libsupc++/cxxabi.h' line='324' column='1' id='type-id-146'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-139'/>
         <data-member access='private' layout-offset-in-bits='256'>
-          <var-decl name='__context' type-id='type-id-25' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/libstdc++-v3/libsupc++/cxxabi.h' line='327' column='1'/>
+          <var-decl name='__context' type-id='type-id-23' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/libstdc++-v3/libsupc++/cxxabi.h' line='327' column='1'/>
         </data-member>
         <member-function access='private' constructor='yes'>
           <function-decl name='__pointer_to_member_type_info' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/libstdc++-v3/libsupc++/cxxabi.h' line='330' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-148' is-artificial='yes'/>
             <parameter type-id='type-id-4'/>
             <parameter type-id='type-id-6'/>
-            <parameter type-id='type-id-40'/>
-            <parameter type-id='type-id-25'/>
+            <parameter type-id='type-id-38'/>
+            <parameter type-id='type-id-23'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
@@ -5372,9 +5335,9 @@
           <function-decl name='__pointer_catch' mangled-name='_ZNK10__cxxabiv129__pointer_to_member_type_info15__pointer_catchEPKNS_17__pbase_type_infoEPPvj' filepath='../../.././libstdc++-v3/libsupc++/pmem_type_info.cc' line='33' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNK10__cxxabiv129__pointer_to_member_type_info15__pointer_catchEPKNS_17__pbase_type_infoEPPvj@@CXXABI_1.3'>
             <parameter type-id='type-id-151' is-artificial='yes'/>
             <parameter type-id='type-id-144'/>
-            <parameter type-id='type-id-37'/>
-            <parameter type-id='type-id-41'/>
-            <return type-id='type-id-42'/>
+            <parameter type-id='type-id-35'/>
+            <parameter type-id='type-id-39'/>
+            <return type-id='type-id-40'/>
           </function-decl>
         </member-function>
       </class-decl>
@@ -5392,7 +5355,7 @@
             <parameter type-id='type-id-153' is-artificial='yes'/>
             <parameter type-id='type-id-4'/>
             <parameter type-id='type-id-6'/>
-            <parameter type-id='type-id-40'/>
+            <parameter type-id='type-id-38'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
@@ -5420,16 +5383,16 @@
         <member-function access='protected' const='yes' vtable-offset='2'>
           <function-decl name='__is_pointer_p' mangled-name='_ZNK10__cxxabiv119__pointer_type_info14__is_pointer_pEv' filepath='../../.././libstdc++-v3/libsupc++/pointer_type_info.cc' line='34' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNK10__cxxabiv119__pointer_type_info14__is_pointer_pEv@@CXXABI_1.3'>
             <parameter type-id='type-id-155' is-artificial='yes'/>
-            <return type-id='type-id-42'/>
+            <return type-id='type-id-40'/>
           </function-decl>
         </member-function>
         <member-function access='protected' const='yes' vtable-offset='6'>
           <function-decl name='__pointer_catch' mangled-name='_ZNK10__cxxabiv119__pointer_type_info15__pointer_catchEPKNS_17__pbase_type_infoEPPvj' filepath='../../.././libstdc++-v3/libsupc++/pointer_type_info.cc' line='40' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNK10__cxxabiv119__pointer_type_info15__pointer_catchEPKNS_17__pbase_type_infoEPPvj@@CXXABI_1.3'>
             <parameter type-id='type-id-155' is-artificial='yes'/>
             <parameter type-id='type-id-144'/>
-            <parameter type-id='type-id-37'/>
-            <parameter type-id='type-id-41'/>
-            <return type-id='type-id-42'/>
+            <parameter type-id='type-id-35'/>
+            <parameter type-id='type-id-39'/>
+            <return type-id='type-id-40'/>
           </function-decl>
         </member-function>
       </class-decl>
@@ -5437,7 +5400,7 @@
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='../../.././libstdc++-v3/libsupc++/pure.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/libsupc++' language='LANG_C_plus_plus'>
     <typedef-decl name='ssize_t' type-id='type-id-156' filepath='/usr/include/unistd.h' line='221' column='1' id='type-id-157'/>
-    <typedef-decl name='__ssize_t' type-id='type-id-22' filepath='/usr/include/bits/types.h' line='180' column='1' id='type-id-156'/>
+    <typedef-decl name='__ssize_t' type-id='type-id-20' filepath='/usr/include/bits/types.h' line='180' column='1' id='type-id-156'/>
     <namespace-decl name='__cxxabiv1'>
       <function-decl name='__cxa_pure_virtual' mangled-name='__cxa_pure_virtual' filepath='../../.././libstdc++-v3/libsupc++/pure.cc' line='47' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__cxa_pure_virtual@@CXXABI_1.3'>
         <return type-id='type-id-5'/>
@@ -5448,8 +5411,8 @@
     </namespace-decl>
     <function-decl name='write' filepath='/usr/include/unistd.h' line='363' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-6'/>
-      <parameter type-id='type-id-36'/>
-      <parameter type-id='type-id-92'/>
+      <parameter type-id='type-id-34'/>
+      <parameter type-id='type-id-91'/>
       <return type-id='type-id-157'/>
     </function-decl>
   </abi-instr>
@@ -5461,15 +5424,15 @@
     <pointer-type-def type-id='type-id-161' size-in-bits='64' id='type-id-163'/>
     <namespace-decl name='__cxxabiv1'>
       <class-decl name='__si_class_type_info' size-in-bits='192' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/libstdc++-v3/libsupc++/cxxabi.h' line='478' column='1' id='type-id-158'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-24'/>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-22'/>
         <data-member access='private' layout-offset-in-bits='128'>
-          <var-decl name='__base_type' type-id='type-id-33' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/libstdc++-v3/libsupc++/cxxabi.h' line='481' column='1'/>
+          <var-decl name='__base_type' type-id='type-id-31' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/libstdc++-v3/libsupc++/cxxabi.h' line='481' column='1'/>
         </data-member>
         <member-function access='private' constructor='yes'>
           <function-decl name='__si_class_type_info' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/libstdc++-v3/libsupc++/cxxabi.h' line='484' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-160' is-artificial='yes'/>
             <parameter type-id='type-id-4'/>
-            <parameter type-id='type-id-33'/>
+            <parameter type-id='type-id-31'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
@@ -5511,33 +5474,33 @@
         <member-function access='protected' const='yes' vtable-offset='6'>
           <function-decl name='__do_upcast' mangled-name='_ZNK10__cxxabiv120__si_class_type_info11__do_upcastEPKNS_17__class_type_infoEPKvRNS1_15__upcast_resultE' filepath='../../.././libstdc++-v3/libsupc++/si_class_type_info.cc' line='75' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNK10__cxxabiv120__si_class_type_info11__do_upcastEPKNS_17__class_type_infoEPKvRNS1_15__upcast_resultE@@CXXABI_1.3'>
             <parameter type-id='type-id-163' is-artificial='yes'/>
-            <parameter type-id='type-id-33'/>
-            <parameter type-id='type-id-36'/>
-            <parameter type-id='type-id-30'/>
-            <return type-id='type-id-42'/>
+            <parameter type-id='type-id-31'/>
+            <parameter type-id='type-id-34'/>
+            <parameter type-id='type-id-28'/>
+            <return type-id='type-id-40'/>
           </function-decl>
         </member-function>
         <member-function access='protected' const='yes' vtable-offset='7'>
           <function-decl name='__do_dyncast' mangled-name='_ZNK10__cxxabiv120__si_class_type_info12__do_dyncastElNS_17__class_type_info10__sub_kindEPKS1_PKvS4_S6_RNS1_16__dyncast_resultE' filepath='../../.././libstdc++-v3/libsupc++/si_class_type_info.cc' line='44' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNK10__cxxabiv120__si_class_type_info12__do_dyncastElNS_17__class_type_info10__sub_kindEPKS1_PKvS4_S6_RNS1_16__dyncast_resultE@@CXXABI_1.3'>
             <parameter type-id='type-id-163' is-artificial='yes'/>
-            <parameter type-id='type-id-23'/>
-            <parameter type-id='type-id-38'/>
-            <parameter type-id='type-id-33'/>
-            <parameter type-id='type-id-36'/>
-            <parameter type-id='type-id-33'/>
+            <parameter type-id='type-id-21'/>
             <parameter type-id='type-id-36'/>
-            <parameter type-id='type-id-27'/>
-            <return type-id='type-id-42'/>
+            <parameter type-id='type-id-31'/>
+            <parameter type-id='type-id-34'/>
+            <parameter type-id='type-id-31'/>
+            <parameter type-id='type-id-34'/>
+            <parameter type-id='type-id-25'/>
+            <return type-id='type-id-40'/>
           </function-decl>
         </member-function>
         <member-function access='protected' const='yes' vtable-offset='8'>
           <function-decl name='__do_find_public_src' mangled-name='_ZNK10__cxxabiv120__si_class_type_info20__do_find_public_srcElPKvPKNS_17__class_type_infoES2_' filepath='../../.././libstdc++-v3/libsupc++/si_class_type_info.cc' line='33' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNK10__cxxabiv120__si_class_type_info20__do_find_public_srcElPKvPKNS_17__class_type_infoES2_@@CXXABI_1.3'>
             <parameter type-id='type-id-163' is-artificial='yes'/>
-            <parameter type-id='type-id-23'/>
-            <parameter type-id='type-id-36'/>
-            <parameter type-id='type-id-33'/>
-            <parameter type-id='type-id-36'/>
-            <return type-id='type-id-38'/>
+            <parameter type-id='type-id-21'/>
+            <parameter type-id='type-id-34'/>
+            <parameter type-id='type-id-31'/>
+            <parameter type-id='type-id-34'/>
+            <return type-id='type-id-36'/>
           </function-decl>
         </member-function>
       </class-decl>
@@ -5553,103 +5516,103 @@
     <pointer-type-def type-id='type-id-167' size-in-bits='64' id='type-id-168'/>
     <pointer-type-def type-id='type-id-169' size-in-bits='64' id='type-id-170'/>
     <namespace-decl name='__cxxabiv1'>
-      <typedef-decl name='__cxa_cdtor_type' type-id='type-id-88' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/libstdc++-v3/libsupc++/cxxabi.h' line='65' column='1' id='type-id-171'/>
+      <typedef-decl name='__cxa_cdtor_type' type-id='type-id-87' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/libstdc++-v3/libsupc++/cxxabi.h' line='65' column='1' id='type-id-171'/>
       <function-decl name='__cxa_vec_cleanup' mangled-name='__cxa_vec_cleanup' filepath='../../.././libstdc++-v3/libsupc++/vec.cc' line='253' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__cxa_vec_cleanup@@CXXABI_1.3'>
-        <parameter type-id='type-id-36'/>
-        <parameter type-id='type-id-94'/>
-        <parameter type-id='type-id-94'/>
+        <parameter type-id='type-id-34'/>
+        <parameter type-id='type-id-93'/>
+        <parameter type-id='type-id-93'/>
         <parameter type-id='type-id-171'/>
         <return type-id='type-id-5'/>
       </function-decl>
       <function-decl name='__cxa_vec_dtor' mangled-name='__cxa_vec_dtor' filepath='../../.././libstdc++-v3/libsupc++/vec.cc' line='218' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__cxa_vec_dtor@@CXXABI_1.3'>
-        <parameter type-id='type-id-36'/>
-        <parameter type-id='type-id-94'/>
-        <parameter type-id='type-id-94'/>
+        <parameter type-id='type-id-34'/>
+        <parameter type-id='type-id-93'/>
+        <parameter type-id='type-id-93'/>
         <parameter type-id='type-id-171'/>
         <return type-id='type-id-5'/>
       </function-decl>
       <function-decl name='__cxa_vec_cctor' mangled-name='__cxa_vec_cctor' filepath='../../.././libstdc++-v3/libsupc++/vec.cc' line='187' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__cxa_vec_cctor@@CXXABI_1.3'>
-        <parameter type-id='type-id-36'/>
-        <parameter type-id='type-id-36'/>
-        <parameter type-id='type-id-94'/>
-        <parameter type-id='type-id-94'/>
+        <parameter type-id='type-id-34'/>
+        <parameter type-id='type-id-34'/>
+        <parameter type-id='type-id-93'/>
+        <parameter type-id='type-id-93'/>
         <parameter type-id='type-id-168'/>
         <parameter type-id='type-id-171'/>
         <return type-id='type-id-5'/>
       </function-decl>
       <function-decl name='__cxa_vec_ctor' mangled-name='__cxa_vec_ctor' filepath='../../.././libstdc++-v3/libsupc++/vec.cc' line='159' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__cxa_vec_ctor@@CXXABI_1.3'>
-        <parameter type-id='type-id-36'/>
-        <parameter type-id='type-id-94'/>
-        <parameter type-id='type-id-94'/>
+        <parameter type-id='type-id-34'/>
+        <parameter type-id='type-id-93'/>
+        <parameter type-id='type-id-93'/>
         <parameter type-id='type-id-171'/>
         <parameter type-id='type-id-171'/>
         <return type-id='type-id-5'/>
       </function-decl>
       <function-decl name='__cxa_vec_new3' mangled-name='__cxa_vec_new3' filepath='../../.././libstdc++-v3/libsupc++/vec.cc' line='119' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__cxa_vec_new3@@CXXABI_1.3'>
-        <parameter type-id='type-id-94'/>
-        <parameter type-id='type-id-94'/>
-        <parameter type-id='type-id-94'/>
+        <parameter type-id='type-id-93'/>
+        <parameter type-id='type-id-93'/>
+        <parameter type-id='type-id-93'/>
         <parameter type-id='type-id-171'/>
         <parameter type-id='type-id-171'/>
         <parameter type-id='type-id-170'/>
         <parameter type-id='type-id-166'/>
-        <return type-id='type-id-36'/>
+        <return type-id='type-id-34'/>
       </function-decl>
       <function-decl name='__cxa_vec_new2' mangled-name='__cxa_vec_new2' filepath='../../.././libstdc++-v3/libsupc++/vec.cc' line='78' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__cxa_vec_new2@@CXXABI_1.3'>
-        <parameter type-id='type-id-94'/>
-        <parameter type-id='type-id-94'/>
-        <parameter type-id='type-id-94'/>
+        <parameter type-id='type-id-93'/>
+        <parameter type-id='type-id-93'/>
+        <parameter type-id='type-id-93'/>
         <parameter type-id='type-id-171'/>
         <parameter type-id='type-id-171'/>
         <parameter type-id='type-id-170'/>
-        <parameter type-id='type-id-88'/>
-        <return type-id='type-id-36'/>
+        <parameter type-id='type-id-87'/>
+        <return type-id='type-id-34'/>
       </function-decl>
       <function-decl name='__cxa_vec_new' mangled-name='__cxa_vec_new' filepath='../../.././libstdc++-v3/libsupc++/vec.cc' line='66' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__cxa_vec_new@@CXXABI_1.3'>
-        <parameter type-id='type-id-94'/>
-        <parameter type-id='type-id-94'/>
-        <parameter type-id='type-id-94'/>
+        <parameter type-id='type-id-93'/>
+        <parameter type-id='type-id-93'/>
+        <parameter type-id='type-id-93'/>
         <parameter type-id='type-id-171'/>
         <parameter type-id='type-id-171'/>
-        <return type-id='type-id-36'/>
+        <return type-id='type-id-34'/>
       </function-decl>
       <function-decl name='__cxa_vec_delete2' mangled-name='__cxa_vec_delete2' filepath='../../.././libstdc++-v3/libsupc++/vec.cc' line='293' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__cxa_vec_delete2@@CXXABI_1.3'>
-        <parameter type-id='type-id-36'/>
-        <parameter type-id='type-id-94'/>
-        <parameter type-id='type-id-94'/>
+        <parameter type-id='type-id-34'/>
+        <parameter type-id='type-id-93'/>
+        <parameter type-id='type-id-93'/>
         <parameter type-id='type-id-171'/>
-        <parameter type-id='type-id-88'/>
+        <parameter type-id='type-id-87'/>
         <return type-id='type-id-5'/>
       </function-decl>
       <function-decl name='__cxa_vec_delete' mangled-name='__cxa_vec_delete' filepath='../../.././libstdc++-v3/libsupc++/vec.cc' line='282' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__cxa_vec_delete@@CXXABI_1.3'>
-        <parameter type-id='type-id-36'/>
-        <parameter type-id='type-id-94'/>
-        <parameter type-id='type-id-94'/>
+        <parameter type-id='type-id-34'/>
+        <parameter type-id='type-id-93'/>
+        <parameter type-id='type-id-93'/>
         <parameter type-id='type-id-171'/>
         <return type-id='type-id-5'/>
       </function-decl>
       <function-decl name='__cxa_vec_delete3' mangled-name='__cxa_vec_delete3' filepath='../../.././libstdc++-v3/libsupc++/vec.cc' line='326' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__cxa_vec_delete3@@CXXABI_1.3'>
-        <parameter type-id='type-id-36'/>
-        <parameter type-id='type-id-94'/>
-        <parameter type-id='type-id-94'/>
+        <parameter type-id='type-id-34'/>
+        <parameter type-id='type-id-93'/>
+        <parameter type-id='type-id-93'/>
         <parameter type-id='type-id-171'/>
         <parameter type-id='type-id-166'/>
         <return type-id='type-id-5'/>
       </function-decl>
     </namespace-decl>
     <function-type size-in-bits='64' id='type-id-165'>
-      <parameter type-id='type-id-36'/>
-      <parameter type-id='type-id-94'/>
+      <parameter type-id='type-id-34'/>
+      <parameter type-id='type-id-93'/>
       <return type-id='type-id-5'/>
     </function-type>
     <function-type size-in-bits='64' id='type-id-167'>
-      <parameter type-id='type-id-36'/>
-      <parameter type-id='type-id-36'/>
+      <parameter type-id='type-id-34'/>
+      <parameter type-id='type-id-34'/>
       <return type-id='type-id-5'/>
     </function-type>
     <function-type size-in-bits='64' id='type-id-169'>
-      <parameter type-id='type-id-94'/>
-      <return type-id='type-id-36'/>
+      <parameter type-id='type-id-93'/>
+      <return type-id='type-id-34'/>
     </function-type>
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='../../.././libstdc++-v3/libsupc++/vmi_class_type_info.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/libsupc++' language='LANG_C_plus_plus'>
@@ -5665,7 +5628,7 @@
       <class-decl name='__base_class_type_info' size-in-bits='128' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/libstdc++-v3/libsupc++/cxxabi.h' line='351' column='1' id='type-id-172'>
         <member-type access='private'>
           <enum-decl name='__offset_flags_masks' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/libstdc++-v3/libsupc++/cxxabi.h' line='357' column='1' id='type-id-182'>
-            <underlying-type type-id='type-id-39'/>
+            <underlying-type type-id='type-id-37'/>
             <enumerator name='__virtual_mask' value='1'/>
             <enumerator name='__public_mask' value='2'/>
             <enumerator name='__hwm_bit' value='2'/>
@@ -5673,45 +5636,45 @@
           </enum-decl>
         </member-type>
         <data-member access='private' layout-offset-in-bits='0'>
-          <var-decl name='__base_type' type-id='type-id-33' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/libstdc++-v3/libsupc++/cxxabi.h' line='354' column='1'/>
+          <var-decl name='__base_type' type-id='type-id-31' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/libstdc++-v3/libsupc++/cxxabi.h' line='354' column='1'/>
         </data-member>
         <data-member access='private' layout-offset-in-bits='64'>
-          <var-decl name='__offset_flags' type-id='type-id-22' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/libstdc++-v3/libsupc++/cxxabi.h' line='355' column='1'/>
+          <var-decl name='__offset_flags' type-id='type-id-20' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/libstdc++-v3/libsupc++/cxxabi.h' line='355' column='1'/>
         </data-member>
         <member-function access='private' const='yes'>
           <function-decl name='__is_virtual_p' mangled-name='_ZNK10__cxxabiv122__base_class_type_info14__is_virtual_pEv' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/libstdc++-v3/libsupc++/cxxabi.h' line='367' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-179' is-artificial='yes'/>
-            <return type-id='type-id-42'/>
+            <return type-id='type-id-40'/>
           </function-decl>
         </member-function>
         <member-function access='private' const='yes'>
           <function-decl name='__is_public_p' mangled-name='_ZNK10__cxxabiv122__base_class_type_info13__is_public_pEv' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/libstdc++-v3/libsupc++/cxxabi.h' line='371' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-179' is-artificial='yes'/>
-            <return type-id='type-id-42'/>
+            <return type-id='type-id-40'/>
           </function-decl>
         </member-function>
         <member-function access='private' const='yes'>
           <function-decl name='__offset' mangled-name='_ZNK10__cxxabiv122__base_class_type_info8__offsetEv' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/libstdc++-v3/libsupc++/cxxabi.h' line='375' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-179' is-artificial='yes'/>
-            <return type-id='type-id-23'/>
+            <return type-id='type-id-21'/>
           </function-decl>
         </member-function>
       </class-decl>
       <class-decl name='__vmi_class_type_info' size-in-bits='320' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/libstdc++-v3/libsupc++/cxxabi.h' line='514' column='1' id='type-id-176'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-24'/>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-22'/>
         <member-type access='private'>
           <enum-decl name='__flags_masks' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/libstdc++-v3/libsupc++/cxxabi.h' line='533' column='1' id='type-id-183'>
-            <underlying-type type-id='type-id-39'/>
+            <underlying-type type-id='type-id-37'/>
             <enumerator name='__non_diamond_repeat_mask' value='1'/>
             <enumerator name='__diamond_shaped_mask' value='2'/>
             <enumerator name='__flags_unknown_mask' value='16'/>
           </enum-decl>
         </member-type>
         <data-member access='private' layout-offset-in-bits='128'>
-          <var-decl name='__flags' type-id='type-id-41' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/libstdc++-v3/libsupc++/cxxabi.h' line='517' column='1'/>
+          <var-decl name='__flags' type-id='type-id-39' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/libstdc++-v3/libsupc++/cxxabi.h' line='517' column='1'/>
         </data-member>
         <data-member access='private' layout-offset-in-bits='160'>
-          <var-decl name='__base_count' type-id='type-id-41' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/libstdc++-v3/libsupc++/cxxabi.h' line='518' column='1'/>
+          <var-decl name='__base_count' type-id='type-id-39' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/libstdc++-v3/libsupc++/cxxabi.h' line='518' column='1'/>
         </data-member>
         <data-member access='private' layout-offset-in-bits='192'>
           <var-decl name='__base_info' type-id='type-id-173' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/libstdc++-v3/libsupc++/cxxabi.h' line='523' column='1'/>
@@ -5748,40 +5711,40 @@
         <member-function access='protected' const='yes' vtable-offset='6'>
           <function-decl name='__do_upcast' mangled-name='_ZNK10__cxxabiv121__vmi_class_type_info11__do_upcastEPKNS_17__class_type_infoEPKvRNS1_15__upcast_resultE' filepath='../../.././libstdc++-v3/libsupc++/vmi_class_type_info.cc' line='305' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNK10__cxxabiv121__vmi_class_type_info11__do_upcastEPKNS_17__class_type_infoEPKvRNS1_15__upcast_resultE@@CXXABI_1.3'>
             <parameter type-id='type-id-181' is-artificial='yes'/>
-            <parameter type-id='type-id-33'/>
-            <parameter type-id='type-id-36'/>
-            <parameter type-id='type-id-30'/>
-            <return type-id='type-id-42'/>
+            <parameter type-id='type-id-31'/>
+            <parameter type-id='type-id-34'/>
+            <parameter type-id='type-id-28'/>
+            <return type-id='type-id-40'/>
           </function-decl>
         </member-function>
         <member-function access='protected' const='yes' vtable-offset='7'>
           <function-decl name='__do_dyncast' mangled-name='_ZNK10__cxxabiv121__vmi_class_type_info12__do_dyncastElNS_17__class_type_info10__sub_kindEPKS1_PKvS4_S6_RNS1_16__dyncast_resultE' filepath='../../.././libstdc++-v3/libsupc++/vmi_class_type_info.cc' line='80' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNK10__cxxabiv121__vmi_class_type_info12__do_dyncastElNS_17__class_type_info10__sub_kindEPKS1_PKvS4_S6_RNS1_16__dyncast_resultE@@CXXABI_1.3'>
             <parameter type-id='type-id-181' is-artificial='yes'/>
-            <parameter type-id='type-id-23'/>
-            <parameter type-id='type-id-38'/>
-            <parameter type-id='type-id-33'/>
-            <parameter type-id='type-id-36'/>
-            <parameter type-id='type-id-33'/>
+            <parameter type-id='type-id-21'/>
             <parameter type-id='type-id-36'/>
-            <parameter type-id='type-id-27'/>
-            <return type-id='type-id-42'/>
+            <parameter type-id='type-id-31'/>
+            <parameter type-id='type-id-34'/>
+            <parameter type-id='type-id-31'/>
+            <parameter type-id='type-id-34'/>
+            <parameter type-id='type-id-25'/>
+            <return type-id='type-id-40'/>
           </function-decl>
         </member-function>
         <member-function access='protected' const='yes' vtable-offset='8'>
           <function-decl name='__do_find_public_src' mangled-name='_ZNK10__cxxabiv121__vmi_class_type_info20__do_find_public_srcElPKvPKNS_17__class_type_infoES2_' filepath='../../.././libstdc++-v3/libsupc++/vmi_class_type_info.cc' line='33' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNK10__cxxabiv121__vmi_class_type_info20__do_find_public_srcElPKvPKNS_17__class_type_infoES2_@@CXXABI_1.3'>
             <parameter type-id='type-id-181' is-artificial='yes'/>
-            <parameter type-id='type-id-23'/>
-            <parameter type-id='type-id-36'/>
-            <parameter type-id='type-id-33'/>
-            <parameter type-id='type-id-36'/>
-            <return type-id='type-id-38'/>
+            <parameter type-id='type-id-21'/>
+            <parameter type-id='type-id-34'/>
+            <parameter type-id='type-id-31'/>
+            <parameter type-id='type-id-34'/>
+            <return type-id='type-id-36'/>
           </function-decl>
         </member-function>
       </class-decl>
     </namespace-decl>
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='../../.././libstdc++-v3/libsupc++/vterminate.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/libsupc++' language='LANG_C_plus_plus'>
-    <pointer-type-def type-id='type-id-92' size-in-bits='64' id='type-id-184'/>
+    <pointer-type-def type-id='type-id-91' size-in-bits='64' id='type-id-184'/>
     <namespace-decl name='__gnu_cxx'>
       <function-decl name='__verbose_terminate_handler' mangled-name='_ZN9__gnu_cxx27__verbose_terminate_handlerEv' filepath='../../.././libstdc++-v3/libsupc++/vterminate.cc' line='44' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN9__gnu_cxx27__verbose_terminate_handlerEv@@CXXABI_1.3'>
         <return type-id='type-id-5'/>
@@ -5790,10 +5753,10 @@
     <namespace-decl name='__cxxabiv1'>
       <function-decl name='__cxa_demangle' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/libstdc++-v3/libsupc++/cxxabi.h' line='193' column='1' visibility='default' binding='global' size-in-bits='64'>
         <parameter type-id='type-id-4'/>
-        <parameter type-id='type-id-93'/>
+        <parameter type-id='type-id-92'/>
         <parameter type-id='type-id-184'/>
         <parameter type-id='type-id-109'/>
-        <return type-id='type-id-93'/>
+        <return type-id='type-id-92'/>
       </function-decl>
     </namespace-decl>
     <function-decl name='fputs' filepath='/usr/include/stdio.h' line='684' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -5805,28 +5768,28 @@
   <abi-instr version='1.0' address-size='64' path='cp-demangle.c' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/libsupc++' language='LANG_C89'>
     <function-decl name='__cxa_demangle' mangled-name='__cxa_demangle' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/libsupc++/cp-demangle.c' line='5305' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__cxa_demangle@@CXXABI_1.3'>
       <parameter type-id='type-id-4' name='mangled_name' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/libsupc++/cp-demangle.c' line='5305' column='1'/>
-      <parameter type-id='type-id-93' name='output_buffer' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/libsupc++/cp-demangle.c' line='5305' column='1'/>
+      <parameter type-id='type-id-92' name='output_buffer' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/libsupc++/cp-demangle.c' line='5305' column='1'/>
       <parameter type-id='type-id-184' name='length' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/libsupc++/cp-demangle.c' line='5306' column='1'/>
       <parameter type-id='type-id-109' name='status' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/libsupc++/cp-demangle.c' line='5306' column='1'/>
-      <return type-id='type-id-93'/>
+      <return type-id='type-id-92'/>
     </function-decl>
     <function-decl name='memcmp' filepath='/usr/include/string.h' line='68' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-36'/>
-      <parameter type-id='type-id-36'/>
-      <parameter type-id='type-id-92'/>
+      <parameter type-id='type-id-34'/>
+      <parameter type-id='type-id-34'/>
+      <parameter type-id='type-id-91'/>
       <return type-id='type-id-6'/>
     </function-decl>
     <function-decl name='strlen' filepath='/usr/include/string.h' line='399' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-4'/>
-      <return type-id='type-id-92'/>
+      <return type-id='type-id-91'/>
     </function-decl>
     <function-decl name='realloc' filepath='/usr/include/stdlib.h' line='485' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-36'/>
-      <parameter type-id='type-id-92'/>
-      <return type-id='type-id-36'/>
+      <parameter type-id='type-id-34'/>
+      <parameter type-id='type-id-91'/>
+      <return type-id='type-id-34'/>
     </function-decl>
     <function-decl name='sprintf' filepath='/usr/include/stdio.h' line='363' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-93'/>
+      <parameter type-id='type-id-92'/>
       <parameter type-id='type-id-4'/>
       <parameter is-variadic='yes'/>
       <return type-id='type-id-6'/>
@@ -5837,10 +5800,10 @@
       <subrange length='40' type-id='type-id-174' id='type-id-188'/>
     </array-type-def>
     <typedef-decl name='clock_t' type-id='type-id-189' filepath='/usr/include/time.h' line='60' column='1' id='type-id-190'/>
-    <typedef-decl name='__clock_t' type-id='type-id-22' filepath='/usr/include/bits/types.h' line='145' column='1' id='type-id-189'/>
+    <typedef-decl name='__clock_t' type-id='type-id-20' filepath='/usr/include/bits/types.h' line='145' column='1' id='type-id-189'/>
     <typedef-decl name='time_t' type-id='type-id-191' filepath='/usr/include/time.h' line='76' column='1' id='type-id-192'/>
-    <typedef-decl name='__time_t' type-id='type-id-22' filepath='/usr/include/bits/types.h' line='149' column='1' id='type-id-191'/>
-    <typedef-decl name='__gthread_mutex_t' type-id='type-id-193' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/x86_64-unknown-linux-gnu/bits/gthr-default.h' line='56' column='1' id='type-id-70'/>
+    <typedef-decl name='__time_t' type-id='type-id-20' filepath='/usr/include/bits/types.h' line='149' column='1' id='type-id-191'/>
+    <typedef-decl name='__gthread_mutex_t' type-id='type-id-193' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/x86_64-unknown-linux-gnu/bits/gthr-default.h' line='56' column='1' id='type-id-68'/>
     <typedef-decl name='pthread_mutex_t' type-id='type-id-194' filepath='/usr/include/bits/pthreadtypes.h' line='104' column='1' id='type-id-193'/>
     <typedef-decl name='__pthread_list_t' type-id='type-id-195' filepath='/usr/include/bits/pthreadtypes.h' line='65' column='1' id='type-id-196'/>
     <class-decl name='__pthread_internal_list' size-in-bits='128' is-struct='yes' visibility='default' filepath='/usr/include/bits/pthreadtypes.h' line='61' column='1' id='type-id-195'>
@@ -5851,7 +5814,7 @@
         <var-decl name='__next' type-id='type-id-197' visibility='default' filepath='/usr/include/bits/pthreadtypes.h' line='64' column='1'/>
       </data-member>
     </class-decl>
-    <typedef-decl name='intmax_t' type-id='type-id-22' filepath='/usr/include/stdint.h' line='135' column='1' id='type-id-198'/>
+    <typedef-decl name='intmax_t' type-id='type-id-20' filepath='/usr/include/stdint.h' line='135' column='1' id='type-id-198'/>
     <pointer-type-def type-id='type-id-195' size-in-bits='64' id='type-id-197'/>
     <qualified-type-def type-id='type-id-198' const='yes' id='type-id-199'/>
     <qualified-type-def type-id='type-id-200' const='yes' id='type-id-201'/>
@@ -5890,7 +5853,7 @@
             <function-decl name='test_and_set' mangled-name='_ZNSt9__atomic011atomic_flag12test_and_setESt12memory_order' filepath='../../.././libstdc++-v3/src/c++11/compatibility-atomic-c++0x.cc' line='67' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt9__atomic011atomic_flag12test_and_setESt12memory_order@@GLIBCXX_3.4.14'>
               <parameter type-id='type-id-218' is-artificial='yes'/>
               <parameter type-id='type-id-237'/>
-              <return type-id='type-id-42'/>
+              <return type-id='type-id-40'/>
             </function-decl>
           </member-function>
           <member-function access='public'>
@@ -5907,9 +5870,9 @@
           <var-decl name='_M_i' type-id='type-id-238' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/atomic_base.h' line='236' column='1'/>
         </data-member>
       </class-decl>
-      <typedef-decl name='__atomic_flag_data_type' type-id='type-id-42' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/atomic_base.h' line='217' column='1' id='type-id-238'/>
+      <typedef-decl name='__atomic_flag_data_type' type-id='type-id-40' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/atomic_base.h' line='217' column='1' id='type-id-238'/>
       <enum-decl name='memory_order' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/atomic_base.h' line='52' column='1' id='type-id-239'>
-        <underlying-type type-id='type-id-39'/>
+        <underlying-type type-id='type-id-37'/>
         <enumerator name='memory_order_relaxed' value='0'/>
         <enumerator name='memory_order_consume' value='1'/>
         <enumerator name='memory_order_acquire' value='2'/>
@@ -5921,7 +5884,7 @@
       <function-decl name='atomic_flag_test_and_set_explicit' mangled-name='atomic_flag_test_and_set_explicit' filepath='../../.././libstdc++-v3/src/c++11/compatibility-atomic-c++0x.cc' line='97' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='atomic_flag_test_and_set_explicit@@GLIBCXX_3.4.11'>
         <parameter type-id='type-id-220'/>
         <parameter type-id='type-id-237'/>
-        <return type-id='type-id-42'/>
+        <return type-id='type-id-40'/>
       </function-decl>
       <function-decl name='atomic_flag_clear_explicit' mangled-name='atomic_flag_clear_explicit' filepath='../../.././libstdc++-v3/src/c++11/compatibility-atomic-c++0x.cc' line='105' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='atomic_flag_clear_explicit@@GLIBCXX_3.4.11'>
         <parameter type-id='type-id-220'/>
@@ -6026,7 +5989,7 @@
         <member-function access='private'>
           <function-decl name='try_lock' mangled-name='_ZNSt5mutex8try_lockEv' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/mutex' line='178' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-233' is-artificial='yes'/>
-            <return type-id='type-id-42'/>
+            <return type-id='type-id-40'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
@@ -6044,7 +6007,7 @@
       </class-decl>
       <class-decl name='__mutex_base' size-in-bits='320' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/mutex' line='57' column='1' id='type-id-200'>
         <member-type access='protected'>
-          <typedef-decl name='__native_type' type-id='type-id-70' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/mutex' line='60' column='1' id='type-id-223'/>
+          <typedef-decl name='__native_type' type-id='type-id-68' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/mutex' line='60' column='1' id='type-id-223'/>
         </member-type>
         <data-member access='protected' layout-offset-in-bits='0'>
           <var-decl name='_M_mutex' type-id='type-id-223' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/mutex' line='63' column='1'/>
@@ -6103,7 +6066,7 @@
         <member-function access='public' constructor='yes'>
           <function-decl name='atomic_flag' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/atomic_base.h' line='253' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-226' is-artificial='yes'/>
-            <parameter type-id='type-id-42'/>
+            <parameter type-id='type-id-40'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
@@ -6111,7 +6074,7 @@
           <function-decl name='test_and_set' mangled-name='_ZNSt11atomic_flag12test_and_setESt12memory_order' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/atomic_base.h' line='258' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-226' is-artificial='yes'/>
             <parameter type-id='type-id-237'/>
-            <return type-id='type-id-42'/>
+            <return type-id='type-id-40'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
@@ -6123,7 +6086,7 @@
         </member-function>
         <member-function access='private' static='yes'>
           <function-decl name='_S_init' mangled-name='_ZNSt11atomic_flag7_S_initEb' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/atomic_base.h' line='291' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-42'/>
+            <parameter type-id='type-id-40'/>
             <return type-id='type-id-238'/>
           </function-decl>
         </member-function>
@@ -6199,11 +6162,11 @@
     </function-decl>
     <function-decl name='asctime' filepath='/usr/include/time.h' line='255' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-253'/>
-      <return type-id='type-id-93'/>
+      <return type-id='type-id-92'/>
     </function-decl>
     <function-decl name='ctime' filepath='/usr/include/time.h' line='258' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-213'/>
-      <return type-id='type-id-93'/>
+      <return type-id='type-id-92'/>
     </function-decl>
     <function-decl name='gmtime' filepath='/usr/include/time.h' line='233' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-213'/>
@@ -6214,11 +6177,11 @@
       <return type-id='type-id-236'/>
     </function-decl>
     <function-decl name='strftime' filepath='/usr/include/time.h' line='199' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-93'/>
       <parameter type-id='type-id-92'/>
+      <parameter type-id='type-id-91'/>
       <parameter type-id='type-id-4'/>
       <parameter type-id='type-id-253'/>
-      <return type-id='type-id-92'/>
+      <return type-id='type-id-91'/>
     </function-decl>
     <union-decl name='__anonymous_union__' size-in-bits='320' is-anonymous='yes' visibility='default' filepath='/usr/include/bits/pthreadtypes.h' line='77' column='1' id='type-id-194'>
       <member-type access='private'>
@@ -6227,13 +6190,13 @@
             <var-decl name='__lock' type-id='type-id-6' visibility='default' filepath='/usr/include/bits/pthreadtypes.h' line='80' column='1'/>
           </data-member>
           <data-member access='public' layout-offset-in-bits='32'>
-            <var-decl name='__count' type-id='type-id-41' visibility='default' filepath='/usr/include/bits/pthreadtypes.h' line='81' column='1'/>
+            <var-decl name='__count' type-id='type-id-39' visibility='default' filepath='/usr/include/bits/pthreadtypes.h' line='81' column='1'/>
           </data-member>
           <data-member access='public' layout-offset-in-bits='64'>
             <var-decl name='__owner' type-id='type-id-6' visibility='default' filepath='/usr/include/bits/pthreadtypes.h' line='82' column='1'/>
           </data-member>
           <data-member access='public' layout-offset-in-bits='96'>
-            <var-decl name='__nusers' type-id='type-id-41' visibility='default' filepath='/usr/include/bits/pthreadtypes.h' line='84' column='1'/>
+            <var-decl name='__nusers' type-id='type-id-39' visibility='default' filepath='/usr/include/bits/pthreadtypes.h' line='84' column='1'/>
           </data-member>
           <data-member access='public' layout-offset-in-bits='128'>
             <var-decl name='__kind' type-id='type-id-6' visibility='default' filepath='/usr/include/bits/pthreadtypes.h' line='88' column='1'/>
@@ -6253,7 +6216,7 @@
         <var-decl name='__size' type-id='type-id-187' visibility='default' filepath='/usr/include/bits/pthreadtypes.h' line='102' column='1'/>
       </data-member>
       <data-member access='private'>
-        <var-decl name='__align' type-id='type-id-22' visibility='default' filepath='/usr/include/bits/pthreadtypes.h' line='103' column='1'/>
+        <var-decl name='__align' type-id='type-id-20' visibility='default' filepath='/usr/include/bits/pthreadtypes.h' line='103' column='1'/>
       </data-member>
     </union-decl>
   </abi-instr>
@@ -6280,19 +6243,19 @@
     <typedef-decl name='ldiv_t' type-id='type-id-262' filepath='/usr/include/stdlib.h' line='110' column='1' id='type-id-263'/>
     <class-decl name='__anonymous_struct__2' size-in-bits='128' is-struct='yes' is-anonymous='yes' naming-typedef-id='type-id-263' visibility='default' filepath='/usr/include/stdlib.h' line='107' column='1' id='type-id-262'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='quot' type-id='type-id-22' visibility='default' filepath='/usr/include/stdlib.h' line='108' column='1'/>
+        <var-decl name='quot' type-id='type-id-20' visibility='default' filepath='/usr/include/stdlib.h' line='108' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
-        <var-decl name='rem' type-id='type-id-22' visibility='default' filepath='/usr/include/stdlib.h' line='109' column='1'/>
+        <var-decl name='rem' type-id='type-id-20' visibility='default' filepath='/usr/include/stdlib.h' line='109' column='1'/>
       </data-member>
     </class-decl>
     <reference-type-def kind='lvalue' type-id='type-id-264' size-in-bits='64' id='type-id-265'/>
     <pointer-type-def type-id='type-id-264' size-in-bits='64' id='type-id-266'/>
     <reference-type-def kind='lvalue' type-id='type-id-267' size-in-bits='64' id='type-id-268'/>
     <pointer-type-def type-id='type-id-267' size-in-bits='64' id='type-id-269'/>
-    <qualified-type-def type-id='type-id-93' const='yes' id='type-id-270'/>
+    <qualified-type-def type-id='type-id-92' const='yes' id='type-id-270'/>
     <reference-type-def kind='lvalue' type-id='type-id-270' size-in-bits='64' id='type-id-271'/>
-    <pointer-type-def type-id='type-id-93' size-in-bits='64' id='type-id-272'/>
+    <pointer-type-def type-id='type-id-92' size-in-bits='64' id='type-id-272'/>
     <qualified-type-def type-id='type-id-264' const='yes' id='type-id-273'/>
     <pointer-type-def type-id='type-id-273' size-in-bits='64' id='type-id-274'/>
     <qualified-type-def type-id='type-id-275' const='yes' id='type-id-276'/>
@@ -6301,7 +6264,7 @@
     <pointer-type-def type-id='type-id-278' size-in-bits='64' id='type-id-279'/>
     <qualified-type-def type-id='type-id-280' const='yes' id='type-id-281'/>
     <reference-type-def kind='lvalue' type-id='type-id-281' size-in-bits='64' id='type-id-282'/>
-    <qualified-type-def type-id='type-id-42' const='yes' id='type-id-243'/>
+    <qualified-type-def type-id='type-id-40' const='yes' id='type-id-243'/>
     <reference-type-def kind='lvalue' type-id='type-id-283' size-in-bits='64' id='type-id-284'/>
     <qualified-type-def type-id='type-id-285' const='yes' id='type-id-286'/>
     <reference-type-def kind='lvalue' type-id='type-id-286' size-in-bits='64' id='type-id-287'/>
@@ -6337,7 +6300,7 @@
     <pointer-type-def type-id='type-id-294' size-in-bits='64' id='type-id-329'/>
     <pointer-type-def type-id='type-id-312' size-in-bits='64' id='type-id-330'/>
     <pointer-type-def type-id='type-id-315' size-in-bits='64' id='type-id-331'/>
-    <pointer-type-def type-id='type-id-332' size-in-bits='64' id='type-id-89'/>
+    <pointer-type-def type-id='type-id-332' size-in-bits='64' id='type-id-88'/>
     <qualified-type-def type-id='type-id-333' const='yes' id='type-id-334'/>
     <reference-type-def kind='lvalue' type-id='type-id-334' size-in-bits='64' id='type-id-335'/>
     <namespace-decl name='std'>
@@ -6375,17 +6338,17 @@
         </class-decl>
       </namespace-decl>
       <function-decl name='_Hash_bytes' mangled-name='_ZSt11_Hash_bytesPKvmm' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/hash_bytes.h' line='47' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt11_Hash_bytesPKvmm@@CXXABI_1.3.5'>
-        <parameter type-id='type-id-36'/>
-        <parameter type-id='type-id-94'/>
-        <parameter type-id='type-id-94'/>
-        <return type-id='type-id-94'/>
+        <parameter type-id='type-id-34'/>
+        <parameter type-id='type-id-93'/>
+        <parameter type-id='type-id-93'/>
+        <return type-id='type-id-93'/>
       </function-decl>
       <class-decl name='initializer_list&lt;char&gt;' size-in-bits='128' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/libstdc++-v3/libsupc++/initializer_list' line='47' column='1' id='type-id-312'>
         <member-type access='private'>
           <typedef-decl name='iterator' type-id='type-id-4' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/libstdc++-v3/libsupc++/initializer_list' line='54' column='1' id='type-id-342'/>
         </member-type>
         <member-type access='private'>
-          <typedef-decl name='size_type' type-id='type-id-94' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/libstdc++-v3/libsupc++/initializer_list' line='53' column='1' id='type-id-343'/>
+          <typedef-decl name='size_type' type-id='type-id-93' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/libstdc++-v3/libsupc++/initializer_list' line='53' column='1' id='type-id-343'/>
         </member-type>
         <member-type access='private'>
           <typedef-decl name='const_iterator' type-id='type-id-4' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/libstdc++-v3/libsupc++/initializer_list' line='55' column='1' id='type-id-344'/>
@@ -6437,7 +6400,7 @@
           <typedef-decl name='difference_type' type-id='type-id-349' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/stl_iterator_base_types.h' line='180' column='1' id='type-id-348'/>
         </member-type>
         <member-type access='public'>
-          <typedef-decl name='pointer' type-id='type-id-93' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/stl_iterator_base_types.h' line='181' column='1' id='type-id-350'/>
+          <typedef-decl name='pointer' type-id='type-id-92' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/stl_iterator_base_types.h' line='181' column='1' id='type-id-350'/>
         </member-type>
         <member-type access='public'>
           <typedef-decl name='reference' type-id='type-id-352' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/stl_iterator_base_types.h' line='182' column='1' id='type-id-351'/>
@@ -6448,7 +6411,7 @@
           <typedef-decl name='iterator' type-id='type-id-354' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/libstdc++-v3/libsupc++/initializer_list' line='54' column='1' id='type-id-353'/>
         </member-type>
         <member-type access='private'>
-          <typedef-decl name='size_type' type-id='type-id-94' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/libstdc++-v3/libsupc++/initializer_list' line='53' column='1' id='type-id-355'/>
+          <typedef-decl name='size_type' type-id='type-id-93' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/libstdc++-v3/libsupc++/initializer_list' line='53' column='1' id='type-id-355'/>
         </member-type>
         <member-type access='private'>
           <typedef-decl name='const_iterator' type-id='type-id-354' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/libstdc++-v3/libsupc++/initializer_list' line='55' column='1' id='type-id-356'/>
@@ -6509,33 +6472,33 @@
       <class-decl name='_Hash_impl' size-in-bits='8' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/functional_hash.h' line='131' column='1' id='type-id-363'>
         <member-function access='public' static='yes'>
           <function-decl name='hash' mangled-name='_ZNSt10_Hash_impl4hashEPKvmm' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/functional_hash.h' line='134' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-36'/>
-            <parameter type-id='type-id-94'/>
-            <parameter type-id='type-id-94'/>
-            <return type-id='type-id-94'/>
+            <parameter type-id='type-id-34'/>
+            <parameter type-id='type-id-93'/>
+            <parameter type-id='type-id-93'/>
+            <return type-id='type-id-93'/>
           </function-decl>
         </member-function>
         <member-function access='public' static='yes'>
           <function-decl name='hash&lt;int&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/functional_hash.h' line='140' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-284'/>
-            <return type-id='type-id-94'/>
+            <return type-id='type-id-93'/>
           </function-decl>
         </member-function>
         <member-function access='public' static='yes'>
           <function-decl name='__hash_combine&lt;const std::error_category*&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/functional_hash.h' line='145' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-290'/>
-            <parameter type-id='type-id-94'/>
-            <return type-id='type-id-94'/>
+            <parameter type-id='type-id-93'/>
+            <return type-id='type-id-93'/>
           </function-decl>
         </member-function>
         <member-function access='public' static='yes'>
           <function-decl name='hash&lt;void*&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/functional_hash.h' line='140' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-364'/>
-            <return type-id='type-id-94'/>
+            <return type-id='type-id-93'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='error_category' size-in-bits='64' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/system_error' line='66' column='1' is-declaration-only='yes' id='type-id-285'>
+      <class-decl name='error_category' size-in-bits='64' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/system_error' line='66' column='1' id='type-id-285'>
         <member-function access='protected' constructor='yes'>
           <function-decl name='error_category' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/system_error' line='66' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-365' is-artificial='yes'/>
@@ -6560,21 +6523,21 @@
           <function-decl name='operator&lt;' mangled-name='_ZNKSt14error_categoryltERKS_' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/system_error' line='93' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-288' is-artificial='yes'/>
             <parameter type-id='type-id-287'/>
-            <return type-id='type-id-42'/>
+            <return type-id='type-id-40'/>
           </function-decl>
         </member-function>
         <member-function access='private' const='yes'>
           <function-decl name='operator==' mangled-name='_ZNKSt14error_categoryeqERKS_' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/system_error' line='97' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-288' is-artificial='yes'/>
             <parameter type-id='type-id-287'/>
-            <return type-id='type-id-42'/>
+            <return type-id='type-id-40'/>
           </function-decl>
         </member-function>
         <member-function access='private' const='yes'>
           <function-decl name='operator!=' mangled-name='_ZNKSt14error_categoryneERKS_' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/system_error' line='101' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-288' is-artificial='yes'/>
             <parameter type-id='type-id-287'/>
-            <return type-id='type-id-42'/>
+            <return type-id='type-id-40'/>
           </function-decl>
         </member-function>
         <member-function access='protected' constructor='yes'>
@@ -6629,7 +6592,7 @@
             <parameter type-id='type-id-288' is-artificial='yes'/>
             <parameter type-id='type-id-6'/>
             <parameter type-id='type-id-367'/>
-            <return type-id='type-id-42'/>
+            <return type-id='type-id-40'/>
           </function-decl>
         </member-function>
         <member-function access='private' const='yes' vtable-offset='6'>
@@ -6637,7 +6600,7 @@
             <parameter type-id='type-id-288' is-artificial='yes'/>
             <parameter type-id='type-id-368'/>
             <parameter type-id='type-id-6'/>
-            <return type-id='type-id-42'/>
+            <return type-id='type-id-40'/>
           </function-decl>
         </member-function>
       </class-decl>
@@ -6650,37 +6613,37 @@
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='exception' size-in-bits='64' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/libstdc++-v3/libsupc++/exception' line='62' column='1' is-declaration-only='yes' id='type-id-11'>
+      <class-decl name='exception' size-in-bits='64' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/libstdc++-v3/libsupc++/exception' line='62' column='1' id='type-id-11'>
         <member-function access='private' constructor='yes'>
           <function-decl name='exception' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/libstdc++-v3/libsupc++/exception' line='65' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-12' is-artificial='yes'/>
+            <parameter type-id='type-id-83' is-artificial='yes'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='private' destructor='yes' vtable-offset='-1'>
           <function-decl name='~exception' filepath='../../.././libstdc++-v3/libsupc++/eh_exception.cc' line='31' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-12' is-artificial='yes'/>
+            <parameter type-id='type-id-83' is-artificial='yes'/>
             <parameter type-id='type-id-6' is-artificial='yes'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='private' destructor='yes' vtable-offset='-1'>
           <function-decl name='~exception' mangled-name='_ZNSt9exceptionD0Ev' filepath='../../.././libstdc++-v3/libsupc++/eh_exception.cc' line='31' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt9exceptionD0Ev@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-12' is-artificial='yes'/>
+            <parameter type-id='type-id-83' is-artificial='yes'/>
             <parameter type-id='type-id-6' is-artificial='yes'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='private' destructor='yes' vtable-offset='-1'>
           <function-decl name='~exception' mangled-name='_ZNSt9exceptionD2Ev' filepath='../../.././libstdc++-v3/libsupc++/eh_exception.cc' line='31' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt9exceptionD1Ev@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-12' is-artificial='yes'/>
+            <parameter type-id='type-id-83' is-artificial='yes'/>
             <parameter type-id='type-id-6' is-artificial='yes'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='private' const='yes' vtable-offset='2'>
           <function-decl name='what' mangled-name='_ZNKSt9exception4whatEv' filepath='../../.././libstdc++-v3/libsupc++/eh_exception.cc' line='40' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSt9exception4whatEv@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-13' is-artificial='yes'/>
+            <parameter type-id='type-id-104' is-artificial='yes'/>
             <return type-id='type-id-4'/>
           </function-decl>
         </member-function>
@@ -6690,7 +6653,7 @@
           <function-decl name='operator()' mangled-name='_ZNKSt4hashISsEclESs' filepath='../../.././libstdc++-v3/src/c++11/compatibility-c++0x.cc' line='59' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSt4hashISsEclESs@@GLIBCXX_3.4.10'>
             <parameter type-id='type-id-305' is-artificial='yes'/>
             <parameter type-id='type-id-321'/>
-            <return type-id='type-id-94'/>
+            <return type-id='type-id-93'/>
           </function-decl>
         </member-function>
       </class-decl>
@@ -6700,7 +6663,7 @@
           <function-decl name='operator()' mangled-name='_ZNKSt4hashIRKSsEclES1_' filepath='../../.././libstdc++-v3/src/c++11/compatibility-c++0x.cc' line='69' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSt4hashIRKSsEclES1_@@GLIBCXX_3.4.10'>
             <parameter type-id='type-id-299' is-artificial='yes'/>
             <parameter type-id='type-id-323'/>
-            <return type-id='type-id-94'/>
+            <return type-id='type-id-93'/>
           </function-decl>
         </member-function>
       </class-decl>
@@ -6709,7 +6672,7 @@
           <function-decl name='operator()' mangled-name='_ZNKSt4hashISbIwSt11char_traitsIwESaIwEEEclES3_' filepath='../../.././libstdc++-v3/src/c++11/compatibility-c++0x.cc' line='80' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSt4hashISbIwSt11char_traitsIwESaIwEEEclES3_@@GLIBCXX_3.4.10'>
             <parameter type-id='type-id-308' is-artificial='yes'/>
             <parameter type-id='type-id-324'/>
-            <return type-id='type-id-94'/>
+            <return type-id='type-id-93'/>
           </function-decl>
         </member-function>
       </class-decl>
@@ -6719,7 +6682,7 @@
           <function-decl name='operator()' mangled-name='_ZNKSt4hashIRKSbIwSt11char_traitsIwESaIwEEEclES5_' filepath='../../.././libstdc++-v3/src/c++11/compatibility-c++0x.cc' line='90' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSt4hashIRKSbIwSt11char_traitsIwESaIwEEEclES5_@@GLIBCXX_3.4.10'>
             <parameter type-id='type-id-302' is-artificial='yes'/>
             <parameter type-id='type-id-326'/>
-            <return type-id='type-id-94'/>
+            <return type-id='type-id-93'/>
           </function-decl>
         </member-function>
       </class-decl>
@@ -6728,7 +6691,7 @@
           <function-decl name='operator()' mangled-name='_ZNKSt4hashISt10error_codeEclES0_' filepath='../../.././libstdc++-v3/src/c++11/compatibility-c++0x.cc' line='102' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSt4hashISt10error_codeEclES0_@@GLIBCXX_3.4.11'>
             <parameter type-id='type-id-311' is-artificial='yes'/>
             <parameter type-id='type-id-291'/>
-            <return type-id='type-id-94'/>
+            <return type-id='type-id-93'/>
           </function-decl>
         </member-function>
       </class-decl>
@@ -6794,7 +6757,7 @@
         <member-function access='public' const='yes'>
           <function-decl name='operator bool' mangled-name='_ZNKSt10error_codecvbEv' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/system_error' line='160' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-293' is-artificial='yes'/>
-            <return type-id='type-id-42'/>
+            <return type-id='type-id-40'/>
           </function-decl>
         </member-function>
       </class-decl>
@@ -6854,7 +6817,7 @@
         <member-function access='private' const='yes'>
           <function-decl name='operator bool' mangled-name='_ZNKSt15error_conditioncvbEv' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/system_error' line='235' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-296' is-artificial='yes'/>
-            <return type-id='type-id-42'/>
+            <return type-id='type-id-40'/>
           </function-decl>
         </member-function>
       </class-decl>
@@ -6891,7 +6854,7 @@
       </class-decl>
     </namespace-decl>
     <function-decl name='atexit' filepath='/usr/include/stdlib.h' line='518' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-89'/>
+      <parameter type-id='type-id-88'/>
       <return type-id='type-id-6'/>
     </function-decl>
     <function-decl name='atof' filepath='/usr/include/stdlib.h' line='279' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -6904,15 +6867,15 @@
     </function-decl>
     <function-decl name='atol' filepath='/usr/include/stdlib.h' line='289' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-4'/>
-      <return type-id='type-id-22'/>
+      <return type-id='type-id-20'/>
     </function-decl>
     <function-decl name='bsearch' filepath='/usr/include/stdlib.h' line='755' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-36'/>
-      <parameter type-id='type-id-36'/>
-      <parameter type-id='type-id-92'/>
-      <parameter type-id='type-id-92'/>
+      <parameter type-id='type-id-34'/>
+      <parameter type-id='type-id-34'/>
+      <parameter type-id='type-id-91'/>
+      <parameter type-id='type-id-91'/>
       <parameter type-id='type-id-259'/>
-      <return type-id='type-id-36'/>
+      <return type-id='type-id-34'/>
     </function-decl>
     <function-decl name='div' filepath='/usr/include/stdlib.h' line='785' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-6'/>
@@ -6921,34 +6884,34 @@
     </function-decl>
     <function-decl name='getenv' filepath='/usr/include/stdlib.h' line='567' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-4'/>
-      <return type-id='type-id-93'/>
+      <return type-id='type-id-92'/>
     </function-decl>
     <function-decl name='ldiv' filepath='/usr/include/stdlib.h' line='787' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-22'/>
-      <parameter type-id='type-id-22'/>
+      <parameter type-id='type-id-20'/>
+      <parameter type-id='type-id-20'/>
       <return type-id='type-id-263'/>
     </function-decl>
     <function-decl name='mblen' filepath='/usr/include/stdlib.h' line='860' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-4'/>
-      <parameter type-id='type-id-92'/>
+      <parameter type-id='type-id-91'/>
       <return type-id='type-id-6'/>
     </function-decl>
     <function-decl name='mbstowcs' filepath='/usr/include/stdlib.h' line='871' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-333'/>
       <parameter type-id='type-id-4'/>
-      <parameter type-id='type-id-92'/>
-      <return type-id='type-id-92'/>
+      <parameter type-id='type-id-91'/>
+      <return type-id='type-id-91'/>
     </function-decl>
     <function-decl name='mbtowc' filepath='/usr/include/stdlib.h' line='863' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-333'/>
       <parameter type-id='type-id-4'/>
-      <parameter type-id='type-id-92'/>
+      <parameter type-id='type-id-91'/>
       <return type-id='type-id-6'/>
     </function-decl>
     <function-decl name='qsort' filepath='/usr/include/stdlib.h' line='761' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-36'/>
-      <parameter type-id='type-id-92'/>
-      <parameter type-id='type-id-92'/>
+      <parameter type-id='type-id-34'/>
+      <parameter type-id='type-id-91'/>
+      <parameter type-id='type-id-91'/>
       <parameter type-id='type-id-259'/>
       <return type-id='type-id-5'/>
     </function-decl>
@@ -6956,7 +6919,7 @@
       <return type-id='type-id-6'/>
     </function-decl>
     <function-decl name='srand' filepath='/usr/include/stdlib.h' line='382' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-41'/>
+      <parameter type-id='type-id-39'/>
       <return type-id='type-id-5'/>
     </function-decl>
     <function-decl name='strtod' filepath='/usr/include/stdlib.h' line='165' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -6968,26 +6931,26 @@
       <parameter type-id='type-id-4'/>
       <parameter type-id='type-id-272'/>
       <parameter type-id='type-id-6'/>
-      <return type-id='type-id-22'/>
+      <return type-id='type-id-20'/>
     </function-decl>
     <function-decl name='strtoul' filepath='/usr/include/stdlib.h' line='188' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-4'/>
       <parameter type-id='type-id-272'/>
       <parameter type-id='type-id-6'/>
-      <return type-id='type-id-51'/>
+      <return type-id='type-id-49'/>
     </function-decl>
     <function-decl name='system' filepath='/usr/include/stdlib.h' line='717' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-4'/>
       <return type-id='type-id-6'/>
     </function-decl>
     <function-decl name='wcstombs' filepath='/usr/include/stdlib.h' line='874' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-93'/>
-      <parameter type-id='type-id-354'/>
       <parameter type-id='type-id-92'/>
-      <return type-id='type-id-92'/>
+      <parameter type-id='type-id-354'/>
+      <parameter type-id='type-id-91'/>
+      <return type-id='type-id-91'/>
     </function-decl>
     <function-decl name='wctomb' filepath='/usr/include/stdlib.h' line='867' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-93'/>
+      <parameter type-id='type-id-92'/>
       <parameter type-id='type-id-375'/>
       <return type-id='type-id-6'/>
     </function-decl>
@@ -7023,12 +6986,12 @@
       <return type-id='type-id-378'/>
     </function-decl>
     <function-decl name='operator delete' mangled-name='_ZdlPv' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/libstdc++-v3/libsupc++/new' line='97' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZdlPv@@GLIBCXX_3.4'>
-      <parameter type-id='type-id-36'/>
+      <parameter type-id='type-id-34'/>
       <return type-id='type-id-5'/>
     </function-decl>
     <function-type size-in-bits='64' id='type-id-327'>
-      <parameter type-id='type-id-36'/>
-      <parameter type-id='type-id-36'/>
+      <parameter type-id='type-id-34'/>
+      <parameter type-id='type-id-34'/>
       <return type-id='type-id-6'/>
     </function-type>
     <function-type size-in-bits='64' id='type-id-332'>
@@ -7036,12 +6999,12 @@
     </function-type>
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='../../.././libstdc++-v3/src/c++11/compatibility-thread-c++0x.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/src' language='LANG_C_plus_plus'>
-    <type-decl name='unsigned char' size-in-bits='8' id='type-id-82'/>
-    <array-type-def dimensions='1' type-id='type-id-82' size-in-bits='896' id='type-id-379'>
+    <type-decl name='unsigned char' size-in-bits='8' id='type-id-80'/>
+    <array-type-def dimensions='1' type-id='type-id-80' size-in-bits='896' id='type-id-379'>
       <subrange length='112' type-id='type-id-174' id='type-id-380'/>
     </array-type-def>
     <typedef-decl name='__gthread_t' type-id='type-id-381' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/x86_64-unknown-linux-gnu/bits/gthr-default.h' line='53' column='1' id='type-id-382'/>
-    <typedef-decl name='pthread_t' type-id='type-id-51' filepath='/usr/include/bits/pthreadtypes.h' line='50' column='1' id='type-id-381'/>
+    <typedef-decl name='pthread_t' type-id='type-id-49' filepath='/usr/include/bits/pthreadtypes.h' line='50' column='1' id='type-id-381'/>
     <typedef-decl name='__gthread_once_t' type-id='type-id-383' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/x86_64-unknown-linux-gnu/bits/gthr-default.h' line='55' column='1' id='type-id-384'/>
     <typedef-decl name='pthread_once_t' type-id='type-id-6' filepath='/usr/include/bits/pthreadtypes.h' line='144' column='1' id='type-id-383'/>
     <reference-type-def kind='lvalue' type-id='type-id-385' size-in-bits='64' id='type-id-386'/>
@@ -7105,8 +7068,8 @@
     <reference-type-def kind='lvalue' type-id='type-id-466' size-in-bits='64' id='type-id-467'/>
     <qualified-type-def type-id='type-id-3' const='yes' id='type-id-468'/>
     <reference-type-def kind='lvalue' type-id='type-id-468' size-in-bits='64' id='type-id-469'/>
-    <pointer-type-def type-id='type-id-468' size-in-bits='64' id='type-id-40'/>
-    <qualified-type-def type-id='type-id-51' const='yes' id='type-id-470'/>
+    <pointer-type-def type-id='type-id-468' size-in-bits='64' id='type-id-38'/>
+    <qualified-type-def type-id='type-id-49' const='yes' id='type-id-470'/>
     <reference-type-def kind='lvalue' type-id='type-id-397' size-in-bits='64' id='type-id-471'/>
     <pointer-type-def type-id='type-id-397' size-in-bits='64' id='type-id-472'/>
     <reference-type-def kind='lvalue' type-id='type-id-400' size-in-bits='64' id='type-id-473'/>
@@ -7260,7 +7223,7 @@
         <member-function access='private' const='yes'>
           <function-decl name='joinable' mangled-name='_ZNKSt6thread8joinableEv' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/thread' line='159' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-464' is-artificial='yes'/>
-            <return type-id='type-id-42'/>
+            <return type-id='type-id-40'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
@@ -7289,7 +7252,7 @@
         </member-function>
         <member-function access='private' static='yes'>
           <function-decl name='hardware_concurrency' mangled-name='_ZNSt6thread20hardware_concurrencyEv' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/thread' line='180' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt6thread20hardware_concurrencyEv@@GLIBCXX_3.4.17'>
-            <return type-id='type-id-41'/>
+            <return type-id='type-id-39'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
@@ -7412,19 +7375,19 @@
         <member-function access='private' const='yes'>
           <function-decl name='operator bool' mangled-name='_ZNKSt12__shared_ptrINSt6thread10_Impl_baseELN9__gnu_cxx12_Lock_policyE2EEcvbEv' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/shared_ptr_base.h' line='962' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-441' is-artificial='yes'/>
-            <return type-id='type-id-42'/>
+            <return type-id='type-id-40'/>
           </function-decl>
         </member-function>
         <member-function access='private' const='yes'>
           <function-decl name='unique' mangled-name='_ZNKSt12__shared_ptrINSt6thread10_Impl_baseELN9__gnu_cxx12_Lock_policyE2EE6uniqueEv' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/shared_ptr_base.h' line='966' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-441' is-artificial='yes'/>
-            <return type-id='type-id-42'/>
+            <return type-id='type-id-40'/>
           </function-decl>
         </member-function>
         <member-function access='private' const='yes'>
           <function-decl name='use_count' mangled-name='_ZNKSt12__shared_ptrINSt6thread10_Impl_baseELN9__gnu_cxx12_Lock_policyE2EE9use_countEv' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/shared_ptr_base.h' line='970' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-441' is-artificial='yes'/>
-            <return type-id='type-id-22'/>
+            <return type-id='type-id-20'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
@@ -7438,7 +7401,7 @@
           <function-decl name='_M_get_deleter' mangled-name='_ZNKSt12__shared_ptrINSt6thread10_Impl_baseELN9__gnu_cxx12_Lock_policyE2EE14_M_get_deleterERKSt9type_info' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/shared_ptr_base.h' line='1052' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-441' is-artificial='yes'/>
             <parameter type-id='type-id-469'/>
-            <return type-id='type-id-36'/>
+            <return type-id='type-id-34'/>
           </function-decl>
         </member-function>
       </class-decl>
@@ -7490,34 +7453,34 @@
         <member-function access='private' const='yes'>
           <function-decl name='_M_get_use_count' mangled-name='_ZNKSt14__shared_countILN9__gnu_cxx12_Lock_policyE2EE16_M_get_use_countEv' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/shared_ptr_base.h' line='592' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-437' is-artificial='yes'/>
-            <return type-id='type-id-22'/>
+            <return type-id='type-id-20'/>
           </function-decl>
         </member-function>
         <member-function access='private' const='yes'>
           <function-decl name='_M_unique' mangled-name='_ZNKSt14__shared_countILN9__gnu_cxx12_Lock_policyE2EE9_M_uniqueEv' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/shared_ptr_base.h' line='596' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-437' is-artificial='yes'/>
-            <return type-id='type-id-42'/>
+            <return type-id='type-id-40'/>
           </function-decl>
         </member-function>
         <member-function access='private' const='yes'>
           <function-decl name='_M_get_deleter' mangled-name='_ZNKSt14__shared_countILN9__gnu_cxx12_Lock_policyE2EE14_M_get_deleterERKSt9type_info' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/shared_ptr_base.h' line='600' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-437' is-artificial='yes'/>
             <parameter type-id='type-id-469'/>
-            <return type-id='type-id-36'/>
+            <return type-id='type-id-34'/>
           </function-decl>
         </member-function>
         <member-function access='private' const='yes'>
           <function-decl name='_M_less' mangled-name='_ZNKSt14__shared_countILN9__gnu_cxx12_Lock_policyE2EE7_M_lessERKS2_' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/shared_ptr_base.h' line='604' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-437' is-artificial='yes'/>
             <parameter type-id='type-id-436'/>
-            <return type-id='type-id-42'/>
+            <return type-id='type-id-40'/>
           </function-decl>
         </member-function>
         <member-function access='private' const='yes'>
           <function-decl name='_M_less' mangled-name='_ZNKSt14__shared_countILN9__gnu_cxx12_Lock_policyE2EE7_M_lessERKSt12__weak_countILS1_2EE' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/shared_ptr_base.h' line='608' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-437' is-artificial='yes'/>
             <parameter type-id='type-id-444'/>
-            <return type-id='type-id-42'/>
+            <return type-id='type-id-40'/>
           </function-decl>
         </member-function>
       </class-decl>
@@ -7568,7 +7531,7 @@
         <member-function access='private' const='yes'>
           <function-decl name='_M_get_use_count' mangled-name='_ZNKSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE16_M_get_use_countEv' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/shared_ptr_base.h' line='193' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-413' is-artificial='yes'/>
-            <return type-id='type-id-22'/>
+            <return type-id='type-id-20'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
@@ -7608,7 +7571,7 @@
           <function-decl name='_M_get_deleter' mangled-name='_ZNSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE14_M_get_deleterERKSt9type_info' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/shared_ptr_base.h' line='130' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-480' is-artificial='yes'/>
             <parameter type-id='type-id-469'/>
-            <return type-id='type-id-36'/>
+            <return type-id='type-id-34'/>
           </function-decl>
         </member-function>
       </class-decl>
@@ -7619,100 +7582,100 @@
         </data-member>
         <member-function access='private' const='yes'>
           <function-decl name='operator==' mangled-name='_ZNKSt9type_infoeqERKS_' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/libstdc++-v3/libsupc++/typeinfo' line='122' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-40' is-artificial='yes'/>
+            <parameter type-id='type-id-38' is-artificial='yes'/>
             <parameter type-id='type-id-469'/>
-            <return type-id='type-id-42'/>
+            <return type-id='type-id-40'/>
           </function-decl>
         </member-function>
         <member-function access='private' const='yes'>
           <function-decl name='operator!=' mangled-name='_ZNKSt9type_infoneERKS_' filepath='../../.././libstdc++-v3/libsupc++/typeinfo' line='138' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-40' is-artificial='yes'/>
+            <parameter type-id='type-id-38' is-artificial='yes'/>
             <parameter type-id='type-id-469'/>
-            <return type-id='type-id-42'/>
+            <return type-id='type-id-40'/>
           </function-decl>
         </member-function>
         <member-function access='private' const='yes'>
           <function-decl name='name' mangled-name='_ZNKSt9type_info4nameEv' filepath='../../.././libstdc++-v3/libsupc++/typeinfo' line='101' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-40' is-artificial='yes'/>
+            <parameter type-id='type-id-38' is-artificial='yes'/>
             <return type-id='type-id-4'/>
           </function-decl>
         </member-function>
         <member-function access='private' const='yes'>
           <function-decl name='before' mangled-name='_ZNKSt9type_info6beforeERKS_' filepath='../../.././libstdc++-v3/libsupc++/typeinfo' line='117' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-40' is-artificial='yes'/>
+            <parameter type-id='type-id-38' is-artificial='yes'/>
             <parameter type-id='type-id-469'/>
-            <return type-id='type-id-42'/>
+            <return type-id='type-id-40'/>
           </function-decl>
         </member-function>
         <member-function access='protected' constructor='yes'>
           <function-decl name='type_info' filepath='../../.././libstdc++-v3/libsupc++/typeinfo' line='175' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-85' is-artificial='yes'/>
+            <parameter type-id='type-id-84' is-artificial='yes'/>
             <parameter type-id='type-id-4'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='operator=' mangled-name='_ZNSt9type_infoaSERKS_' filepath='../../.././libstdc++-v3/libsupc++/typeinfo' line='179' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-85' is-artificial='yes'/>
+            <parameter type-id='type-id-84' is-artificial='yes'/>
             <parameter type-id='type-id-469'/>
             <return type-id='type-id-164'/>
           </function-decl>
         </member-function>
         <member-function access='private' constructor='yes'>
           <function-decl name='type_info' filepath='../../.././libstdc++-v3/libsupc++/typeinfo' line='180' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-85' is-artificial='yes'/>
+            <parameter type-id='type-id-84' is-artificial='yes'/>
             <parameter type-id='type-id-469'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='private' destructor='yes' vtable-offset='-1'>
           <function-decl name='~type_info' filepath='../../.././libstdc++-v3/libsupc++/tinfo.cc' line='31' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-85' is-artificial='yes'/>
+            <parameter type-id='type-id-84' is-artificial='yes'/>
             <parameter type-id='type-id-6' is-artificial='yes'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='private' destructor='yes' vtable-offset='-1'>
           <function-decl name='~type_info' mangled-name='_ZNSt9type_infoD0Ev' filepath='../../.././libstdc++-v3/libsupc++/tinfo.cc' line='31' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt9type_infoD0Ev@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-85' is-artificial='yes'/>
+            <parameter type-id='type-id-84' is-artificial='yes'/>
             <parameter type-id='type-id-6' is-artificial='yes'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='private' destructor='yes' vtable-offset='-1'>
           <function-decl name='~type_info' mangled-name='_ZNSt9type_infoD2Ev' filepath='../../.././libstdc++-v3/libsupc++/tinfo.cc' line='31' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt9type_infoD2Ev@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-85' is-artificial='yes'/>
+            <parameter type-id='type-id-84' is-artificial='yes'/>
             <parameter type-id='type-id-6' is-artificial='yes'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='private' const='yes' vtable-offset='2'>
           <function-decl name='__is_pointer_p' mangled-name='_ZNKSt9type_info14__is_pointer_pEv' filepath='../../.././libstdc++-v3/libsupc++/tinfo.cc' line='57' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSt9type_info14__is_pointer_pEv@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-40' is-artificial='yes'/>
-            <return type-id='type-id-42'/>
+            <parameter type-id='type-id-38' is-artificial='yes'/>
+            <return type-id='type-id-40'/>
           </function-decl>
         </member-function>
         <member-function access='private' const='yes' vtable-offset='3'>
           <function-decl name='__is_function_p' mangled-name='_ZNKSt9type_info15__is_function_pEv' filepath='../../.././libstdc++-v3/libsupc++/tinfo.cc' line='64' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSt9type_info15__is_function_pEv@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-40' is-artificial='yes'/>
-            <return type-id='type-id-42'/>
+            <parameter type-id='type-id-38' is-artificial='yes'/>
+            <return type-id='type-id-40'/>
           </function-decl>
         </member-function>
         <member-function access='private' const='yes' vtable-offset='4'>
           <function-decl name='__do_catch' mangled-name='_ZNKSt9type_info10__do_catchEPKS_PPvj' filepath='../../.././libstdc++-v3/libsupc++/tinfo.cc' line='71' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSt9type_info10__do_catchEPKS_PPvj@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-40' is-artificial='yes'/>
-            <parameter type-id='type-id-40'/>
-            <parameter type-id='type-id-37'/>
-            <parameter type-id='type-id-41'/>
-            <return type-id='type-id-42'/>
+            <parameter type-id='type-id-38' is-artificial='yes'/>
+            <parameter type-id='type-id-38'/>
+            <parameter type-id='type-id-35'/>
+            <parameter type-id='type-id-39'/>
+            <return type-id='type-id-40'/>
           </function-decl>
         </member-function>
         <member-function access='private' const='yes' vtable-offset='5'>
           <function-decl name='__do_upcast' mangled-name='_ZNKSt9type_info11__do_upcastEPKN10__cxxabiv117__class_type_infoEPPv' filepath='../../.././libstdc++-v3/libsupc++/tinfo.cc' line='78' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSt9type_info11__do_upcastEPKN10__cxxabiv117__class_type_infoEPPv@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-40' is-artificial='yes'/>
-            <parameter type-id='type-id-33'/>
-            <parameter type-id='type-id-37'/>
-            <return type-id='type-id-42'/>
+            <parameter type-id='type-id-38' is-artificial='yes'/>
+            <parameter type-id='type-id-31'/>
+            <parameter type-id='type-id-35'/>
+            <return type-id='type-id-40'/>
           </function-decl>
         </member-function>
       </class-decl>
@@ -7725,7 +7688,7 @@
       <function-decl name='operator==' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/thread' line='83' column='1' visibility='default' binding='global' size-in-bits='64'>
         <parameter type-id='type-id-527'/>
         <parameter type-id='type-id-527'/>
-        <return type-id='type-id-42'/>
+        <return type-id='type-id-40'/>
       </function-decl>
       <class-decl name='_Mem_fn&lt;void (std::thread::*)()&gt;' size-in-bits='128' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/functional' line='525' column='1' id='type-id-406'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-539'/>
@@ -8467,7 +8430,7 @@
               <function-decl name='_M_set_result' mangled-name='_ZNSt13__future_base11_State_base13_M_set_resultESt8functionIFSt10unique_ptrINS_12_Result_baseENS3_8_DeleterEEvEEb' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/future' line='353' column='1' visibility='default' binding='global' size-in-bits='64'>
                 <parameter type-id='type-id-497' is-artificial='yes'/>
                 <parameter type-id='type-id-575'/>
-                <parameter type-id='type-id-42'/>
+                <parameter type-id='type-id-40'/>
                 <return type-id='type-id-5'/>
               </function-decl>
             </member-function>
@@ -8501,7 +8464,7 @@
             <member-function access='private' const='yes'>
               <function-decl name='_M_ready' mangled-name='_ZNKSt13__future_base11_State_base8_M_readyEv' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/future' line='479' column='1' visibility='default' binding='global' size-in-bits='64'>
                 <parameter type-id='type-id-433' is-artificial='yes'/>
-                <return type-id='type-id-42'/>
+                <return type-id='type-id-40'/>
               </function-decl>
             </member-function>
             <member-function access='private' destructor='yes' vtable-offset='-1'>
@@ -8649,7 +8612,7 @@
           <function-decl name='_M_get_deleter' mangled-name='_ZNSt23_Sp_counted_ptr_inplaceINSt13__future_base11_State_baseESaIS1_ELN9__gnu_cxx12_Lock_policyE2EE14_M_get_deleterERKSt9type_info' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/shared_ptr_base.h' line='425' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-482' is-artificial='yes'/>
             <parameter type-id='type-id-469'/>
-            <return type-id='type-id-36'/>
+            <return type-id='type-id-34'/>
           </function-decl>
         </member-function>
       </class-decl>
@@ -8744,7 +8707,7 @@
       <class-decl name='allocator&lt;std::_Sp_counted_ptr_inplace&lt;std::__future_base::_State_base, std::allocator&lt;std::__future_base::_State_base&gt;, (__gnu_cxx::_Lock_policy)2u&gt; &gt;' size-in-bits='8' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/allocator.h' line='89' column='1' id='type-id-445'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-387'/>
         <member-type access='private'>
-          <typedef-decl name='size_type' type-id='type-id-94' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/allocator.h' line='92' column='1' id='type-id-591'/>
+          <typedef-decl name='size_type' type-id='type-id-93' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/allocator.h' line='92' column='1' id='type-id-591'/>
         </member-type>
         <member-type access='private'>
           <typedef-decl name='pointer' type-id='type-id-482' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/allocator.h' line='94' column='1' id='type-id-588'/>
@@ -8823,7 +8786,7 @@
     <namespace-decl name='__gnu_cxx'>
       <class-decl name='new_allocator&lt;std::__future_base::_State_base&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ext/new_allocator.h' line='54' column='1' id='type-id-389'>
         <member-type access='public'>
-          <typedef-decl name='size_type' type-id='type-id-94' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ext/new_allocator.h' line='57' column='1' id='type-id-602'/>
+          <typedef-decl name='size_type' type-id='type-id-93' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ext/new_allocator.h' line='57' column='1' id='type-id-602'/>
         </member-type>
         <member-type access='public'>
           <typedef-decl name='pointer' type-id='type-id-497' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ext/new_allocator.h' line='59' column='1' id='type-id-603'/>
@@ -8875,7 +8838,7 @@
           <function-decl name='allocate' mangled-name='_ZN9__gnu_cxx13new_allocatorINSt13__future_base11_State_baseEE8allocateEmPKv' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ext/new_allocator.h' line='89' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-390' is-artificial='yes'/>
             <parameter type-id='type-id-602'/>
-            <parameter type-id='type-id-36'/>
+            <parameter type-id='type-id-34'/>
             <return type-id='type-id-603'/>
           </function-decl>
         </member-function>
@@ -8903,7 +8866,7 @@
       </class-decl>
       <class-decl name='new_allocator&lt;std::_Sp_counted_ptr_inplace&lt;std::__future_base::_State_base, std::allocator&lt;std::__future_base::_State_base&gt;, (__gnu_cxx::_Lock_policy)2u&gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ext/new_allocator.h' line='54' column='1' id='type-id-387'>
         <member-type access='public'>
-          <typedef-decl name='size_type' type-id='type-id-94' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ext/new_allocator.h' line='57' column='1' id='type-id-607'/>
+          <typedef-decl name='size_type' type-id='type-id-93' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ext/new_allocator.h' line='57' column='1' id='type-id-607'/>
         </member-type>
         <member-type access='public'>
           <typedef-decl name='pointer' type-id='type-id-482' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ext/new_allocator.h' line='59' column='1' id='type-id-608'/>
@@ -8955,7 +8918,7 @@
           <function-decl name='allocate' mangled-name='_ZN9__gnu_cxx13new_allocatorISt23_Sp_counted_ptr_inplaceINSt13__future_base11_State_baseESaIS3_ELNS_12_Lock_policyE2EEE8allocateEmPKv' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ext/new_allocator.h' line='89' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-388' is-artificial='yes'/>
             <parameter type-id='type-id-607'/>
-            <parameter type-id='type-id-36'/>
+            <parameter type-id='type-id-34'/>
             <return type-id='type-id-608'/>
           </function-decl>
         </member-function>
@@ -8995,7 +8958,7 @@
         <var-decl name='__pfn' type-id='type-id-532' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/future' line='1435' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
-        <var-decl name='__delta' type-id='type-id-22' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/future' line='1435' column='1'/>
+        <var-decl name='__delta' type-id='type-id-20' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/future' line='1435' column='1'/>
       </data-member>
     </class-decl>
   </abi-instr>
@@ -9253,7 +9216,7 @@
     </namespace-decl>
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='../../.././libstdc++-v3/src/c++98/compatibility.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/src' language='LANG_C_plus_plus'>
-    <type-decl name='bool' size-in-bits='8' id='type-id-42'/>
+    <type-decl name='bool' size-in-bits='8' id='type-id-40'/>
     <type-decl name='char' size-in-bits='8' id='type-id-186'/>
     <array-type-def dimensions='1' type-id='type-id-186' size-in-bits='8' id='type-id-624'>
       <subrange length='1' type-id='type-id-174' id='type-id-175'/>
@@ -9266,38 +9229,38 @@
     </array-type-def>
     <class-decl name='typedef __va_list_tag __va_list_tag' size-in-bits='192' is-struct='yes' visibility='default' id='type-id-629'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='gp_offset' type-id='type-id-41' visibility='default'/>
+        <var-decl name='gp_offset' type-id='type-id-39' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='32'>
-        <var-decl name='fp_offset' type-id='type-id-41' visibility='default'/>
+        <var-decl name='fp_offset' type-id='type-id-39' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
-        <var-decl name='overflow_arg_area' type-id='type-id-36' visibility='default'/>
+        <var-decl name='overflow_arg_area' type-id='type-id-34' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
-        <var-decl name='reg_save_area' type-id='type-id-36' visibility='default'/>
+        <var-decl name='reg_save_area' type-id='type-id-34' visibility='default'/>
       </data-member>
     </class-decl>
     <type-decl name='double' size-in-bits='64' id='type-id-252'/>
     <type-decl name='float' size-in-bits='32' id='type-id-377'/>
     <type-decl name='int' size-in-bits='32' id='type-id-6'/>
     <type-decl name='long double' size-in-bits='128' id='type-id-378'/>
-    <type-decl name='long int' size-in-bits='64' id='type-id-22'/>
+    <type-decl name='long int' size-in-bits='64' id='type-id-20'/>
     <type-decl name='long long int' size-in-bits='64' id='type-id-257'/>
     <type-decl name='long long unsigned int' size-in-bits='64' id='type-id-376'/>
     <type-decl name='short int' size-in-bits='16' id='type-id-630'/>
     <type-decl name='signed char' size-in-bits='8' id='type-id-631'/>
     <type-decl name='sizetype' size-in-bits='64' id='type-id-174'/>
-    <type-decl name='unnamed-enum-underlying-type' is-anonymous='yes' size-in-bits='32' alignment-in-bits='32' id='type-id-39'/>
-    <type-decl name='unsigned int' size-in-bits='32' id='type-id-41'/>
-    <type-decl name='unsigned long int' size-in-bits='64' id='type-id-51'/>
-    <array-type-def dimensions='1' type-id='type-id-51' size-in-bits='infinite' id='type-id-632'>
+    <type-decl name='unnamed-enum-underlying-type' is-anonymous='yes' size-in-bits='32' alignment-in-bits='32' id='type-id-37'/>
+    <type-decl name='unsigned int' size-in-bits='32' id='type-id-39'/>
+    <type-decl name='unsigned long int' size-in-bits='64' id='type-id-49'/>
+    <array-type-def dimensions='1' type-id='type-id-49' size-in-bits='infinite' id='type-id-632'>
       <subrange length='infinite' id='type-id-633'/>
     </array-type-def>
     <type-decl name='unsigned short int' size-in-bits='16' id='type-id-634'/>
     <type-decl name='void' id='type-id-5'/>
     <type-decl name='wchar_t' size-in-bits='32' id='type-id-375'/>
-    <typedef-decl name='wint_t' type-id='type-id-41' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/host-x86_64-unknown-linux-gnu/gcc/include/stddef.h' line='354' column='1' id='type-id-635'/>
+    <typedef-decl name='wint_t' type-id='type-id-39' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/host-x86_64-unknown-linux-gnu/gcc/include/stddef.h' line='354' column='1' id='type-id-635'/>
     <typedef-decl name='__FILE' type-id='type-id-636' filepath='/usr/include/stdio.h' line='65' column='1' id='type-id-637'/>
     <class-decl name='_IO_marker' size-in-bits='192' is-struct='yes' visibility='default' filepath='/usr/include/libio.h' line='186' column='1' id='type-id-638'>
       <data-member access='public' layout-offset-in-bits='0'>
@@ -9310,42 +9273,42 @@
         <var-decl name='_pos' type-id='type-id-6' visibility='default' filepath='/usr/include/libio.h' line='192' column='1'/>
       </data-member>
     </class-decl>
-    <typedef-decl name='__off_t' type-id='type-id-22' filepath='/usr/include/bits/types.h' line='141' column='1' id='type-id-641'/>
+    <typedef-decl name='__off_t' type-id='type-id-20' filepath='/usr/include/bits/types.h' line='141' column='1' id='type-id-641'/>
     <typedef-decl name='_IO_lock_t' type-id='type-id-5' filepath='/usr/include/libio.h' line='180' column='1' id='type-id-642'/>
-    <typedef-decl name='__off64_t' type-id='type-id-22' filepath='/usr/include/bits/types.h' line='142' column='1' id='type-id-643'/>
-    <typedef-decl name='size_t' type-id='type-id-51' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/host-x86_64-unknown-linux-gnu/gcc/include/stddef.h' line='213' column='1' id='type-id-92'/>
+    <typedef-decl name='__off64_t' type-id='type-id-20' filepath='/usr/include/bits/types.h' line='142' column='1' id='type-id-643'/>
+    <typedef-decl name='size_t' type-id='type-id-49' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/host-x86_64-unknown-linux-gnu/gcc/include/stddef.h' line='213' column='1' id='type-id-91'/>
     <typedef-decl name='mbstate_t' type-id='type-id-644' filepath='/usr/include/wchar.h' line='106' column='1' id='type-id-645'/>
     <typedef-decl name='__mbstate_t' type-id='type-id-646' filepath='/usr/include/wchar.h' line='95' column='1' id='type-id-644'/>
     <class-decl name='lconv' size-in-bits='768' is-struct='yes' visibility='default' filepath='/usr/include/locale.h' line='54' column='1' id='type-id-647'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='decimal_point' type-id='type-id-93' visibility='default' filepath='/usr/include/locale.h' line='58' column='1'/>
+        <var-decl name='decimal_point' type-id='type-id-92' visibility='default' filepath='/usr/include/locale.h' line='58' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
-        <var-decl name='thousands_sep' type-id='type-id-93' visibility='default' filepath='/usr/include/locale.h' line='59' column='1'/>
+        <var-decl name='thousands_sep' type-id='type-id-92' visibility='default' filepath='/usr/include/locale.h' line='59' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
-        <var-decl name='grouping' type-id='type-id-93' visibility='default' filepath='/usr/include/locale.h' line='65' column='1'/>
+        <var-decl name='grouping' type-id='type-id-92' visibility='default' filepath='/usr/include/locale.h' line='65' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='192'>
-        <var-decl name='int_curr_symbol' type-id='type-id-93' visibility='default' filepath='/usr/include/locale.h' line='71' column='1'/>
+        <var-decl name='int_curr_symbol' type-id='type-id-92' visibility='default' filepath='/usr/include/locale.h' line='71' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='256'>
-        <var-decl name='currency_symbol' type-id='type-id-93' visibility='default' filepath='/usr/include/locale.h' line='72' column='1'/>
+        <var-decl name='currency_symbol' type-id='type-id-92' visibility='default' filepath='/usr/include/locale.h' line='72' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='320'>
-        <var-decl name='mon_decimal_point' type-id='type-id-93' visibility='default' filepath='/usr/include/locale.h' line='73' column='1'/>
+        <var-decl name='mon_decimal_point' type-id='type-id-92' visibility='default' filepath='/usr/include/locale.h' line='73' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='384'>
-        <var-decl name='mon_thousands_sep' type-id='type-id-93' visibility='default' filepath='/usr/include/locale.h' line='74' column='1'/>
+        <var-decl name='mon_thousands_sep' type-id='type-id-92' visibility='default' filepath='/usr/include/locale.h' line='74' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='448'>
-        <var-decl name='mon_grouping' type-id='type-id-93' visibility='default' filepath='/usr/include/locale.h' line='75' column='1'/>
+        <var-decl name='mon_grouping' type-id='type-id-92' visibility='default' filepath='/usr/include/locale.h' line='75' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='512'>
-        <var-decl name='positive_sign' type-id='type-id-93' visibility='default' filepath='/usr/include/locale.h' line='76' column='1'/>
+        <var-decl name='positive_sign' type-id='type-id-92' visibility='default' filepath='/usr/include/locale.h' line='76' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='576'>
-        <var-decl name='negative_sign' type-id='type-id-93' visibility='default' filepath='/usr/include/locale.h' line='77' column='1'/>
+        <var-decl name='negative_sign' type-id='type-id-92' visibility='default' filepath='/usr/include/locale.h' line='77' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='640'>
         <var-decl name='int_frac_digits' type-id='type-id-186' visibility='default' filepath='/usr/include/locale.h' line='78' column='1'/>
@@ -9390,7 +9353,7 @@
         <var-decl name='int_n_sign_posn' type-id='type-id-186' visibility='default' filepath='/usr/include/locale.h' line='112' column='1'/>
       </data-member>
     </class-decl>
-    <typedef-decl name='wctype_t' type-id='type-id-51' filepath='/usr/include/wctype.h' line='53' column='1' id='type-id-648'/>
+    <typedef-decl name='wctype_t' type-id='type-id-49' filepath='/usr/include/wctype.h' line='53' column='1' id='type-id-648'/>
     <typedef-decl name='wctrans_t' type-id='type-id-649' filepath='/usr/include/wctype.h' line='187' column='1' id='type-id-650'/>
     <typedef-decl name='__int32_t' type-id='type-id-6' filepath='/usr/include/bits/types.h' line='41' column='1' id='type-id-651'/>
     <typedef-decl name='FILE' type-id='type-id-636' filepath='/usr/include/stdio.h' line='49' column='1' id='type-id-652'/>
@@ -9409,37 +9372,37 @@
         <var-decl name='_flags' type-id='type-id-6' visibility='default' filepath='/usr/include/libio.h' line='272' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
-        <var-decl name='_IO_read_ptr' type-id='type-id-93' visibility='default' filepath='/usr/include/libio.h' line='277' column='1'/>
+        <var-decl name='_IO_read_ptr' type-id='type-id-92' visibility='default' filepath='/usr/include/libio.h' line='277' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
-        <var-decl name='_IO_read_end' type-id='type-id-93' visibility='default' filepath='/usr/include/libio.h' line='278' column='1'/>
+        <var-decl name='_IO_read_end' type-id='type-id-92' visibility='default' filepath='/usr/include/libio.h' line='278' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='192'>
-        <var-decl name='_IO_read_base' type-id='type-id-93' visibility='default' filepath='/usr/include/libio.h' line='279' column='1'/>
+        <var-decl name='_IO_read_base' type-id='type-id-92' visibility='default' filepath='/usr/include/libio.h' line='279' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='256'>
-        <var-decl name='_IO_write_base' type-id='type-id-93' visibility='default' filepath='/usr/include/libio.h' line='280' column='1'/>
+        <var-decl name='_IO_write_base' type-id='type-id-92' visibility='default' filepath='/usr/include/libio.h' line='280' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='320'>
-        <var-decl name='_IO_write_ptr' type-id='type-id-93' visibility='default' filepath='/usr/include/libio.h' line='281' column='1'/>
+        <var-decl name='_IO_write_ptr' type-id='type-id-92' visibility='default' filepath='/usr/include/libio.h' line='281' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='384'>
-        <var-decl name='_IO_write_end' type-id='type-id-93' visibility='default' filepath='/usr/include/libio.h' line='282' column='1'/>
+        <var-decl name='_IO_write_end' type-id='type-id-92' visibility='default' filepath='/usr/include/libio.h' line='282' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='448'>
-        <var-decl name='_IO_buf_base' type-id='type-id-93' visibility='default' filepath='/usr/include/libio.h' line='283' column='1'/>
+        <var-decl name='_IO_buf_base' type-id='type-id-92' visibility='default' filepath='/usr/include/libio.h' line='283' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='512'>
-        <var-decl name='_IO_buf_end' type-id='type-id-93' visibility='default' filepath='/usr/include/libio.h' line='284' column='1'/>
+        <var-decl name='_IO_buf_end' type-id='type-id-92' visibility='default' filepath='/usr/include/libio.h' line='284' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='576'>
-        <var-decl name='_IO_save_base' type-id='type-id-93' visibility='default' filepath='/usr/include/libio.h' line='286' column='1'/>
+        <var-decl name='_IO_save_base' type-id='type-id-92' visibility='default' filepath='/usr/include/libio.h' line='286' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='640'>
-        <var-decl name='_IO_backup_base' type-id='type-id-93' visibility='default' filepath='/usr/include/libio.h' line='287' column='1'/>
+        <var-decl name='_IO_backup_base' type-id='type-id-92' visibility='default' filepath='/usr/include/libio.h' line='287' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='704'>
-        <var-decl name='_IO_save_end' type-id='type-id-93' visibility='default' filepath='/usr/include/libio.h' line='288' column='1'/>
+        <var-decl name='_IO_save_end' type-id='type-id-92' visibility='default' filepath='/usr/include/libio.h' line='288' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='768'>
         <var-decl name='_markers' type-id='type-id-639' visibility='default' filepath='/usr/include/libio.h' line='290' column='1'/>
@@ -9472,19 +9435,19 @@
         <var-decl name='_offset' type-id='type-id-643' visibility='default' filepath='/usr/include/libio.h' line='319' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1216'>
-        <var-decl name='__pad1' type-id='type-id-36' visibility='default' filepath='/usr/include/libio.h' line='328' column='1'/>
+        <var-decl name='__pad1' type-id='type-id-34' visibility='default' filepath='/usr/include/libio.h' line='328' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1280'>
-        <var-decl name='__pad2' type-id='type-id-36' visibility='default' filepath='/usr/include/libio.h' line='329' column='1'/>
+        <var-decl name='__pad2' type-id='type-id-34' visibility='default' filepath='/usr/include/libio.h' line='329' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1344'>
-        <var-decl name='__pad3' type-id='type-id-36' visibility='default' filepath='/usr/include/libio.h' line='330' column='1'/>
+        <var-decl name='__pad3' type-id='type-id-34' visibility='default' filepath='/usr/include/libio.h' line='330' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1408'>
-        <var-decl name='__pad4' type-id='type-id-36' visibility='default' filepath='/usr/include/libio.h' line='331' column='1'/>
+        <var-decl name='__pad4' type-id='type-id-34' visibility='default' filepath='/usr/include/libio.h' line='331' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1472'>
-        <var-decl name='__pad5' type-id='type-id-92' visibility='default' filepath='/usr/include/libio.h' line='332' column='1'/>
+        <var-decl name='__pad5' type-id='type-id-91' visibility='default' filepath='/usr/include/libio.h' line='332' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1536'>
         <var-decl name='_mode' type-id='type-id-6' visibility='default' filepath='/usr/include/libio.h' line='334' column='1'/>
@@ -9523,7 +9486,7 @@
         <var-decl name='tm_isdst' type-id='type-id-6' visibility='default' filepath='/usr/include/time.h' line='143' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='320'>
-        <var-decl name='tm_gmtoff' type-id='type-id-22' visibility='default' filepath='/usr/include/time.h' line='146' column='1'/>
+        <var-decl name='tm_gmtoff' type-id='type-id-20' visibility='default' filepath='/usr/include/time.h' line='146' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='384'>
         <var-decl name='tm_zone' type-id='type-id-4' visibility='default' filepath='/usr/include/time.h' line='147' column='1'/>
@@ -9539,7 +9502,7 @@
     <pointer-type-def type-id='type-id-662' size-in-bits='64' id='type-id-663'/>
     <pointer-type-def type-id='type-id-664' size-in-bits='64' id='type-id-665'/>
     <reference-type-def kind='lvalue' type-id='type-id-186' size-in-bits='64' id='type-id-352'/>
-    <pointer-type-def type-id='type-id-186' size-in-bits='64' id='type-id-93'/>
+    <pointer-type-def type-id='type-id-186' size-in-bits='64' id='type-id-92'/>
     <qualified-type-def type-id='type-id-658' const='yes' id='type-id-666'/>
     <reference-type-def kind='lvalue' type-id='type-id-666' size-in-bits='64' id='type-id-667'/>
     <pointer-type-def type-id='type-id-666' size-in-bits='64' id='type-id-668'/>
@@ -9557,7 +9520,7 @@
     <qualified-type-def type-id='type-id-654' const='yes' id='type-id-678'/>
     <pointer-type-def type-id='type-id-678' size-in-bits='64' id='type-id-679'/>
     <qualified-type-def type-id='type-id-6' const='yes' id='type-id-283'/>
-    <qualified-type-def type-id='type-id-22' const='yes' id='type-id-246'/>
+    <qualified-type-def type-id='type-id-20' const='yes' id='type-id-246'/>
     <reference-type-def kind='lvalue' type-id='type-id-246' size-in-bits='64' id='type-id-680'/>
     <qualified-type-def type-id='type-id-645' const='yes' id='type-id-681'/>
     <pointer-type-def type-id='type-id-681' size-in-bits='64' id='type-id-682'/>
@@ -9684,7 +9647,7 @@
     <reference-type-def kind='lvalue' type-id='type-id-843' size-in-bits='64' id='type-id-844'/>
     <pointer-type-def type-id='type-id-845' size-in-bits='64' id='type-id-846'/>
     <pointer-type-def type-id='type-id-629' size-in-bits='64' id='type-id-847'/>
-    <pointer-type-def type-id='type-id-5' size-in-bits='64' id='type-id-36'/>
+    <pointer-type-def type-id='type-id-5' size-in-bits='64' id='type-id-34'/>
     <reference-type-def kind='lvalue' type-id='type-id-375' size-in-bits='64' id='type-id-362'/>
     <pointer-type-def type-id='type-id-375' size-in-bits='64' id='type-id-333'/>
     <pointer-type-def type-id='type-id-333' size-in-bits='64' id='type-id-848'/>
@@ -9734,7 +9697,7 @@
         </class-decl>
       </namespace-decl>
       <enum-decl name='_Ios_Iostate' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/ios_base.h' line='145' column='1' id='type-id-684'>
-        <underlying-type type-id='type-id-39'/>
+        <underlying-type type-id='type-id-37'/>
         <enumerator name='_S_goodbit' value='0'/>
         <enumerator name='_S_badbit' value='1'/>
         <enumerator name='_S_eofbit' value='2'/>
@@ -9791,7 +9754,7 @@
           <var-decl name='_M_fill' type-id='type-id-850' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/basic_ios.h' line='94' column='1'/>
         </data-member>
         <data-member access='protected' layout-offset-in-bits='1800'>
-          <var-decl name='_M_fill_init' type-id='type-id-42' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/basic_ios.h' line='95' column='1'/>
+          <var-decl name='_M_fill_init' type-id='type-id-40' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/basic_ios.h' line='95' column='1'/>
         </data-member>
         <data-member access='protected' layout-offset-in-bits='1856'>
           <var-decl name='_M_streambuf' type-id='type-id-813' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/basic_ios.h' line='96' column='1'/>
@@ -9881,37 +9844,37 @@
         <member-function access='private' const='yes'>
           <function-decl name='operator void*' mangled-name='_ZNKSt9basic_iosIcSt11char_traitsIcEEcvPvEv' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/basic_ios.h' line='113' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSt9basic_iosIcSt11char_traitsIcEEcvPvEv@@GLIBCXX_3.4'>
             <parameter type-id='type-id-713' is-artificial='yes'/>
-            <return type-id='type-id-36'/>
+            <return type-id='type-id-34'/>
           </function-decl>
         </member-function>
         <member-function access='private' const='yes'>
           <function-decl name='operator!' mangled-name='_ZNKSt9basic_iosIcSt11char_traitsIcEEntEv' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/basic_ios.h' line='117' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSt9basic_iosIcSt11char_traitsIcEEntEv@@GLIBCXX_3.4'>
             <parameter type-id='type-id-713' is-artificial='yes'/>
-            <return type-id='type-id-42'/>
+            <return type-id='type-id-40'/>
           </function-decl>
         </member-function>
         <member-function access='private' const='yes'>
           <function-decl name='good' mangled-name='_ZNKSt9basic_iosIcSt11char_traitsIcEE4goodEv' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/basic_ios.h' line='172' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSt9basic_iosIcSt11char_traitsIcEE4goodEv@@GLIBCXX_3.4'>
             <parameter type-id='type-id-713' is-artificial='yes'/>
-            <return type-id='type-id-42'/>
+            <return type-id='type-id-40'/>
           </function-decl>
         </member-function>
         <member-function access='private' const='yes'>
           <function-decl name='eof' mangled-name='_ZNKSt9basic_iosIcSt11char_traitsIcEE3eofEv' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/basic_ios.h' line='182' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSt9basic_iosIcSt11char_traitsIcEE3eofEv@@GLIBCXX_3.4'>
             <parameter type-id='type-id-713' is-artificial='yes'/>
-            <return type-id='type-id-42'/>
+            <return type-id='type-id-40'/>
           </function-decl>
         </member-function>
         <member-function access='private' const='yes'>
           <function-decl name='fail' mangled-name='_ZNKSt9basic_iosIcSt11char_traitsIcEE4failEv' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/basic_ios.h' line='193' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSt9basic_iosIcSt11char_traitsIcEE4failEv@@GLIBCXX_3.4'>
             <parameter type-id='type-id-713' is-artificial='yes'/>
-            <return type-id='type-id-42'/>
+            <return type-id='type-id-40'/>
           </function-decl>
         </member-function>
         <member-function access='private' const='yes'>
           <function-decl name='bad' mangled-name='_ZNKSt9basic_iosIcSt11char_traitsIcEE3badEv' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/basic_ios.h' line='203' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSt9basic_iosIcSt11char_traitsIcEE3badEv@@GLIBCXX_3.4'>
             <parameter type-id='type-id-713' is-artificial='yes'/>
-            <return type-id='type-id-42'/>
+            <return type-id='type-id-40'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
@@ -10380,7 +10343,7 @@
           </function-decl>
         </member-function>
       </class-decl>
-      <typedef-decl name='ptrdiff_t' type-id='type-id-22' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/x86_64-unknown-linux-gnu/bits/c++config.h' line='174' column='1' id='type-id-349'/>
+      <typedef-decl name='ptrdiff_t' type-id='type-id-20' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/x86_64-unknown-linux-gnu/bits/c++config.h' line='174' column='1' id='type-id-349'/>
       <typedef-decl name='streamsize' type-id='type-id-349' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/postypes.h' line='100' column='1' id='type-id-872'/>
       <class-decl name='char_traits&lt;char&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/char_traits.h' line='235' column='1' id='type-id-879'>
         <member-type access='public'>
@@ -10409,34 +10372,34 @@
           <function-decl name='eqXX' mangled-name='_ZNSt11char_traitsIcE2eqERKcS2_' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/char_traits.h' line='248' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt11char_traitsIcE2eqERKcS2_@@GLIBCXX_3.4.5'>
             <parameter type-id='type-id-757'/>
             <parameter type-id='type-id-757'/>
-            <return type-id='type-id-42'/>
+            <return type-id='type-id-40'/>
           </function-decl>
         </member-function>
         <member-function access='public' static='yes'>
           <function-decl name='lt' mangled-name='_ZNSt11char_traitsIcE2ltERKcS2_' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/char_traits.h' line='252' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-757'/>
             <parameter type-id='type-id-757'/>
-            <return type-id='type-id-42'/>
+            <return type-id='type-id-40'/>
           </function-decl>
         </member-function>
         <member-function access='public' static='yes'>
           <function-decl name='compare' mangled-name='_ZNSt11char_traitsIcE7compareEPKcS2_m' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/char_traits.h' line='256' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-758'/>
             <parameter type-id='type-id-758'/>
-            <parameter type-id='type-id-94'/>
+            <parameter type-id='type-id-93'/>
             <return type-id='type-id-6'/>
           </function-decl>
         </member-function>
         <member-function access='public' static='yes'>
           <function-decl name='length' mangled-name='_ZNSt11char_traitsIcE6lengthEPKc' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/char_traits.h' line='260' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-758'/>
-            <return type-id='type-id-94'/>
+            <return type-id='type-id-93'/>
           </function-decl>
         </member-function>
         <member-function access='public' static='yes'>
           <function-decl name='find' mangled-name='_ZNSt11char_traitsIcE4findEPKcmRS1_' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/char_traits.h' line='264' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-758'/>
-            <parameter type-id='type-id-94'/>
+            <parameter type-id='type-id-93'/>
             <parameter type-id='type-id-757'/>
             <return type-id='type-id-758'/>
           </function-decl>
@@ -10445,7 +10408,7 @@
           <function-decl name='move' mangled-name='_ZNSt11char_traitsIcE4moveEPcPKcm' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/char_traits.h' line='268' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-832'/>
             <parameter type-id='type-id-758'/>
-            <parameter type-id='type-id-94'/>
+            <parameter type-id='type-id-93'/>
             <return type-id='type-id-832'/>
           </function-decl>
         </member-function>
@@ -10453,14 +10416,14 @@
           <function-decl name='copy' mangled-name='_ZNSt11char_traitsIcE4copyEPcPKcm' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/char_traits.h' line='272' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-832'/>
             <parameter type-id='type-id-758'/>
-            <parameter type-id='type-id-94'/>
+            <parameter type-id='type-id-93'/>
             <return type-id='type-id-832'/>
           </function-decl>
         </member-function>
         <member-function access='public' static='yes'>
           <function-decl name='assign' mangled-name='_ZNSt11char_traitsIcE6assignEPcmc' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/char_traits.h' line='276' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-832'/>
-            <parameter type-id='type-id-94'/>
+            <parameter type-id='type-id-93'/>
             <parameter type-id='type-id-755'/>
             <return type-id='type-id-832'/>
           </function-decl>
@@ -10481,7 +10444,7 @@
           <function-decl name='eq_int_type' mangled-name='_ZNSt11char_traitsIcE11eq_int_typeERKiS2_' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/char_traits.h' line='290' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-761'/>
             <parameter type-id='type-id-761'/>
-            <return type-id='type-id-42'/>
+            <return type-id='type-id-40'/>
           </function-decl>
         </member-function>
         <member-function access='public' static='yes'>
@@ -10499,15 +10462,15 @@
           <function-decl name='eq' mangled-name='_ZNSt11char_traitsIcE2eqERKcS2_' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/char_traits.h' line='248' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-757'/>
             <parameter type-id='type-id-757'/>
-            <return type-id='type-id-42'/>
+            <return type-id='type-id-40'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <typedef-decl name='size_t' type-id='type-id-51' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/x86_64-unknown-linux-gnu/bits/c++config.h' line='173' column='1' id='type-id-94'/>
+      <typedef-decl name='size_t' type-id='type-id-49' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/x86_64-unknown-linux-gnu/bits/c++config.h' line='173' column='1' id='type-id-93'/>
       <class-decl name='ios_base' size-in-bits='1728' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/ios_base.h' line='201' column='1' id='type-id-849'>
         <member-type access='private'>
           <enum-decl name='event' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/ios_base.h' line='421' column='1' id='type-id-883'>
-            <underlying-type type-id='type-id-39'/>
+            <underlying-type type-id='type-id-37'/>
             <enumerator name='erase_event' value='0'/>
             <enumerator name='imbue_event' value='1'/>
             <enumerator name='copyfmt_event' value='2'/>
@@ -10518,7 +10481,7 @@
         </member-type>
         <member-type access='protected'>
           <enum-decl name='__anonymous_enum__' is-anonymous='yes' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/ios_base.h' line='513' column='1' id='type-id-886'>
-            <underlying-type type-id='type-id-39'/>
+            <underlying-type type-id='type-id-37'/>
             <enumerator name='_S_local_word_size' value='8'/>
           </enum-decl>
         </member-type>
@@ -10574,10 +10537,10 @@
         <member-type access='protected'>
           <class-decl name='_Words' size-in-bits='128' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/ios_base.h' line='501' column='1' id='type-id-890'>
             <data-member access='public' layout-offset-in-bits='0'>
-              <var-decl name='_M_pword' type-id='type-id-36' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/ios_base.h' line='503' column='1'/>
+              <var-decl name='_M_pword' type-id='type-id-34' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/ios_base.h' line='503' column='1'/>
             </data-member>
             <data-member access='public' layout-offset-in-bits='64'>
-              <var-decl name='_M_iword' type-id='type-id-22' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/ios_base.h' line='504' column='1'/>
+              <var-decl name='_M_iword' type-id='type-id-20' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/ios_base.h' line='504' column='1'/>
             </data-member>
             <member-function access='public' constructor='yes'>
               <function-decl name='_Words' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/ios_base.h' line='505' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -10593,7 +10556,7 @@
               <var-decl name='_S_refcount' type-id='type-id-537' mangled-name='_ZNSt8ios_base4Init11_S_refcountE' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/ios_base.h' line='543' column='1'/>
             </data-member>
             <data-member access='private' static='yes'>
-              <var-decl name='_S_synced_with_stdio' type-id='type-id-42' mangled-name='_ZNSt8ios_base4Init20_S_synced_with_stdioE' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/ios_base.h' line='544' column='1'/>
+              <var-decl name='_S_synced_with_stdio' type-id='type-id-40' mangled-name='_ZNSt8ios_base4Init20_S_synced_with_stdioE' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/ios_base.h' line='544' column='1'/>
             </data-member>
             <member-function access='private' constructor='yes'>
               <function-decl name='Init' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/ios_base.h' line='539' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -10855,7 +10818,7 @@
           <function-decl name='_M_grow_words' mangled-name='_ZNSt8ios_base13_M_grow_wordsEib' filepath='../../../.././libstdc++-v3/src/c++98/ios.cc' line='116' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt8ios_base13_M_grow_wordsEib@@GLIBCXX_3.4'>
             <parameter type-id='type-id-906' is-artificial='yes'/>
             <parameter type-id='type-id-6'/>
-            <parameter type-id='type-id-42'/>
+            <parameter type-id='type-id-40'/>
             <return type-id='type-id-907'/>
           </function-decl>
         </member-function>
@@ -10902,8 +10865,8 @@
         </member-function>
         <member-function access='private' static='yes'>
           <function-decl name='sync_with_stdio' mangled-name='_ZNSt8ios_base15sync_with_stdioEb' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/ios_base.h' line='674' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt8ios_base15sync_with_stdioEb@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-42'/>
-            <return type-id='type-id-42'/>
+            <parameter type-id='type-id-40'/>
+            <return type-id='type-id-40'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
@@ -10987,7 +10950,7 @@
         </member-function>
       </class-decl>
       <enum-decl name='_Ios_Openmode' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/ios_base.h' line='105' column='1' id='type-id-894'>
-        <underlying-type type-id='type-id-39'/>
+        <underlying-type type-id='type-id-37'/>
         <enumerator name='_S_app' value='1'/>
         <enumerator name='_S_ate' value='2'/>
         <enumerator name='_S_bin' value='4'/>
@@ -10997,7 +10960,7 @@
         <enumerator name='_S_ios_openmode_end' value='65536'/>
       </enum-decl>
       <enum-decl name='_Ios_Seekdir' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/ios_base.h' line='183' column='1' id='type-id-895'>
-        <underlying-type type-id='type-id-39'/>
+        <underlying-type type-id='type-id-37'/>
         <enumerator name='_S_beg' value='0'/>
         <enumerator name='_S_cur' value='1'/>
         <enumerator name='_S_end' value='2'/>
@@ -11024,7 +10987,7 @@
           <var-decl name='_M_fill' type-id='type-id-918' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/basic_ios.h' line='94' column='1'/>
         </data-member>
         <data-member access='protected' layout-offset-in-bits='1824'>
-          <var-decl name='_M_fill_init' type-id='type-id-42' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/basic_ios.h' line='95' column='1'/>
+          <var-decl name='_M_fill_init' type-id='type-id-40' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/basic_ios.h' line='95' column='1'/>
         </data-member>
         <data-member access='protected' layout-offset-in-bits='1856'>
           <var-decl name='_M_streambuf' type-id='type-id-816' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/basic_ios.h' line='96' column='1'/>
@@ -11121,37 +11084,37 @@
         <member-function access='private' const='yes'>
           <function-decl name='operator void*' mangled-name='_ZNKSt9basic_iosIwSt11char_traitsIwEEcvPvEv' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/basic_ios.h' line='113' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSt9basic_iosIwSt11char_traitsIwEEcvPvEv@@GLIBCXX_3.4'>
             <parameter type-id='type-id-716' is-artificial='yes'/>
-            <return type-id='type-id-36'/>
+            <return type-id='type-id-34'/>
           </function-decl>
         </member-function>
         <member-function access='private' const='yes'>
           <function-decl name='operator!' mangled-name='_ZNKSt9basic_iosIwSt11char_traitsIwEEntEv' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/basic_ios.h' line='117' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSt9basic_iosIwSt11char_traitsIwEEntEv@@GLIBCXX_3.4'>
             <parameter type-id='type-id-716' is-artificial='yes'/>
-            <return type-id='type-id-42'/>
+            <return type-id='type-id-40'/>
           </function-decl>
         </member-function>
         <member-function access='private' const='yes'>
           <function-decl name='good' mangled-name='_ZNKSt9basic_iosIwSt11char_traitsIwEE4goodEv' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/basic_ios.h' line='172' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSt9basic_iosIwSt11char_traitsIwEE4goodEv@@GLIBCXX_3.4'>
             <parameter type-id='type-id-716' is-artificial='yes'/>
-            <return type-id='type-id-42'/>
+            <return type-id='type-id-40'/>
           </function-decl>
         </member-function>
         <member-function access='private' const='yes'>
           <function-decl name='eof' mangled-name='_ZNKSt9basic_iosIwSt11char_traitsIwEE3eofEv' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/basic_ios.h' line='182' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSt9basic_iosIwSt11char_traitsIwEE3eofEv@@GLIBCXX_3.4'>
             <parameter type-id='type-id-716' is-artificial='yes'/>
-            <return type-id='type-id-42'/>
+            <return type-id='type-id-40'/>
           </function-decl>
         </member-function>
         <member-function access='private' const='yes'>
           <function-decl name='fail' mangled-name='_ZNKSt9basic_iosIwSt11char_traitsIwEE4failEv' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/basic_ios.h' line='193' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSt9basic_iosIwSt11char_traitsIwEE4failEv@@GLIBCXX_3.4'>
             <parameter type-id='type-id-716' is-artificial='yes'/>
-            <return type-id='type-id-42'/>
+            <return type-id='type-id-40'/>
           </function-decl>
         </member-function>
         <member-function access='private' const='yes'>
           <function-decl name='bad' mangled-name='_ZNKSt9basic_iosIwSt11char_traitsIwEE3badEv' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/basic_ios.h' line='203' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSt9basic_iosIwSt11char_traitsIwEE3badEv@@GLIBCXX_3.4'>
             <parameter type-id='type-id-716' is-artificial='yes'/>
-            <return type-id='type-id-42'/>
+            <return type-id='type-id-40'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
@@ -11640,34 +11603,34 @@
           <function-decl name='eqXX' mangled-name='_ZNSt11char_traitsIwE2eqERKwS2_' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/char_traits.h' line='319' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt11char_traitsIwE2eqERKwS2_@@GLIBCXX_3.4.5'>
             <parameter type-id='type-id-764'/>
             <parameter type-id='type-id-764'/>
-            <return type-id='type-id-42'/>
+            <return type-id='type-id-40'/>
           </function-decl>
         </member-function>
         <member-function access='public' static='yes'>
           <function-decl name='lt' mangled-name='_ZNSt11char_traitsIwE2ltERKwS2_' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/char_traits.h' line='323' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-764'/>
             <parameter type-id='type-id-764'/>
-            <return type-id='type-id-42'/>
+            <return type-id='type-id-40'/>
           </function-decl>
         </member-function>
         <member-function access='public' static='yes'>
           <function-decl name='compare' mangled-name='_ZNSt11char_traitsIwE7compareEPKwS2_m' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/char_traits.h' line='327' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-765'/>
             <parameter type-id='type-id-765'/>
-            <parameter type-id='type-id-94'/>
+            <parameter type-id='type-id-93'/>
             <return type-id='type-id-6'/>
           </function-decl>
         </member-function>
         <member-function access='public' static='yes'>
           <function-decl name='length' mangled-name='_ZNSt11char_traitsIwE6lengthEPKw' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/char_traits.h' line='331' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-765'/>
-            <return type-id='type-id-94'/>
+            <return type-id='type-id-93'/>
           </function-decl>
         </member-function>
         <member-function access='public' static='yes'>
           <function-decl name='find' mangled-name='_ZNSt11char_traitsIwE4findEPKwmRS1_' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/char_traits.h' line='335' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-765'/>
-            <parameter type-id='type-id-94'/>
+            <parameter type-id='type-id-93'/>
             <parameter type-id='type-id-764'/>
             <return type-id='type-id-765'/>
           </function-decl>
@@ -11676,7 +11639,7 @@
           <function-decl name='move' mangled-name='_ZNSt11char_traitsIwE4moveEPwPKwm' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/char_traits.h' line='339' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-834'/>
             <parameter type-id='type-id-765'/>
-            <parameter type-id='type-id-94'/>
+            <parameter type-id='type-id-93'/>
             <return type-id='type-id-834'/>
           </function-decl>
         </member-function>
@@ -11684,14 +11647,14 @@
           <function-decl name='copy' mangled-name='_ZNSt11char_traitsIwE4copyEPwPKwm' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/char_traits.h' line='343' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-834'/>
             <parameter type-id='type-id-765'/>
-            <parameter type-id='type-id-94'/>
+            <parameter type-id='type-id-93'/>
             <return type-id='type-id-834'/>
           </function-decl>
         </member-function>
         <member-function access='public' static='yes'>
           <function-decl name='assign' mangled-name='_ZNSt11char_traitsIwE6assignEPwmw' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/char_traits.h' line='347' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-834'/>
-            <parameter type-id='type-id-94'/>
+            <parameter type-id='type-id-93'/>
             <parameter type-id='type-id-762'/>
             <return type-id='type-id-834'/>
           </function-decl>
@@ -11712,7 +11675,7 @@
           <function-decl name='eq_int_type' mangled-name='_ZNSt11char_traitsIwE11eq_int_typeERKjS2_' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/char_traits.h' line='359' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-768'/>
             <parameter type-id='type-id-768'/>
-            <return type-id='type-id-42'/>
+            <return type-id='type-id-40'/>
           </function-decl>
         </member-function>
         <member-function access='public' static='yes'>
@@ -11730,7 +11693,7 @@
           <function-decl name='eq' mangled-name='_ZNSt11char_traitsIwE2eqERKwS2_' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/char_traits.h' line='319' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-764'/>
             <parameter type-id='type-id-764'/>
-            <return type-id='type-id-42'/>
+            <return type-id='type-id-40'/>
           </function-decl>
         </member-function>
       </class-decl>
@@ -11761,13 +11724,13 @@
             <member-function access='public' const='yes'>
               <function-decl name='_M_is_leaked' mangled-name='_ZNKSs4_Rep12_M_is_leakedEv' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/basic_string.h' line='188' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSs4_Rep12_M_is_leakedEv@@GLIBCXX_3.4'>
                 <parameter type-id='type-id-744' is-artificial='yes'/>
-                <return type-id='type-id-42'/>
+                <return type-id='type-id-40'/>
               </function-decl>
             </member-function>
             <member-function access='public' const='yes'>
               <function-decl name='_M_is_shared' mangled-name='_ZNKSs4_Rep12_M_is_sharedEv' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/basic_string.h' line='192' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSs4_Rep12_M_is_sharedEv@@GLIBCXX_3.4'>
                 <parameter type-id='type-id-744' is-artificial='yes'/>
-                <return type-id='type-id-42'/>
+                <return type-id='type-id-40'/>
               </function-decl>
             </member-function>
             <member-function access='public'>
@@ -11792,7 +11755,7 @@
             <member-function access='public'>
               <function-decl name='_M_refdata' mangled-name='_ZNSs4_Rep10_M_refdataEv' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/basic_string.h' line='219' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSs4_Rep10_M_refdataEv@@GLIBCXX_3.4'>
                 <parameter type-id='type-id-824' is-artificial='yes'/>
-                <return type-id='type-id-93'/>
+                <return type-id='type-id-92'/>
               </function-decl>
             </member-function>
             <member-function access='public'>
@@ -11800,7 +11763,7 @@
                 <parameter type-id='type-id-824' is-artificial='yes'/>
                 <parameter type-id='type-id-689'/>
                 <parameter type-id='type-id-689'/>
-                <return type-id='type-id-93'/>
+                <return type-id='type-id-92'/>
               </function-decl>
             </member-function>
             <member-function access='public' static='yes'>
@@ -11828,7 +11791,7 @@
             <member-function access='public'>
               <function-decl name='_M_refcopy' mangled-name='_ZNSs4_Rep10_M_refcopyEv' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/basic_string.h' line='255' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSs4_Rep10_M_refcopyEv@@GLIBCXX_3.4'>
                 <parameter type-id='type-id-824' is-artificial='yes'/>
-                <return type-id='type-id-93'/>
+                <return type-id='type-id-92'/>
               </function-decl>
             </member-function>
             <member-function access='public'>
@@ -11836,7 +11799,7 @@
                 <parameter type-id='type-id-824' is-artificial='yes'/>
                 <parameter type-id='type-id-689'/>
                 <parameter type-id='type-id-745'/>
-                <return type-id='type-id-93'/>
+                <return type-id='type-id-92'/>
               </function-decl>
             </member-function>
             <member-function access='public'>
@@ -11852,12 +11815,12 @@
           <class-decl name='_Alloc_hider' size-in-bits='64' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/basic_string.h' line='269' column='1' id='type-id-821'>
             <base-class access='public' layout-offset-in-bits='0' type-id='type-id-687'/>
             <data-member access='public' layout-offset-in-bits='0'>
-              <var-decl name='_M_p' type-id='type-id-93' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/basic_string.h' line='274' column='1'/>
+              <var-decl name='_M_p' type-id='type-id-92' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/basic_string.h' line='274' column='1'/>
             </data-member>
             <member-function access='public' constructor='yes'>
               <function-decl name='_Alloc_hider' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/basic_string.h' line='271' column='1' visibility='default' binding='global' size-in-bits='64'>
                 <parameter type-id='type-id-822' is-artificial='yes'/>
-                <parameter type-id='type-id-93'/>
+                <parameter type-id='type-id-92'/>
                 <parameter type-id='type-id-689'/>
                 <return type-id='type-id-5'/>
               </function-decl>
@@ -11865,7 +11828,7 @@
             <member-function access='public' constructor='yes'>
               <function-decl name='_Alloc_hider' mangled-name='_ZNSs12_Alloc_hiderC2EPcRKSaIcE' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/basic_string.h' line='271' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSs12_Alloc_hiderC1EPcRKSaIcE@@GLIBCXX_3.4'>
                 <parameter type-id='type-id-822' is-artificial='yes'/>
-                <parameter type-id='type-id-93'/>
+                <parameter type-id='type-id-92'/>
                 <parameter type-id='type-id-689'/>
                 <return type-id='type-id-5'/>
               </function-decl>
@@ -11918,14 +11881,14 @@
         <member-function access='private' const='yes'>
           <function-decl name='_M_data' mangled-name='_ZNKSs7_M_dataEv' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/basic_string.h' line='289' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSs7_M_dataEv@@GLIBCXX_3.4'>
             <parameter type-id='type-id-741' is-artificial='yes'/>
-            <return type-id='type-id-93'/>
+            <return type-id='type-id-92'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='_M_data' mangled-name='_ZNSs7_M_dataEPc' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/basic_string.h' line='293' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSs7_M_dataEPc@@GLIBCXX_3.4'>
             <parameter type-id='type-id-820' is-artificial='yes'/>
-            <parameter type-id='type-id-93'/>
-            <return type-id='type-id-93'/>
+            <parameter type-id='type-id-92'/>
+            <return type-id='type-id-92'/>
           </function-decl>
         </member-function>
         <member-function access='private' const='yes'>
@@ -11981,12 +11944,12 @@
           <function-decl name='_M_disjunctXX' mangled-name='_ZNKSs11_M_disjunctEPKc' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/basic_string.h' line='342' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSs11_M_disjunctEPKc@@GLIBCXX_3.4.5'>
             <parameter type-id='type-id-741' is-artificial='yes'/>
             <parameter type-id='type-id-4'/>
-            <return type-id='type-id-42'/>
+            <return type-id='type-id-40'/>
           </function-decl>
         </member-function>
         <member-function access='private' static='yes'>
           <function-decl name='_M_copyXX' mangled-name='_ZNSs7_M_copyEPcPKcm' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/basic_string.h' line='351' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSs7_M_copyEPcPKcm@GLIBCXX_3.4'>
-            <parameter type-id='type-id-93'/>
+            <parameter type-id='type-id-92'/>
             <parameter type-id='type-id-4'/>
             <parameter type-id='type-id-745'/>
             <return type-id='type-id-5'/>
@@ -11994,7 +11957,7 @@
         </member-function>
         <member-function access='private' static='yes'>
           <function-decl name='_M_moveXX' mangled-name='_ZNSs7_M_moveEPcPKcm' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/basic_string.h' line='360' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSs7_M_moveEPcPKcm@@GLIBCXX_3.4.5'>
-            <parameter type-id='type-id-93'/>
+            <parameter type-id='type-id-92'/>
             <parameter type-id='type-id-4'/>
             <parameter type-id='type-id-745'/>
             <return type-id='type-id-5'/>
@@ -12002,7 +11965,7 @@
         </member-function>
         <member-function access='private' static='yes'>
           <function-decl name='_M_assignXX' mangled-name='_ZNSs9_M_assignEPcmc' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/basic_string.h' line='369' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSs9_M_assignEPcmc@@GLIBCXX_3.4.5'>
-            <parameter type-id='type-id-93'/>
+            <parameter type-id='type-id-92'/>
             <parameter type-id='type-id-745'/>
             <parameter type-id='type-id-186'/>
             <return type-id='type-id-5'/>
@@ -12010,7 +11973,7 @@
         </member-function>
         <member-function access='private' static='yes'>
           <function-decl name='_S_copy_chars' mangled-name='_ZNSs13_S_copy_charsEPcN9__gnu_cxx17__normal_iteratorIS_SsEES2_' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/basic_string.h' line='388' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSs13_S_copy_charsEPcN9__gnu_cxx17__normal_iteratorIS_SsEES2_@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-93'/>
+            <parameter type-id='type-id-92'/>
             <parameter type-id='type-id-949'/>
             <parameter type-id='type-id-949'/>
             <return type-id='type-id-5'/>
@@ -12018,7 +11981,7 @@
         </member-function>
         <member-function access='private' static='yes'>
           <function-decl name='_S_copy_chars' mangled-name='_ZNSs13_S_copy_charsEPcN9__gnu_cxx17__normal_iteratorIPKcSsEES4_' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/basic_string.h' line='392' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSs13_S_copy_charsEPcN9__gnu_cxx17__normal_iteratorIPKcSsEES4_@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-93'/>
+            <parameter type-id='type-id-92'/>
             <parameter type-id='type-id-950'/>
             <parameter type-id='type-id-950'/>
             <return type-id='type-id-5'/>
@@ -12026,15 +11989,15 @@
         </member-function>
         <member-function access='private' static='yes'>
           <function-decl name='_S_copy_chars' mangled-name='_ZNSs13_S_copy_charsEPcS_S_' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/basic_string.h' line='396' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSs13_S_copy_charsEPcS_S_@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-93'/>
-            <parameter type-id='type-id-93'/>
-            <parameter type-id='type-id-93'/>
+            <parameter type-id='type-id-92'/>
+            <parameter type-id='type-id-92'/>
+            <parameter type-id='type-id-92'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='private' static='yes'>
           <function-decl name='_S_copy_chars' mangled-name='_ZNSs13_S_copy_charsEPcPKcS1_' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/basic_string.h' line='400' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSs13_S_copy_charsEPcPKcS1_@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-93'/>
+            <parameter type-id='type-id-92'/>
             <parameter type-id='type-id-4'/>
             <parameter type-id='type-id-4'/>
             <return type-id='type-id-5'/>
@@ -12263,7 +12226,7 @@
         <member-function access='private' const='yes'>
           <function-decl name='empty' mangled-name='_ZNKSs5emptyEv' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/basic_string.h' line='808' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSs5emptyEv@@GLIBCXX_3.4'>
             <parameter type-id='type-id-741' is-artificial='yes'/>
-            <return type-id='type-id-42'/>
+            <return type-id='type-id-40'/>
           </function-decl>
         </member-function>
         <member-function access='private' const='yes'>
@@ -12576,8 +12539,8 @@
             <parameter type-id='type-id-820' is-artificial='yes'/>
             <parameter type-id='type-id-949'/>
             <parameter type-id='type-id-949'/>
-            <parameter type-id='type-id-93'/>
-            <parameter type-id='type-id-93'/>
+            <parameter type-id='type-id-92'/>
+            <parameter type-id='type-id-92'/>
             <return type-id='type-id-819'/>
           </function-decl>
         </member-function>
@@ -12636,7 +12599,7 @@
             <parameter type-id='type-id-745'/>
             <parameter type-id='type-id-186'/>
             <parameter type-id='type-id-689'/>
-            <return type-id='type-id-93'/>
+            <return type-id='type-id-92'/>
           </function-decl>
         </member-function>
         <member-function access='private' static='yes'>
@@ -12644,13 +12607,13 @@
             <parameter type-id='type-id-745'/>
             <parameter type-id='type-id-186'/>
             <parameter type-id='type-id-689'/>
-            <return type-id='type-id-93'/>
+            <return type-id='type-id-92'/>
           </function-decl>
         </member-function>
         <member-function access='private' const='yes'>
           <function-decl name='copy' mangled-name='_ZNKSs4copyEPcmm' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/basic_string.tcc' line='724' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSs4copyEPcmm@@GLIBCXX_3.4'>
             <parameter type-id='type-id-741' is-artificial='yes'/>
-            <parameter type-id='type-id-93'/>
+            <parameter type-id='type-id-92'/>
             <parameter type-id='type-id-745'/>
             <parameter type-id='type-id-745'/>
             <return type-id='type-id-745'/>
@@ -12953,12 +12916,12 @@
           <function-decl name='_M_disjunct' mangled-name='_ZNKSs11_M_disjunctEPKc' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/basic_string.h' line='342' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-741' is-artificial='yes'/>
             <parameter type-id='type-id-4'/>
-            <return type-id='type-id-42'/>
+            <return type-id='type-id-40'/>
           </function-decl>
         </member-function>
         <member-function access='private' static='yes'>
           <function-decl name='_M_copy' mangled-name='_ZNSs7_M_copyEPcPKcm' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/basic_string.h' line='351' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-93'/>
+            <parameter type-id='type-id-92'/>
             <parameter type-id='type-id-4'/>
             <parameter type-id='type-id-745'/>
             <return type-id='type-id-5'/>
@@ -12966,7 +12929,7 @@
         </member-function>
         <member-function access='private' static='yes'>
           <function-decl name='_M_move' mangled-name='_ZNSs7_M_moveEPcPKcm' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/basic_string.h' line='360' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-93'/>
+            <parameter type-id='type-id-92'/>
             <parameter type-id='type-id-4'/>
             <parameter type-id='type-id-745'/>
             <return type-id='type-id-5'/>
@@ -12974,7 +12937,7 @@
         </member-function>
         <member-function access='private' static='yes'>
           <function-decl name='_M_assign' mangled-name='_ZNSs9_M_assignEPcmc' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/basic_string.h' line='369' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-93'/>
+            <parameter type-id='type-id-92'/>
             <parameter type-id='type-id-745'/>
             <parameter type-id='type-id-186'/>
             <return type-id='type-id-5'/>
@@ -13116,19 +13079,19 @@
         </member-function>
         <member-function access='private' static='yes'>
           <function-decl name='_S_construct_aux&lt;char*&gt;' mangled-name='_ZNSs16_S_construct_auxIPcEES0_T_S1_RKSaIcESt12__false_type' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/basic_string.h' line='1718' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-93'/>
-            <parameter type-id='type-id-93'/>
+            <parameter type-id='type-id-92'/>
+            <parameter type-id='type-id-92'/>
             <parameter type-id='type-id-689'/>
             <parameter type-id='type-id-956'/>
-            <return type-id='type-id-93'/>
+            <return type-id='type-id-92'/>
           </function-decl>
         </member-function>
         <member-function access='private' static='yes'>
           <function-decl name='_S_construct&lt;char*&gt;' mangled-name='_ZNSs12_S_constructIPcEES0_T_S1_RKSaIcE' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/basic_string.h' line='1740' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-93'/>
-            <parameter type-id='type-id-93'/>
+            <parameter type-id='type-id-92'/>
+            <parameter type-id='type-id-92'/>
             <parameter type-id='type-id-689'/>
-            <return type-id='type-id-93'/>
+            <return type-id='type-id-92'/>
           </function-decl>
         </member-function>
         <member-function access='private' static='yes'>
@@ -13137,7 +13100,7 @@
             <parameter type-id='type-id-4'/>
             <parameter type-id='type-id-689'/>
             <parameter type-id='type-id-957'/>
-            <return type-id='type-id-93'/>
+            <return type-id='type-id-92'/>
           </function-decl>
         </member-function>
         <member-function access='private' static='yes'>
@@ -13146,7 +13109,7 @@
             <parameter type-id='type-id-4'/>
             <parameter type-id='type-id-689'/>
             <parameter type-id='type-id-956'/>
-            <return type-id='type-id-93'/>
+            <return type-id='type-id-92'/>
           </function-decl>
         </member-function>
         <member-function access='private' static='yes'>
@@ -13154,16 +13117,16 @@
             <parameter type-id='type-id-4'/>
             <parameter type-id='type-id-4'/>
             <parameter type-id='type-id-689'/>
-            <return type-id='type-id-93'/>
+            <return type-id='type-id-92'/>
           </function-decl>
         </member-function>
         <member-function access='private' static='yes'>
           <function-decl name='_S_construct&lt;char*&gt;' mangled-name='_ZNSs12_S_constructIPcEES0_T_S1_RKSaIcESt20forward_iterator_tag' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/basic_string.tcc' line='125' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSs12_S_constructIPcEES0_T_S1_RKSaIcESt20forward_iterator_tag@@GLIBCXX_3.4.14'>
-            <parameter type-id='type-id-93'/>
-            <parameter type-id='type-id-93'/>
+            <parameter type-id='type-id-92'/>
+            <parameter type-id='type-id-92'/>
             <parameter type-id='type-id-689'/>
             <parameter type-id='type-id-957'/>
-            <return type-id='type-id-93'/>
+            <return type-id='type-id-92'/>
           </function-decl>
         </member-function>
         <member-function access='private' static='yes'>
@@ -13172,7 +13135,7 @@
             <parameter type-id='type-id-264'/>
             <parameter type-id='type-id-689'/>
             <parameter type-id='type-id-956'/>
-            <return type-id='type-id-93'/>
+            <return type-id='type-id-92'/>
           </function-decl>
         </member-function>
         <member-function access='private' static='yes'>
@@ -13180,7 +13143,7 @@
             <parameter type-id='type-id-264'/>
             <parameter type-id='type-id-264'/>
             <parameter type-id='type-id-689'/>
-            <return type-id='type-id-93'/>
+            <return type-id='type-id-92'/>
           </function-decl>
         </member-function>
         <member-function access='private' static='yes'>
@@ -13189,7 +13152,7 @@
             <parameter type-id='type-id-264'/>
             <parameter type-id='type-id-689'/>
             <parameter type-id='type-id-957'/>
-            <return type-id='type-id-93'/>
+            <return type-id='type-id-92'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
@@ -13204,8 +13167,8 @@
         <member-function access='private'>
           <function-decl name='basic_string&lt;char*&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/basic_string.tcc' line='229' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-820' is-artificial='yes'/>
-            <parameter type-id='type-id-93'/>
-            <parameter type-id='type-id-93'/>
+            <parameter type-id='type-id-92'/>
+            <parameter type-id='type-id-92'/>
             <parameter type-id='type-id-689'/>
             <return type-id='type-id-5'/>
           </function-decl>
@@ -13283,8 +13246,8 @@
         <member-function access='private'>
           <function-decl name='basic_string&lt;char*&gt;' mangled-name='_ZNSsC2IPcEET_S1_RKSaIcE' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/basic_string.tcc' line='229' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSsC2IPcEET_S1_RKSaIcE@@GLIBCXX_3.4'>
             <parameter type-id='type-id-820' is-artificial='yes'/>
-            <parameter type-id='type-id-93'/>
-            <parameter type-id='type-id-93'/>
+            <parameter type-id='type-id-92'/>
+            <parameter type-id='type-id-92'/>
             <parameter type-id='type-id-689'/>
             <return type-id='type-id-5'/>
           </function-decl>
@@ -13347,7 +13310,7 @@
           </class-decl>
         </member-type>
         <member-type access='private'>
-          <typedef-decl name='size_type' type-id='type-id-94' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/allocator.h' line='92' column='1' id='type-id-943'/>
+          <typedef-decl name='size_type' type-id='type-id-93' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/allocator.h' line='92' column='1' id='type-id-943'/>
         </member-type>
         <member-type access='private'>
           <typedef-decl name='reference' type-id='type-id-352' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/allocator.h' line='96' column='1' id='type-id-946'/>
@@ -13664,13 +13627,13 @@
             <member-function access='public' const='yes'>
               <function-decl name='_M_is_leaked' mangled-name='_ZNKSbIwSt11char_traitsIwESaIwEE4_Rep12_M_is_leakedEv' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/basic_string.h' line='188' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSbIwSt11char_traitsIwESaIwEE4_Rep12_M_is_leakedEv@@GLIBCXX_3.4'>
                 <parameter type-id='type-id-752' is-artificial='yes'/>
-                <return type-id='type-id-42'/>
+                <return type-id='type-id-40'/>
               </function-decl>
             </member-function>
             <member-function access='public' const='yes'>
               <function-decl name='_M_is_shared' mangled-name='_ZNKSbIwSt11char_traitsIwESaIwEE4_Rep12_M_is_sharedEv' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/basic_string.h' line='192' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSbIwSt11char_traitsIwESaIwEE4_Rep12_M_is_sharedEv@@GLIBCXX_3.4'>
                 <parameter type-id='type-id-752' is-artificial='yes'/>
-                <return type-id='type-id-42'/>
+                <return type-id='type-id-40'/>
               </function-decl>
             </member-function>
             <member-function access='public'>
@@ -13884,7 +13847,7 @@
           <function-decl name='_M_disjunctXX' mangled-name='_ZNKSbIwSt11char_traitsIwESaIwEE11_M_disjunctEPKw' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/basic_string.h' line='342' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSbIwSt11char_traitsIwESaIwEE11_M_disjunctEPKw@GLIBCXX_3.4'>
             <parameter type-id='type-id-749' is-artificial='yes'/>
             <parameter type-id='type-id-354'/>
-            <return type-id='type-id-42'/>
+            <return type-id='type-id-40'/>
           </function-decl>
         </member-function>
         <member-function access='private' static='yes'>
@@ -14166,7 +14129,7 @@
         <member-function access='private' const='yes'>
           <function-decl name='empty' mangled-name='_ZNKSbIwSt11char_traitsIwESaIwEE5emptyEv' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/basic_string.h' line='808' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSbIwSt11char_traitsIwESaIwEE5emptyEv@@GLIBCXX_3.4'>
             <parameter type-id='type-id-749' is-artificial='yes'/>
-            <return type-id='type-id-42'/>
+            <return type-id='type-id-40'/>
           </function-decl>
         </member-function>
         <member-function access='private' const='yes'>
@@ -14856,7 +14819,7 @@
           <function-decl name='_M_disjunct' mangled-name='_ZNKSbIwSt11char_traitsIwESaIwEE11_M_disjunctEPKw' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/basic_string.h' line='342' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-749' is-artificial='yes'/>
             <parameter type-id='type-id-354'/>
-            <return type-id='type-id-42'/>
+            <return type-id='type-id-40'/>
           </function-decl>
         </member-function>
         <member-function access='private' static='yes'>
@@ -15250,7 +15213,7 @@
           </class-decl>
         </member-type>
         <member-type access='private'>
-          <typedef-decl name='size_type' type-id='type-id-94' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/allocator.h' line='92' column='1' id='type-id-988'/>
+          <typedef-decl name='size_type' type-id='type-id-93' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/allocator.h' line='92' column='1' id='type-id-988'/>
         </member-type>
         <member-type access='private'>
           <typedef-decl name='reference' type-id='type-id-362' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/allocator.h' line='96' column='1' id='type-id-991'/>
@@ -15553,27 +15516,27 @@
               <typedef-decl name='__int_type' type-id='type-id-759' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/istream' line='666' column='1' id='type-id-1030'/>
             </member-type>
             <data-member access='private' layout-offset-in-bits='0'>
-              <var-decl name='_M_ok' type-id='type-id-42' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/istream' line='658' column='1'/>
+              <var-decl name='_M_ok' type-id='type-id-40' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/istream' line='658' column='1'/>
             </data-member>
             <member-function access='private' constructor='yes'>
               <function-decl name='sentry' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/istream.tcc' line='48' column='1' visibility='default' binding='global' size-in-bits='64'>
                 <parameter type-id='type-id-806' is-artificial='yes'/>
                 <parameter type-id='type-id-802'/>
-                <parameter type-id='type-id-42'/>
+                <parameter type-id='type-id-40'/>
                 <return type-id='type-id-5'/>
               </function-decl>
             </member-function>
             <member-function access='private' const='yes'>
               <function-decl name='operator bool' mangled-name='_ZNKSi6sentrycvbEv' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/istream' line='703' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSi6sentrycvbEv@@GLIBCXX_3.4'>
                 <parameter type-id='type-id-721' is-artificial='yes'/>
-                <return type-id='type-id-42'/>
+                <return type-id='type-id-40'/>
               </function-decl>
             </member-function>
             <member-function access='private' constructor='yes'>
               <function-decl name='sentry' mangled-name='_ZNSi6sentryC2ERSib' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/istream.tcc' line='48' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSi6sentryC2ERSib@@GLIBCXX_3.4'>
                 <parameter type-id='type-id-806' is-artificial='yes'/>
                 <parameter type-id='type-id-802'/>
-                <parameter type-id='type-id-42'/>
+                <parameter type-id='type-id-40'/>
                 <return type-id='type-id-5'/>
               </function-decl>
             </member-function>
@@ -15669,7 +15632,7 @@
           <function-decl name='basic_istream' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/istream' line='91' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-803' is-artificial='yes'/>
             <parameter type-id='type-id-6' is-artificial='yes'/>
-            <parameter type-id='type-id-37' is-artificial='yes'/>
+            <parameter type-id='type-id-35' is-artificial='yes'/>
             <parameter type-id='type-id-1039'/>
             <return type-id='type-id-5'/>
           </function-decl>
@@ -15702,7 +15665,7 @@
           <function-decl name='basic_istream' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/istream' line='604' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-803' is-artificial='yes'/>
             <parameter type-id='type-id-6' is-artificial='yes'/>
-            <parameter type-id='type-id-37' is-artificial='yes'/>
+            <parameter type-id='type-id-35' is-artificial='yes'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
@@ -15984,7 +15947,7 @@
           <function-decl name='basic_istream' mangled-name='_ZNSiC2EPSt15basic_streambufIcSt11char_traitsIcEE' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/istream' line='91' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSiC2EPSt15basic_streambufIcSt11char_traitsIcEE@@GLIBCXX_3.4'>
             <parameter type-id='type-id-803' is-artificial='yes'/>
             <parameter type-id='type-id-6' is-artificial='yes'/>
-            <parameter type-id='type-id-37' is-artificial='yes'/>
+            <parameter type-id='type-id-35' is-artificial='yes'/>
             <parameter type-id='type-id-1039'/>
             <return type-id='type-id-5'/>
           </function-decl>
@@ -15993,7 +15956,7 @@
           <function-decl name='basic_istream' mangled-name='_ZNSiC1EPSt15basic_streambufIcSt11char_traitsIcEE' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/istream' line='91' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSiC1EPSt15basic_streambufIcSt11char_traitsIcEE@@GLIBCXX_3.4'>
             <parameter type-id='type-id-803' is-artificial='yes'/>
             <parameter type-id='type-id-6' is-artificial='yes'/>
-            <parameter type-id='type-id-37' is-artificial='yes'/>
+            <parameter type-id='type-id-35' is-artificial='yes'/>
             <parameter type-id='type-id-1039'/>
             <return type-id='type-id-5'/>
           </function-decl>
@@ -16002,7 +15965,7 @@
           <function-decl name='basic_istream' mangled-name='_ZNSiC2Ev' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/istream' line='604' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSiC2Ev@@GLIBCXX_3.4'>
             <parameter type-id='type-id-803' is-artificial='yes'/>
             <parameter type-id='type-id-6' is-artificial='yes'/>
-            <parameter type-id='type-id-37' is-artificial='yes'/>
+            <parameter type-id='type-id-35' is-artificial='yes'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
@@ -16010,7 +15973,7 @@
           <function-decl name='basic_istream' mangled-name='_ZNSiC1Ev' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/istream' line='604' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSiC1Ev@@GLIBCXX_3.4'>
             <parameter type-id='type-id-803' is-artificial='yes'/>
             <parameter type-id='type-id-6' is-artificial='yes'/>
-            <parameter type-id='type-id-37' is-artificial='yes'/>
+            <parameter type-id='type-id-35' is-artificial='yes'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
@@ -16018,7 +15981,7 @@
           <function-decl name='~basic_istream' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/istream' line='101' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-803' is-artificial='yes'/>
             <parameter type-id='type-id-6' is-artificial='yes'/>
-            <parameter type-id='type-id-37' is-artificial='yes'/>
+            <parameter type-id='type-id-35' is-artificial='yes'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
@@ -16026,7 +15989,7 @@
           <function-decl name='~basic_istream' mangled-name='_ZNSiD0Ev' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/istream' line='101' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSiD0Ev@@GLIBCXX_3.4'>
             <parameter type-id='type-id-803' is-artificial='yes'/>
             <parameter type-id='type-id-6' is-artificial='yes'/>
-            <parameter type-id='type-id-37' is-artificial='yes'/>
+            <parameter type-id='type-id-35' is-artificial='yes'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
@@ -16034,7 +15997,7 @@
           <function-decl name='~basic_istream' mangled-name='_ZNSiD1Ev' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/istream' line='101' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSiD1Ev@@GLIBCXX_3.4'>
             <parameter type-id='type-id-803' is-artificial='yes'/>
             <parameter type-id='type-id-6' is-artificial='yes'/>
-            <parameter type-id='type-id-37' is-artificial='yes'/>
+            <parameter type-id='type-id-35' is-artificial='yes'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
@@ -16042,7 +16005,7 @@
           <function-decl name='~basic_istream' mangled-name='_ZNSiD2Ev' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/istream' line='101' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSiD2Ev@@GLIBCXX_3.4'>
             <parameter type-id='type-id-803' is-artificial='yes'/>
             <parameter type-id='type-id-6' is-artificial='yes'/>
-            <parameter type-id='type-id-37' is-artificial='yes'/>
+            <parameter type-id='type-id-35' is-artificial='yes'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
@@ -16061,27 +16024,27 @@
               <typedef-decl name='__int_type' type-id='type-id-766' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/istream' line='666' column='1' id='type-id-1057'/>
             </member-type>
             <data-member access='private' layout-offset-in-bits='0'>
-              <var-decl name='_M_ok' type-id='type-id-42' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/istream' line='658' column='1'/>
+              <var-decl name='_M_ok' type-id='type-id-40' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/istream' line='658' column='1'/>
             </data-member>
             <member-function access='private' constructor='yes'>
               <function-decl name='sentry' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/istream.tcc' line='48' column='1' visibility='default' binding='global' size-in-bits='64'>
                 <parameter type-id='type-id-812' is-artificial='yes'/>
                 <parameter type-id='type-id-808'/>
-                <parameter type-id='type-id-42'/>
+                <parameter type-id='type-id-40'/>
                 <return type-id='type-id-5'/>
               </function-decl>
             </member-function>
             <member-function access='private' const='yes'>
               <function-decl name='operator bool' mangled-name='_ZNKSt13basic_istreamIwSt11char_traitsIwEE6sentrycvbEv' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/istream' line='703' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSt13basic_istreamIwSt11char_traitsIwEE6sentrycvbEv@@GLIBCXX_3.4'>
                 <parameter type-id='type-id-726' is-artificial='yes'/>
-                <return type-id='type-id-42'/>
+                <return type-id='type-id-40'/>
               </function-decl>
             </member-function>
             <member-function access='private' constructor='yes'>
               <function-decl name='sentry' mangled-name='_ZNSt13basic_istreamIwSt11char_traitsIwEE6sentryC2ERS2_b' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/istream.tcc' line='48' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt13basic_istreamIwSt11char_traitsIwEE6sentryC1ERS2_b@@GLIBCXX_3.4'>
                 <parameter type-id='type-id-812' is-artificial='yes'/>
                 <parameter type-id='type-id-808'/>
-                <parameter type-id='type-id-42'/>
+                <parameter type-id='type-id-40'/>
                 <return type-id='type-id-5'/>
               </function-decl>
             </member-function>
@@ -16183,7 +16146,7 @@
           <function-decl name='basic_istream' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/istream' line='91' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-809' is-artificial='yes'/>
             <parameter type-id='type-id-6' is-artificial='yes'/>
-            <parameter type-id='type-id-37' is-artificial='yes'/>
+            <parameter type-id='type-id-35' is-artificial='yes'/>
             <parameter type-id='type-id-1064'/>
             <return type-id='type-id-5'/>
           </function-decl>
@@ -16216,7 +16179,7 @@
           <function-decl name='basic_istream' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/istream' line='604' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-809' is-artificial='yes'/>
             <parameter type-id='type-id-6' is-artificial='yes'/>
-            <parameter type-id='type-id-37' is-artificial='yes'/>
+            <parameter type-id='type-id-35' is-artificial='yes'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
@@ -16498,7 +16461,7 @@
           <function-decl name='basic_istream' mangled-name='_ZNSt13basic_istreamIwSt11char_traitsIwEEC2EPSt15basic_streambufIwS1_E' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/istream' line='91' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt13basic_istreamIwSt11char_traitsIwEEC2EPSt15basic_streambufIwS1_E@@GLIBCXX_3.4'>
             <parameter type-id='type-id-809' is-artificial='yes'/>
             <parameter type-id='type-id-6' is-artificial='yes'/>
-            <parameter type-id='type-id-37' is-artificial='yes'/>
+            <parameter type-id='type-id-35' is-artificial='yes'/>
             <parameter type-id='type-id-1064'/>
             <return type-id='type-id-5'/>
           </function-decl>
@@ -16507,7 +16470,7 @@
           <function-decl name='basic_istream' mangled-name='_ZNSt13basic_istreamIwSt11char_traitsIwEEC1EPSt15basic_streambufIwS1_E' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/istream' line='91' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt13basic_istreamIwSt11char_traitsIwEEC1EPSt15basic_streambufIwS1_E@@GLIBCXX_3.4'>
             <parameter type-id='type-id-809' is-artificial='yes'/>
             <parameter type-id='type-id-6' is-artificial='yes'/>
-            <parameter type-id='type-id-37' is-artificial='yes'/>
+            <parameter type-id='type-id-35' is-artificial='yes'/>
             <parameter type-id='type-id-1064'/>
             <return type-id='type-id-5'/>
           </function-decl>
@@ -16516,7 +16479,7 @@
           <function-decl name='basic_istream' mangled-name='_ZNSt13basic_istreamIwSt11char_traitsIwEEC2Ev' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/istream' line='604' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt13basic_istreamIwSt11char_traitsIwEEC2Ev@@GLIBCXX_3.4'>
             <parameter type-id='type-id-809' is-artificial='yes'/>
             <parameter type-id='type-id-6' is-artificial='yes'/>
-            <parameter type-id='type-id-37' is-artificial='yes'/>
+            <parameter type-id='type-id-35' is-artificial='yes'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
@@ -16524,7 +16487,7 @@
           <function-decl name='basic_istream' mangled-name='_ZNSt13basic_istreamIwSt11char_traitsIwEEC1Ev' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/istream' line='604' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt13basic_istreamIwSt11char_traitsIwEEC1Ev@@GLIBCXX_3.4'>
             <parameter type-id='type-id-809' is-artificial='yes'/>
             <parameter type-id='type-id-6' is-artificial='yes'/>
-            <parameter type-id='type-id-37' is-artificial='yes'/>
+            <parameter type-id='type-id-35' is-artificial='yes'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
@@ -16532,7 +16495,7 @@
           <function-decl name='~basic_istream' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/istream' line='101' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-809' is-artificial='yes'/>
             <parameter type-id='type-id-6' is-artificial='yes'/>
-            <parameter type-id='type-id-37' is-artificial='yes'/>
+            <parameter type-id='type-id-35' is-artificial='yes'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
@@ -16540,7 +16503,7 @@
           <function-decl name='~basic_istream' mangled-name='_ZNSt13basic_istreamIwSt11char_traitsIwEED0Ev' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/istream' line='101' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt13basic_istreamIwSt11char_traitsIwEED0Ev@@GLIBCXX_3.4'>
             <parameter type-id='type-id-809' is-artificial='yes'/>
             <parameter type-id='type-id-6' is-artificial='yes'/>
-            <parameter type-id='type-id-37' is-artificial='yes'/>
+            <parameter type-id='type-id-35' is-artificial='yes'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
@@ -16548,7 +16511,7 @@
           <function-decl name='~basic_istream' mangled-name='_ZNSt13basic_istreamIwSt11char_traitsIwEED1Ev' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/istream' line='101' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt13basic_istreamIwSt11char_traitsIwEED1Ev@@GLIBCXX_3.4'>
             <parameter type-id='type-id-809' is-artificial='yes'/>
             <parameter type-id='type-id-6' is-artificial='yes'/>
-            <parameter type-id='type-id-37' is-artificial='yes'/>
+            <parameter type-id='type-id-35' is-artificial='yes'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
@@ -16556,7 +16519,7 @@
           <function-decl name='~basic_istream' mangled-name='_ZNSt13basic_istreamIwSt11char_traitsIwEED2Ev' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/istream' line='101' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt13basic_istreamIwSt11char_traitsIwEED2Ev@@GLIBCXX_3.4'>
             <parameter type-id='type-id-809' is-artificial='yes'/>
             <parameter type-id='type-id-6' is-artificial='yes'/>
-            <parameter type-id='type-id-37' is-artificial='yes'/>
+            <parameter type-id='type-id-35' is-artificial='yes'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
@@ -16568,7 +16531,7 @@
             <parameter type-id='type-id-779' is-artificial='yes'/>
             <parameter type-id='type-id-676'/>
             <parameter type-id='type-id-676'/>
-            <return type-id='type-id-42'/>
+            <return type-id='type-id-40'/>
           </function-decl>
         </member-function>
       </class-decl>
@@ -16580,7 +16543,7 @@
             <parameter type-id='type-id-782' is-artificial='yes'/>
             <parameter type-id='type-id-787'/>
             <parameter type-id='type-id-787'/>
-            <return type-id='type-id-42'/>
+            <return type-id='type-id-40'/>
           </function-decl>
         </member-function>
       </class-decl>
@@ -16648,7 +16611,7 @@
           <function-decl name='equal' mangled-name='_ZNKSt21istreambuf_iteratorXXIcSt11char_traitsIcEE5equalERKS2_' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/streambuf_iterator.h' line='174' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-772' is-artificial='yes'/>
             <parameter type-id='type-id-771'/>
-            <return type-id='type-id-42'/>
+            <return type-id='type-id-40'/>
           </function-decl>
         </member-function>
         <member-function access='private' const='yes'>
@@ -16660,7 +16623,7 @@
         <member-function access='private' const='yes'>
           <function-decl name='_M_at_eof' mangled-name='_ZNKSt21istreambuf_iteratorXXIcSt11char_traitsIcEE9_M_at_eofEv' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/streambuf_iterator.h' line='197' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-772' is-artificial='yes'/>
-            <return type-id='type-id-42'/>
+            <return type-id='type-id-40'/>
           </function-decl>
         </member-function>
       </class-decl>
@@ -16728,7 +16691,7 @@
           <function-decl name='equal' mangled-name='_ZNKSt21istreambuf_iteratorXXIwSt11char_traitsIwEE5equalERKS2_' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/streambuf_iterator.h' line='174' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-776' is-artificial='yes'/>
             <parameter type-id='type-id-775'/>
-            <return type-id='type-id-42'/>
+            <return type-id='type-id-40'/>
           </function-decl>
         </member-function>
         <member-function access='private' const='yes'>
@@ -16740,7 +16703,7 @@
         <member-function access='private' const='yes'>
           <function-decl name='_M_at_eof' mangled-name='_ZNKSt21istreambuf_iteratorXXIwSt11char_traitsIwEE9_M_at_eofEv' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/streambuf_iterator.h' line='197' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-776' is-artificial='yes'/>
-            <return type-id='type-id-42'/>
+            <return type-id='type-id-40'/>
           </function-decl>
         </member-function>
       </class-decl>
@@ -16796,16 +16759,16 @@
           <var-decl name='_M_buf' type-id='type-id-1091' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/fstream' line='111' column='1'/>
         </data-member>
         <data-member access='protected' layout-offset-in-bits='1280'>
-          <var-decl name='_M_buf_size' type-id='type-id-94' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/fstream' line='118' column='1'/>
+          <var-decl name='_M_buf_size' type-id='type-id-93' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/fstream' line='118' column='1'/>
         </data-member>
         <data-member access='protected' layout-offset-in-bits='1344'>
-          <var-decl name='_M_buf_allocated' type-id='type-id-42' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/fstream' line='121' column='1'/>
+          <var-decl name='_M_buf_allocated' type-id='type-id-40' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/fstream' line='121' column='1'/>
         </data-member>
         <data-member access='protected' layout-offset-in-bits='1352'>
-          <var-decl name='_M_reading' type-id='type-id-42' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/fstream' line='130' column='1'/>
+          <var-decl name='_M_reading' type-id='type-id-40' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/fstream' line='130' column='1'/>
         </data-member>
         <data-member access='protected' layout-offset-in-bits='1360'>
-          <var-decl name='_M_writing' type-id='type-id-42' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/fstream' line='131' column='1'/>
+          <var-decl name='_M_writing' type-id='type-id-40' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/fstream' line='131' column='1'/>
         </data-member>
         <data-member access='protected' layout-offset-in-bits='1368'>
           <var-decl name='_M_pback' type-id='type-id-1083' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/fstream' line='139' column='1'/>
@@ -16817,13 +16780,13 @@
           <var-decl name='_M_pback_end_save' type-id='type-id-1091' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/fstream' line='141' column='1'/>
         </data-member>
         <data-member access='protected' layout-offset-in-bits='1536'>
-          <var-decl name='_M_pback_init' type-id='type-id-42' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/fstream' line='142' column='1'/>
+          <var-decl name='_M_pback_init' type-id='type-id-40' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/fstream' line='142' column='1'/>
         </data-member>
         <data-member access='protected' layout-offset-in-bits='1600'>
           <var-decl name='_M_codecvt' type-id='type-id-1092' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/fstream' line='146' column='1'/>
         </data-member>
         <data-member access='protected' layout-offset-in-bits='1664'>
-          <var-decl name='_M_ext_buf' type-id='type-id-93' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/fstream' line='153' column='1'/>
+          <var-decl name='_M_ext_buf' type-id='type-id-92' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/fstream' line='153' column='1'/>
         </data-member>
         <data-member access='protected' layout-offset-in-bits='1728'>
           <var-decl name='_M_ext_buf_size' type-id='type-id-872' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/fstream' line='158' column='1'/>
@@ -16832,12 +16795,12 @@
           <var-decl name='_M_ext_next' type-id='type-id-4' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/fstream' line='165' column='1'/>
         </data-member>
         <data-member access='protected' layout-offset-in-bits='1856'>
-          <var-decl name='_M_ext_end' type-id='type-id-93' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/fstream' line='166' column='1'/>
+          <var-decl name='_M_ext_end' type-id='type-id-92' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/fstream' line='166' column='1'/>
         </data-member>
         <member-function access='private' const='yes'>
           <function-decl name='is_open' mangled-name='_ZNKSt13basic_filebufIcSt11char_traitsIcEE7is_openEv' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/fstream' line='224' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSt13basic_filebufIcSt11char_traitsIcEE7is_openEv@@GLIBCXX_3.4'>
             <parameter type-id='type-id-695' is-artificial='yes'/>
-            <return type-id='type-id-42'/>
+            <return type-id='type-id-40'/>
           </function-decl>
         </member-function>
         <member-function access='protected'>
@@ -16902,9 +16865,9 @@
         <member-function access='protected'>
           <function-decl name='_M_convert_to_external' mangled-name='_ZNSt13basic_filebufIcSt11char_traitsIcEE22_M_convert_to_externalEPcl' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/fstream.tcc' line='487' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt13basic_filebufIcSt11char_traitsIcEE22_M_convert_to_externalEPcl@@GLIBCXX_3.4'>
             <parameter type-id='type-id-1093' is-artificial='yes'/>
-            <parameter type-id='type-id-93'/>
+            <parameter type-id='type-id-92'/>
             <parameter type-id='type-id-872'/>
-            <return type-id='type-id-42'/>
+            <return type-id='type-id-40'/>
           </function-decl>
         </member-function>
         <member-function access='protected'>
@@ -16926,7 +16889,7 @@
         <member-function access='protected'>
           <function-decl name='_M_terminate_output' mangled-name='_ZNSt13basic_filebufIcSt11char_traitsIcEE19_M_terminate_outputEv' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/fstream.tcc' line='833' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt13basic_filebufIcSt11char_traitsIcEE19_M_terminate_outputEv@@GLIBCXX_3.4'>
             <parameter type-id='type-id-1093' is-artificial='yes'/>
-            <return type-id='type-id-42'/>
+            <return type-id='type-id-40'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
@@ -17003,7 +16966,7 @@
         <member-function access='protected' vtable-offset='8'>
           <function-decl name='xsgetn' mangled-name='_ZNSt13basic_filebufIcSt11char_traitsIcEE6xsgetnEPcl' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/fstream.tcc' line='550' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt13basic_filebufIcSt11char_traitsIcEE6xsgetnEPcl@@GLIBCXX_3.4'>
             <parameter type-id='type-id-1093' is-artificial='yes'/>
-            <parameter type-id='type-id-93'/>
+            <parameter type-id='type-id-92'/>
             <parameter type-id='type-id-872'/>
             <return type-id='type-id-872'/>
           </function-decl>
@@ -17041,7 +17004,7 @@
         <member-function access='private' const='yes'>
           <function-decl name='is_open' mangled-name='_ZNKSt13basic_fstreamIcSt11char_traitsIcEE7is_openEv' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/fstream' line='856' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSt13basic_fstreamIcSt11char_traitsIcEE7is_openEv@GLIBCXX_3.4'>
             <parameter type-id='type-id-701' is-artificial='yes'/>
-            <return type-id='type-id-42'/>
+            <return type-id='type-id-40'/>
           </function-decl>
         </member-function>
       </class-decl>
@@ -17049,7 +17012,7 @@
         <member-function access='private' const='yes'>
           <function-decl name='is_open' mangled-name='_ZNKSt14basic_ifstreamIcSt11char_traitsIcEE7is_openEv' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/fstream' line='516' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSt14basic_ifstreamIcSt11char_traitsIcEE7is_openEv@GLIBCXX_3.4'>
             <parameter type-id='type-id-707' is-artificial='yes'/>
-            <return type-id='type-id-42'/>
+            <return type-id='type-id-40'/>
           </function-decl>
         </member-function>
       </class-decl>
@@ -17057,7 +17020,7 @@
         <member-function access='private' const='yes'>
           <function-decl name='is_open' mangled-name='_ZNKSt14basic_ofstreamIcSt11char_traitsIcEE7is_openEv' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/fstream' line='687' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSt14basic_ofstreamIcSt11char_traitsIcEE7is_openEv@@GLIBCXX_3.4.5'>
             <parameter type-id='type-id-729' is-artificial='yes'/>
-            <return type-id='type-id-42'/>
+            <return type-id='type-id-40'/>
           </function-decl>
         </member-function>
       </class-decl>
@@ -17112,16 +17075,16 @@
           <var-decl name='_M_buf' type-id='type-id-1107' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/fstream' line='111' column='1'/>
         </data-member>
         <data-member access='protected' layout-offset-in-bits='1280'>
-          <var-decl name='_M_buf_size' type-id='type-id-94' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/fstream' line='118' column='1'/>
+          <var-decl name='_M_buf_size' type-id='type-id-93' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/fstream' line='118' column='1'/>
         </data-member>
         <data-member access='protected' layout-offset-in-bits='1344'>
-          <var-decl name='_M_buf_allocated' type-id='type-id-42' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/fstream' line='121' column='1'/>
+          <var-decl name='_M_buf_allocated' type-id='type-id-40' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/fstream' line='121' column='1'/>
         </data-member>
         <data-member access='protected' layout-offset-in-bits='1352'>
-          <var-decl name='_M_reading' type-id='type-id-42' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/fstream' line='130' column='1'/>
+          <var-decl name='_M_reading' type-id='type-id-40' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/fstream' line='130' column='1'/>
         </data-member>
         <data-member access='protected' layout-offset-in-bits='1360'>
-          <var-decl name='_M_writing' type-id='type-id-42' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/fstream' line='131' column='1'/>
+          <var-decl name='_M_writing' type-id='type-id-40' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/fstream' line='131' column='1'/>
         </data-member>
         <data-member access='protected' layout-offset-in-bits='1376'>
           <var-decl name='_M_pback' type-id='type-id-1100' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/fstream' line='139' column='1'/>
@@ -17133,13 +17096,13 @@
           <var-decl name='_M_pback_end_save' type-id='type-id-1107' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/fstream' line='141' column='1'/>
         </data-member>
         <data-member access='protected' layout-offset-in-bits='1536'>
-          <var-decl name='_M_pback_init' type-id='type-id-42' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/fstream' line='142' column='1'/>
+          <var-decl name='_M_pback_init' type-id='type-id-40' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/fstream' line='142' column='1'/>
         </data-member>
         <data-member access='protected' layout-offset-in-bits='1600'>
           <var-decl name='_M_codecvt' type-id='type-id-1108' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/fstream' line='146' column='1'/>
         </data-member>
         <data-member access='protected' layout-offset-in-bits='1664'>
-          <var-decl name='_M_ext_buf' type-id='type-id-93' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/fstream' line='153' column='1'/>
+          <var-decl name='_M_ext_buf' type-id='type-id-92' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/fstream' line='153' column='1'/>
         </data-member>
         <data-member access='protected' layout-offset-in-bits='1728'>
           <var-decl name='_M_ext_buf_size' type-id='type-id-872' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/fstream' line='158' column='1'/>
@@ -17148,12 +17111,12 @@
           <var-decl name='_M_ext_next' type-id='type-id-4' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/fstream' line='165' column='1'/>
         </data-member>
         <data-member access='protected' layout-offset-in-bits='1856'>
-          <var-decl name='_M_ext_end' type-id='type-id-93' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/fstream' line='166' column='1'/>
+          <var-decl name='_M_ext_end' type-id='type-id-92' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/fstream' line='166' column='1'/>
         </data-member>
         <member-function access='private' const='yes'>
           <function-decl name='is_open' mangled-name='_ZNKSt13basic_filebufIwSt11char_traitsIwEE7is_openEv' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/fstream' line='224' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSt13basic_filebufIwSt11char_traitsIwEE7is_openEv@@GLIBCXX_3.4'>
             <parameter type-id='type-id-698' is-artificial='yes'/>
-            <return type-id='type-id-42'/>
+            <return type-id='type-id-40'/>
           </function-decl>
         </member-function>
         <member-function access='protected'>
@@ -17220,7 +17183,7 @@
             <parameter type-id='type-id-1109' is-artificial='yes'/>
             <parameter type-id='type-id-333'/>
             <parameter type-id='type-id-872'/>
-            <return type-id='type-id-42'/>
+            <return type-id='type-id-40'/>
           </function-decl>
         </member-function>
         <member-function access='protected'>
@@ -17242,7 +17205,7 @@
         <member-function access='protected'>
           <function-decl name='_M_terminate_output' mangled-name='_ZNSt13basic_filebufIwSt11char_traitsIwEE19_M_terminate_outputEv' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/fstream.tcc' line='833' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt13basic_filebufIwSt11char_traitsIwEE19_M_terminate_outputEv@@GLIBCXX_3.4'>
             <parameter type-id='type-id-1109' is-artificial='yes'/>
-            <return type-id='type-id-42'/>
+            <return type-id='type-id-40'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
@@ -17357,7 +17320,7 @@
         <member-function access='private' const='yes'>
           <function-decl name='is_open' mangled-name='_ZNKSt13basic_fstreamIwSt11char_traitsIwEE7is_openEv' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/fstream' line='856' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSt13basic_fstreamIwSt11char_traitsIwEE7is_openEv@GLIBCXX_3.4'>
             <parameter type-id='type-id-704' is-artificial='yes'/>
-            <return type-id='type-id-42'/>
+            <return type-id='type-id-40'/>
           </function-decl>
         </member-function>
       </class-decl>
@@ -17365,7 +17328,7 @@
         <member-function access='private' const='yes'>
           <function-decl name='is_open' mangled-name='_ZNKSt14basic_ifstreamIwSt11char_traitsIwEE7is_openEv' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/fstream' line='516' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSt14basic_ifstreamIwSt11char_traitsIwEE7is_openEv@@GLIBCXX_3.4.5'>
             <parameter type-id='type-id-710' is-artificial='yes'/>
-            <return type-id='type-id-42'/>
+            <return type-id='type-id-40'/>
           </function-decl>
         </member-function>
       </class-decl>
@@ -17373,7 +17336,7 @@
         <member-function access='private' const='yes'>
           <function-decl name='is_open' mangled-name='_ZNKSt14basic_ofstreamIwSt11char_traitsIwEE7is_openEv' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/fstream' line='687' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSt14basic_ofstreamIwSt11char_traitsIwEE7is_openEv@GLIBCXX_3.4'>
             <parameter type-id='type-id-732' is-artificial='yes'/>
-            <return type-id='type-id-42'/>
+            <return type-id='type-id-40'/>
           </function-decl>
         </member-function>
       </class-decl>
@@ -17383,10 +17346,10 @@
     <namespace-decl name='__gnu_cxx'>
       <class-decl name='new_allocator&lt;char&gt;' size-in-bits='8' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ext/new_allocator.h' line='54' column='1' id='type-id-658'>
         <member-type access='private'>
-          <typedef-decl name='size_type' type-id='type-id-94' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ext/new_allocator.h' line='57' column='1' id='type-id-1113'/>
+          <typedef-decl name='size_type' type-id='type-id-93' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ext/new_allocator.h' line='57' column='1' id='type-id-1113'/>
         </member-type>
         <member-type access='private'>
-          <typedef-decl name='pointer' type-id='type-id-93' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ext/new_allocator.h' line='59' column='1' id='type-id-1114'/>
+          <typedef-decl name='pointer' type-id='type-id-92' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ext/new_allocator.h' line='59' column='1' id='type-id-1114'/>
         </member-type>
         <member-type access='private'>
           <typedef-decl name='const_pointer' type-id='type-id-4' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ext/new_allocator.h' line='60' column='1' id='type-id-1115'/>
@@ -17435,7 +17398,7 @@
           <function-decl name='allocate' mangled-name='_ZN9__gnu_cxx13new_allocatorIcE8allocateEmPKv' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ext/new_allocator.h' line='89' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-659' is-artificial='yes'/>
             <parameter type-id='type-id-1113'/>
-            <parameter type-id='type-id-36'/>
+            <parameter type-id='type-id-34'/>
             <return type-id='type-id-1114'/>
           </function-decl>
         </member-function>
@@ -17483,7 +17446,7 @@
           <typedef-decl name='pointer' type-id='type-id-350' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/stl_iterator.h' line='723' column='1' id='type-id-1120'/>
         </member-type>
         <data-member access='protected' layout-offset-in-bits='0'>
-          <var-decl name='_M_current' type-id='type-id-93' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/stl_iterator.h' line='713' column='1'/>
+          <var-decl name='_M_current' type-id='type-id-92' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/stl_iterator.h' line='713' column='1'/>
         </data-member>
         <member-function access='private'>
           <function-decl name='__normal_iterator' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/stl_iterator.h' line='725' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -17686,7 +17649,7 @@
       </class-decl>
       <class-decl name='new_allocator&lt;wchar_t&gt;' size-in-bits='8' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ext/new_allocator.h' line='54' column='1' id='type-id-660'>
         <member-type access='private'>
-          <typedef-decl name='size_type' type-id='type-id-94' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ext/new_allocator.h' line='57' column='1' id='type-id-1131'/>
+          <typedef-decl name='size_type' type-id='type-id-93' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ext/new_allocator.h' line='57' column='1' id='type-id-1131'/>
         </member-type>
         <member-type access='private'>
           <typedef-decl name='pointer' type-id='type-id-333' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ext/new_allocator.h' line='59' column='1' id='type-id-1132'/>
@@ -17738,7 +17701,7 @@
           <function-decl name='allocate' mangled-name='_ZN9__gnu_cxx13new_allocatorIwE8allocateEmPKv' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ext/new_allocator.h' line='89' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-661' is-artificial='yes'/>
             <parameter type-id='type-id-1131'/>
-            <parameter type-id='type-id-36'/>
+            <parameter type-id='type-id-34'/>
             <return type-id='type-id-1132'/>
           </function-decl>
         </member-function>
@@ -18072,16 +18035,16 @@
     </function-decl>
     <function-decl name='mbrlen' filepath='/usr/include/wchar.h' line='397' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-4'/>
-      <parameter type-id='type-id-92'/>
+      <parameter type-id='type-id-91'/>
       <parameter type-id='type-id-791'/>
-      <return type-id='type-id-92'/>
+      <return type-id='type-id-91'/>
     </function-decl>
     <function-decl name='mbrtowc' filepath='/usr/include/wchar.h' line='363' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-333'/>
       <parameter type-id='type-id-4'/>
-      <parameter type-id='type-id-92'/>
+      <parameter type-id='type-id-91'/>
       <parameter type-id='type-id-791'/>
-      <return type-id='type-id-92'/>
+      <return type-id='type-id-91'/>
     </function-decl>
     <function-decl name='mbsinit' filepath='/usr/include/wchar.h' line='359' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-682'/>
@@ -18090,9 +18053,9 @@
     <function-decl name='mbsrtowcs' filepath='/usr/include/wchar.h' line='406' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-333'/>
       <parameter type-id='type-id-677'/>
-      <parameter type-id='type-id-92'/>
+      <parameter type-id='type-id-91'/>
       <parameter type-id='type-id-791'/>
-      <return type-id='type-id-92'/>
+      <return type-id='type-id-91'/>
     </function-decl>
     <function-decl name='putwc' filepath='/usr/include/wchar.h' line='758' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-375'/>
@@ -18105,7 +18068,7 @@
     </function-decl>
     <function-decl name='swprintf' filepath='/usr/include/wchar.h' line='602' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-333'/>
-      <parameter type-id='type-id-92'/>
+      <parameter type-id='type-id-91'/>
       <parameter type-id='type-id-354'/>
       <parameter is-variadic='yes'/>
       <return type-id='type-id-6'/>
@@ -18135,7 +18098,7 @@
     </function-decl>
     <function-decl name='vswprintf' filepath='/usr/include/wchar.h' line='623' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-333'/>
-      <parameter type-id='type-id-92'/>
+      <parameter type-id='type-id-91'/>
       <parameter type-id='type-id-354'/>
       <parameter type-id='type-id-847'/>
       <return type-id='type-id-6'/>
@@ -18157,10 +18120,10 @@
       <return type-id='type-id-6'/>
     </function-decl>
     <function-decl name='wcrtomb' filepath='/usr/include/wchar.h' line='368' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-93'/>
+      <parameter type-id='type-id-92'/>
       <parameter type-id='type-id-375'/>
       <parameter type-id='type-id-791'/>
-      <return type-id='type-id-92'/>
+      <return type-id='type-id-91'/>
     </function-decl>
     <function-decl name='wcscat' filepath='/usr/include/wchar.h' line='152' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-333'/>
@@ -18185,48 +18148,48 @@
     <function-decl name='wcscspn' filepath='/usr/include/wchar.h' line='249' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-354'/>
       <parameter type-id='type-id-354'/>
-      <return type-id='type-id-92'/>
+      <return type-id='type-id-91'/>
     </function-decl>
     <function-decl name='wcsftime' filepath='/usr/include/wchar.h' line='853' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-333'/>
-      <parameter type-id='type-id-92'/>
+      <parameter type-id='type-id-91'/>
       <parameter type-id='type-id-354'/>
       <parameter type-id='type-id-253'/>
-      <return type-id='type-id-92'/>
+      <return type-id='type-id-91'/>
     </function-decl>
     <function-decl name='wcslen' filepath='/usr/include/wchar.h' line='284' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-354'/>
-      <return type-id='type-id-92'/>
+      <return type-id='type-id-91'/>
     </function-decl>
     <function-decl name='wcsncat' filepath='/usr/include/wchar.h' line='155' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-333'/>
       <parameter type-id='type-id-354'/>
-      <parameter type-id='type-id-92'/>
+      <parameter type-id='type-id-91'/>
       <return type-id='type-id-333'/>
     </function-decl>
     <function-decl name='wcsncmp' filepath='/usr/include/wchar.h' line='163' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-354'/>
       <parameter type-id='type-id-354'/>
-      <parameter type-id='type-id-92'/>
+      <parameter type-id='type-id-91'/>
       <return type-id='type-id-6'/>
     </function-decl>
     <function-decl name='wcsncpy' filepath='/usr/include/wchar.h' line='147' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-333'/>
       <parameter type-id='type-id-354'/>
-      <parameter type-id='type-id-92'/>
+      <parameter type-id='type-id-91'/>
       <return type-id='type-id-333'/>
     </function-decl>
     <function-decl name='wcsrtombs' filepath='/usr/include/wchar.h' line='412' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-93'/>
-      <parameter type-id='type-id-788'/>
       <parameter type-id='type-id-92'/>
+      <parameter type-id='type-id-788'/>
+      <parameter type-id='type-id-91'/>
       <parameter type-id='type-id-791'/>
-      <return type-id='type-id-92'/>
+      <return type-id='type-id-91'/>
     </function-decl>
     <function-decl name='wcsspn' filepath='/usr/include/wchar.h' line='253' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-354'/>
       <parameter type-id='type-id-354'/>
-      <return type-id='type-id-92'/>
+      <return type-id='type-id-91'/>
     </function-decl>
     <function-decl name='wcstod' filepath='/usr/include/wchar.h' line='448' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-354'/>
@@ -18248,19 +18211,19 @@
       <parameter type-id='type-id-354'/>
       <parameter type-id='type-id-848'/>
       <parameter type-id='type-id-6'/>
-      <return type-id='type-id-22'/>
+      <return type-id='type-id-20'/>
     </function-decl>
     <function-decl name='wcstoul' filepath='/usr/include/wchar.h' line='471' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-354'/>
       <parameter type-id='type-id-848'/>
       <parameter type-id='type-id-6'/>
-      <return type-id='type-id-51'/>
+      <return type-id='type-id-49'/>
     </function-decl>
     <function-decl name='wcsxfrm' filepath='/usr/include/wchar.h' line='193' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-333'/>
       <parameter type-id='type-id-354'/>
-      <parameter type-id='type-id-92'/>
-      <return type-id='type-id-92'/>
+      <parameter type-id='type-id-91'/>
+      <return type-id='type-id-91'/>
     </function-decl>
     <function-decl name='wctob' filepath='/usr/include/wchar.h' line='392' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-635'/>
@@ -18269,25 +18232,25 @@
     <function-decl name='wmemcmp' filepath='/usr/include/wchar.h' line='322' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-354'/>
       <parameter type-id='type-id-354'/>
-      <parameter type-id='type-id-92'/>
+      <parameter type-id='type-id-91'/>
       <return type-id='type-id-6'/>
     </function-decl>
     <function-decl name='wmemcpy' filepath='/usr/include/wchar.h' line='327' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-333'/>
       <parameter type-id='type-id-354'/>
-      <parameter type-id='type-id-92'/>
+      <parameter type-id='type-id-91'/>
       <return type-id='type-id-333'/>
     </function-decl>
     <function-decl name='wmemmove' filepath='/usr/include/wchar.h' line='332' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-333'/>
       <parameter type-id='type-id-354'/>
-      <parameter type-id='type-id-92'/>
+      <parameter type-id='type-id-91'/>
       <return type-id='type-id-333'/>
     </function-decl>
     <function-decl name='wmemset' filepath='/usr/include/wchar.h' line='336' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-333'/>
       <parameter type-id='type-id-375'/>
-      <parameter type-id='type-id-92'/>
+      <parameter type-id='type-id-91'/>
       <return type-id='type-id-333'/>
     </function-decl>
     <function-decl name='wprintf' filepath='/usr/include/wchar.h' line='599' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -18323,7 +18286,7 @@
     <function-decl name='wmemchr' mangled-name='wmemchr' filepath='/usr/include/wchar.h' line='313' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-354'/>
       <parameter type-id='type-id-375'/>
-      <parameter type-id='type-id-92'/>
+      <parameter type-id='type-id-91'/>
       <return type-id='type-id-354'/>
     </function-decl>
     <function-decl name='wcstold' filepath='/usr/include/wchar.h' line='457' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -18346,7 +18309,7 @@
     <function-decl name='setlocale' filepath='/usr/include/locale.h' line='125' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-6'/>
       <parameter type-id='type-id-4'/>
-      <return type-id='type-id-93'/>
+      <return type-id='type-id-92'/>
     </function-decl>
     <function-decl name='localeconv' filepath='/usr/include/locale.h' line='128' column='1' visibility='default' binding='global' size-in-bits='64'>
       <return type-id='type-id-790'/>
@@ -18399,10 +18362,10 @@
       <return type-id='type-id-6'/>
     </function-decl>
     <function-decl name='fgets' filepath='/usr/include/stdio.h' line='626' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-93'/>
+      <parameter type-id='type-id-92'/>
       <parameter type-id='type-id-6'/>
       <parameter type-id='type-id-185'/>
-      <return type-id='type-id-93'/>
+      <return type-id='type-id-92'/>
     </function-decl>
     <function-decl name='fopen' filepath='/usr/include/stdio.h' line='271' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-4'/>
@@ -18410,11 +18373,11 @@
       <return type-id='type-id-185'/>
     </function-decl>
     <function-decl name='fread' filepath='/usr/include/stdio.h' line='704' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-36'/>
-      <parameter type-id='type-id-92'/>
-      <parameter type-id='type-id-92'/>
+      <parameter type-id='type-id-34'/>
+      <parameter type-id='type-id-91'/>
+      <parameter type-id='type-id-91'/>
       <parameter type-id='type-id-185'/>
-      <return type-id='type-id-92'/>
+      <return type-id='type-id-91'/>
     </function-decl>
     <function-decl name='freopen' filepath='/usr/include/stdio.h' line='277' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-4'/>
@@ -18424,7 +18387,7 @@
     </function-decl>
     <function-decl name='fseek' filepath='/usr/include/stdio.h' line='744' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-185'/>
-      <parameter type-id='type-id-22'/>
+      <parameter type-id='type-id-20'/>
       <parameter type-id='type-id-6'/>
       <return type-id='type-id-6'/>
     </function-decl>
@@ -18435,7 +18398,7 @@
     </function-decl>
     <function-decl name='ftell' filepath='/usr/include/stdio.h' line='749' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-185'/>
-      <return type-id='type-id-22'/>
+      <return type-id='type-id-20'/>
     </function-decl>
     <function-decl name='getc' filepath='/usr/include/stdio.h' line='536' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-185'/>
@@ -18445,8 +18408,8 @@
       <return type-id='type-id-6'/>
     </function-decl>
     <function-decl name='gets' filepath='/usr/include/stdio.h' line='634' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-93'/>
-      <return type-id='type-id-93'/>
+      <parameter type-id='type-id-92'/>
+      <return type-id='type-id-92'/>
     </function-decl>
     <function-decl name='perror' filepath='/usr/include/stdio.h' line='841' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-4'/>
@@ -18471,22 +18434,22 @@
     </function-decl>
     <function-decl name='setbuf' filepath='/usr/include/stdio.h' line='331' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-185'/>
-      <parameter type-id='type-id-93'/>
+      <parameter type-id='type-id-92'/>
       <return type-id='type-id-5'/>
     </function-decl>
     <function-decl name='setvbuf' filepath='/usr/include/stdio.h' line='335' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-185'/>
-      <parameter type-id='type-id-93'/>
-      <parameter type-id='type-id-6'/>
       <parameter type-id='type-id-92'/>
+      <parameter type-id='type-id-6'/>
+      <parameter type-id='type-id-91'/>
       <return type-id='type-id-6'/>
     </function-decl>
     <function-decl name='tmpfile' filepath='/usr/include/stdio.h' line='194' column='1' visibility='default' binding='global' size-in-bits='64'>
       <return type-id='type-id-185'/>
     </function-decl>
     <function-decl name='tmpnam' filepath='/usr/include/stdio.h' line='208' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-93'/>
-      <return type-id='type-id-93'/>
+      <parameter type-id='type-id-92'/>
+      <return type-id='type-id-92'/>
     </function-decl>
     <function-decl name='ungetc' filepath='/usr/include/stdio.h' line='697' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-6'/>
@@ -18501,18 +18464,18 @@
     <function-type size-in-bits='64' id='type-id-662'>
       <parameter type-id='type-id-674'/>
       <parameter type-id='type-id-674'/>
-      <return type-id='type-id-42'/>
+      <return type-id='type-id-40'/>
     </function-type>
     <function-type size-in-bits='64' id='type-id-664'>
       <parameter type-id='type-id-785'/>
       <parameter type-id='type-id-785'/>
-      <return type-id='type-id-42'/>
+      <return type-id='type-id-40'/>
     </function-type>
     <class-decl name='__anonymous_struct__' size-in-bits='64' is-struct='yes' is-anonymous='yes' naming-typedef-id='type-id-644' visibility='default' filepath='/usr/include/wchar.h' line='84' column='1' id='type-id-646'>
       <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-1154'>
           <data-member access='private'>
-            <var-decl name='__wch' type-id='type-id-41' visibility='default' filepath='/usr/include/wchar.h' line='89' column='1'/>
+            <var-decl name='__wch' type-id='type-id-39' visibility='default' filepath='/usr/include/wchar.h' line='89' column='1'/>
           </data-member>
           <data-member access='private'>
             <var-decl name='__wchb' type-id='type-id-627' visibility='default' filepath='/usr/include/wchar.h' line='93' column='1'/>
@@ -18536,7 +18499,7 @@
         <var-decl name='tv_usec' type-id='type-id-1156' visibility='default' filepath='/usr/include/bits/time.h' line='78' column='1'/>
       </data-member>
     </class-decl>
-    <typedef-decl name='__suseconds_t' type-id='type-id-22' filepath='/usr/include/bits/types.h' line='151' column='1' id='type-id-1156'/>
+    <typedef-decl name='__suseconds_t' type-id='type-id-20' filepath='/usr/include/bits/types.h' line='151' column='1' id='type-id-1156'/>
     <class-decl name='timezone' size-in-bits='64' is-struct='yes' visibility='default' filepath='/usr/include/sys/time.h' line='57' column='1' id='type-id-1157'>
       <data-member access='public' layout-offset-in-bits='0'>
         <var-decl name='tz_minuteswest' type-id='type-id-6' visibility='default' filepath='/usr/include/sys/time.h' line='59' column='1'/>
@@ -18573,7 +18536,7 @@
       <namespace-decl name='chrono'>
         <class-decl name='duration&lt;long int, std::ratio&lt;1l, 1000000l&gt; &gt;' size-in-bits='64' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/chrono' line='221' column='1' id='type-id-1158'>
           <member-type access='public'>
-            <typedef-decl name='rep' type-id='type-id-22' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/chrono' line='223' column='1' id='type-id-1162'/>
+            <typedef-decl name='rep' type-id='type-id-20' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/chrono' line='223' column='1' id='type-id-1162'/>
           </member-type>
           <data-member access='private' layout-offset-in-bits='0'>
             <var-decl name='__r' type-id='type-id-1162' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/chrono' line='350' column='1'/>
@@ -18709,7 +18672,7 @@
         </class-decl>
         <class-decl name='duration&lt;long int, std::ratio&lt;1l, 1l&gt; &gt;' size-in-bits='64' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/chrono' line='221' column='1' id='type-id-1165'>
           <member-type access='public'>
-            <typedef-decl name='rep' type-id='type-id-22' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/chrono' line='223' column='1' id='type-id-1169'/>
+            <typedef-decl name='rep' type-id='type-id-20' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/chrono' line='223' column='1' id='type-id-1169'/>
           </member-type>
           <data-member access='private' layout-offset-in-bits='0'>
             <var-decl name='__r' type-id='type-id-1169' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/chrono' line='350' column='1'/>
@@ -18936,7 +18899,7 @@
             <var-decl name='__lock' type-id='type-id-6' visibility='default' filepath='/usr/include/bits/pthreadtypes.h' line='119' column='1'/>
           </data-member>
           <data-member access='public' layout-offset-in-bits='32'>
-            <var-decl name='__futex' type-id='type-id-41' visibility='default' filepath='/usr/include/bits/pthreadtypes.h' line='120' column='1'/>
+            <var-decl name='__futex' type-id='type-id-39' visibility='default' filepath='/usr/include/bits/pthreadtypes.h' line='120' column='1'/>
           </data-member>
           <data-member access='public' layout-offset-in-bits='64'>
             <var-decl name='__total_seq' type-id='type-id-376' visibility='default' filepath='/usr/include/bits/pthreadtypes.h' line='121' column='1'/>
@@ -18948,13 +18911,13 @@
             <var-decl name='__woken_seq' type-id='type-id-376' visibility='default' filepath='/usr/include/bits/pthreadtypes.h' line='123' column='1'/>
           </data-member>
           <data-member access='public' layout-offset-in-bits='256'>
-            <var-decl name='__mutex' type-id='type-id-36' visibility='default' filepath='/usr/include/bits/pthreadtypes.h' line='124' column='1'/>
+            <var-decl name='__mutex' type-id='type-id-34' visibility='default' filepath='/usr/include/bits/pthreadtypes.h' line='124' column='1'/>
           </data-member>
           <data-member access='public' layout-offset-in-bits='320'>
-            <var-decl name='__nwaiters' type-id='type-id-41' visibility='default' filepath='/usr/include/bits/pthreadtypes.h' line='125' column='1'/>
+            <var-decl name='__nwaiters' type-id='type-id-39' visibility='default' filepath='/usr/include/bits/pthreadtypes.h' line='125' column='1'/>
           </data-member>
           <data-member access='public' layout-offset-in-bits='352'>
-            <var-decl name='__broadcast_seq' type-id='type-id-41' visibility='default' filepath='/usr/include/bits/pthreadtypes.h' line='126' column='1'/>
+            <var-decl name='__broadcast_seq' type-id='type-id-39' visibility='default' filepath='/usr/include/bits/pthreadtypes.h' line='126' column='1'/>
           </data-member>
         </class-decl>
       </member-type>
@@ -18993,7 +18956,7 @@
           <var-decl name='_M_device' type-id='type-id-1216' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/mutex' line='636' column='1'/>
         </data-member>
         <data-member access='private' layout-offset-in-bits='64'>
-          <var-decl name='_M_owns' type-id='type-id-42' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/mutex' line='637' column='1'/>
+          <var-decl name='_M_owns' type-id='type-id-40' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/mutex' line='637' column='1'/>
         </data-member>
         <member-function access='private'>
           <function-decl name='unique_lock' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/mutex' line='472' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -19076,7 +19039,7 @@
         <member-function access='private'>
           <function-decl name='try_lock' mangled-name='_ZNSt11unique_lockISt5mutexE8try_lockEv' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/mutex' line='553' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1213' is-artificial='yes'/>
-            <return type-id='type-id-42'/>
+            <return type-id='type-id-40'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
@@ -19101,13 +19064,13 @@
         <member-function access='private' const='yes'>
           <function-decl name='owns_lock' mangled-name='_ZNKSt11unique_lockISt5mutexE9owns_lockEv' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/mutex' line='625' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1205' is-artificial='yes'/>
-            <return type-id='type-id-42'/>
+            <return type-id='type-id-40'/>
           </function-decl>
         </member-function>
         <member-function access='private' const='yes'>
           <function-decl name='operator bool' mangled-name='_ZNKSt11unique_lockISt5mutexEcvbEv' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/mutex' line='628' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1205' is-artificial='yes'/>
-            <return type-id='type-id-42'/>
+            <return type-id='type-id-40'/>
           </function-decl>
         </member-function>
         <member-function access='private' const='yes'>
@@ -19288,7 +19251,7 @@
     <pointer-type-def type-id='type-id-1250' size-in-bits='64' id='type-id-1251'/>
     <reference-type-def kind='lvalue' type-id='type-id-1252' size-in-bits='64' id='type-id-1253'/>
     <reference-type-def kind='lvalue' type-id='type-id-1254' size-in-bits='64' id='type-id-1255'/>
-    <qualified-type-def type-id='type-id-36' const='yes' id='type-id-1256'/>
+    <qualified-type-def type-id='type-id-34' const='yes' id='type-id-1256'/>
     <reference-type-def kind='lvalue' type-id='type-id-1256' size-in-bits='64' id='type-id-364'/>
     <namespace-decl name='__gnu_debug'>
       <class-decl name='_Safe_iterator_base' size-in-bits='256' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/debug/safe_base.h' line='51' column='1' id='type-id-1226'>
@@ -19296,7 +19259,7 @@
           <var-decl name='_M_sequence' type-id='type-id-1235' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/debug/safe_base.h' line='56' column='1'/>
         </data-member>
         <data-member access='private' layout-offset-in-bits='64'>
-          <var-decl name='_M_version' type-id='type-id-41' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/debug/safe_base.h' line='65' column='1'/>
+          <var-decl name='_M_version' type-id='type-id-39' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/debug/safe_base.h' line='65' column='1'/>
         </data-member>
         <data-member access='private' layout-offset-in-bits='128'>
           <var-decl name='_M_prior' type-id='type-id-1228' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/debug/safe_base.h' line='69' column='1'/>
@@ -19314,7 +19277,7 @@
           <function-decl name='_Safe_iterator_base' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/debug/safe_base.h' line='88' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1228' is-artificial='yes'/>
             <parameter type-id='type-id-1251'/>
-            <parameter type-id='type-id-42'/>
+            <parameter type-id='type-id-40'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
@@ -19322,7 +19285,7 @@
           <function-decl name='_Safe_iterator_base' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/debug/safe_base.h' line='95' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1228' is-artificial='yes'/>
             <parameter type-id='type-id-1245'/>
-            <parameter type-id='type-id-42'/>
+            <parameter type-id='type-id-40'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
@@ -19350,14 +19313,14 @@
         <member-function access='protected'>
           <function-decl name='_M_get_mutex' mangled-name='_ZN11__gnu_debug19_Safe_iterator_base12_M_get_mutexEv' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/debug/safe_base.h' line='108' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN11__gnu_debug19_Safe_iterator_base12_M_get_mutexEv@@GLIBCXX_3.4.9'>
             <parameter type-id='type-id-1228' is-artificial='yes'/>
-            <return type-id='type-id-62'/>
+            <return type-id='type-id-60'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='_M_attach' mangled-name='_ZN11__gnu_debug19_Safe_iterator_base9_M_attachEPNS_19_Safe_sequence_baseEb' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/debug/safe_base.h' line='116' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN11__gnu_debug19_Safe_iterator_base9_M_attachEPNS_19_Safe_sequence_baseEb@@GLIBCXX_3.4'>
             <parameter type-id='type-id-1228' is-artificial='yes'/>
             <parameter type-id='type-id-1235'/>
-            <parameter type-id='type-id-42'/>
+            <parameter type-id='type-id-40'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
@@ -19365,7 +19328,7 @@
           <function-decl name='_M_attach_single' mangled-name='_ZN11__gnu_debug19_Safe_iterator_base16_M_attach_singleEPNS_19_Safe_sequence_baseEb' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/debug/safe_base.h' line='119' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN11__gnu_debug19_Safe_iterator_base16_M_attach_singleEPNS_19_Safe_sequence_baseEb@@GLIBCXX_3.4.9'>
             <parameter type-id='type-id-1228' is-artificial='yes'/>
             <parameter type-id='type-id-1235'/>
-            <parameter type-id='type-id-42'/>
+            <parameter type-id='type-id-40'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
@@ -19385,20 +19348,20 @@
           <function-decl name='_M_attached_to' mangled-name='_ZNK11__gnu_debug19_Safe_iterator_base14_M_attached_toEPKNS_19_Safe_sequence_baseE' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/debug/safe_base.h' line='130' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1246' is-artificial='yes'/>
             <parameter type-id='type-id-1251'/>
-            <return type-id='type-id-42'/>
+            <return type-id='type-id-40'/>
           </function-decl>
         </member-function>
         <member-function access='private' const='yes'>
           <function-decl name='_M_singular' mangled-name='_ZNK11__gnu_debug19_Safe_iterator_base11_M_singularEv' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/debug/safe_base.h' line='134' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNK11__gnu_debug19_Safe_iterator_base11_M_singularEv@@GLIBCXX_3.4'>
             <parameter type-id='type-id-1246' is-artificial='yes'/>
-            <return type-id='type-id-42'/>
+            <return type-id='type-id-40'/>
           </function-decl>
         </member-function>
         <member-function access='private' const='yes'>
           <function-decl name='_M_can_compare' mangled-name='_ZNK11__gnu_debug19_Safe_iterator_base14_M_can_compareERKS0_' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/debug/safe_base.h' line='139' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNK11__gnu_debug19_Safe_iterator_base14_M_can_compareERKS0_@@GLIBCXX_3.4'>
             <parameter type-id='type-id-1246' is-artificial='yes'/>
             <parameter type-id='type-id-1245'/>
-            <return type-id='type-id-42'/>
+            <return type-id='type-id-40'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
@@ -19428,7 +19391,7 @@
           <var-decl name='_M_const_iterators' type-id='type-id-1228' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/debug/safe_base.h' line='185' column='1'/>
         </data-member>
         <data-member access='private' layout-offset-in-bits='128'>
-          <var-decl name='_M_version' type-id='type-id-41' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/debug/safe_base.h' line='188' column='1'/>
+          <var-decl name='_M_version' type-id='type-id-39' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/debug/safe_base.h' line='188' column='1'/>
         </data-member>
         <member-function access='protected' constructor='yes'>
           <function-decl name='_Safe_sequence_base' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/debug/safe_base.h' line='192' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -19471,7 +19434,7 @@
         <member-function access='protected'>
           <function-decl name='_M_get_mutex' mangled-name='_ZN11__gnu_debug19_Safe_sequence_base12_M_get_mutexEv' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/debug/safe_base.h' line='229' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN11__gnu_debug19_Safe_sequence_base12_M_get_mutexEv@@GLIBCXX_3.4.9'>
             <parameter type-id='type-id-1235' is-artificial='yes'/>
-            <return type-id='type-id-62'/>
+            <return type-id='type-id-60'/>
           </function-decl>
         </member-function>
         <member-function access='private' const='yes'>
@@ -19484,7 +19447,7 @@
           <function-decl name='_M_attach' mangled-name='_ZN11__gnu_debug19_Safe_sequence_base9_M_attachEPNS_19_Safe_iterator_baseEb' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/debug/safe_base.h' line='239' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1235' is-artificial='yes'/>
             <parameter type-id='type-id-1228'/>
-            <parameter type-id='type-id-42'/>
+            <parameter type-id='type-id-40'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
@@ -19492,7 +19455,7 @@
           <function-decl name='_M_attach_single' mangled-name='_ZN11__gnu_debug19_Safe_sequence_base16_M_attach_singleEPNS_19_Safe_iterator_baseEb' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/debug/safe_base.h' line='243' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1235' is-artificial='yes'/>
             <parameter type-id='type-id-1228'/>
-            <parameter type-id='type-id-42'/>
+            <parameter type-id='type-id-40'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
@@ -19514,7 +19477,7 @@
       <class-decl name='_Error_formatter' size-in-bits='4480' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/debug/formatter.h' line='115' column='1' id='type-id-1223'>
         <member-type access='private'>
           <enum-decl name='_Constness' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/debug/formatter.h' line='118' column='1' id='type-id-1257'>
-            <underlying-type type-id='type-id-39'/>
+            <underlying-type type-id='type-id-37'/>
             <enumerator name='__unknown_constness' value='0'/>
             <enumerator name='__const_iterator' value='1'/>
             <enumerator name='__mutable_iterator' value='2'/>
@@ -19523,7 +19486,7 @@
         </member-type>
         <member-type access='private'>
           <enum-decl name='_Iterator_state' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/debug/formatter.h' line='127' column='1' id='type-id-1258'>
-            <underlying-type type-id='type-id-39'/>
+            <underlying-type type-id='type-id-37'/>
             <enumerator name='__unknown_state' value='0'/>
             <enumerator name='__singular' value='1'/>
             <enumerator name='__begin' value='2'/>
@@ -19537,7 +19500,7 @@
           <class-decl name='_Parameter' size-in-bits='448' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/debug/formatter.h' line='143' column='1' id='type-id-1218'>
             <member-type access='public'>
               <enum-decl name='__anonymous_enum__' is-anonymous='yes' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/debug/formatter.h' line='146' column='1' id='type-id-1259'>
-                <underlying-type type-id='type-id-39'/>
+                <underlying-type type-id='type-id-37'/>
                 <enumerator name='__unused_param' value='0'/>
                 <enumerator name='__iterator' value='1'/>
                 <enumerator name='__sequence' value='2'/>
@@ -19553,10 +19516,10 @@
                       <var-decl name='_M_name' type-id='type-id-4' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/debug/formatter.h' line='159' column='1'/>
                     </data-member>
                     <data-member access='public' layout-offset-in-bits='64'>
-                      <var-decl name='_M_address' type-id='type-id-36' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/debug/formatter.h' line='160' column='1'/>
+                      <var-decl name='_M_address' type-id='type-id-34' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/debug/formatter.h' line='160' column='1'/>
                     </data-member>
                     <data-member access='public' layout-offset-in-bits='128'>
-                      <var-decl name='_M_type' type-id='type-id-40' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/debug/formatter.h' line='161' column='1'/>
+                      <var-decl name='_M_type' type-id='type-id-38' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/debug/formatter.h' line='161' column='1'/>
                     </data-member>
                     <data-member access='public' layout-offset-in-bits='192'>
                       <var-decl name='_M_constness' type-id='type-id-1257' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/debug/formatter.h' line='162' column='1'/>
@@ -19565,10 +19528,10 @@
                       <var-decl name='_M_state' type-id='type-id-1258' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/debug/formatter.h' line='163' column='1'/>
                     </data-member>
                     <data-member access='public' layout-offset-in-bits='256'>
-                      <var-decl name='_M_sequence' type-id='type-id-36' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/debug/formatter.h' line='164' column='1'/>
+                      <var-decl name='_M_sequence' type-id='type-id-34' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/debug/formatter.h' line='164' column='1'/>
                     </data-member>
                     <data-member access='public' layout-offset-in-bits='320'>
-                      <var-decl name='_M_seq_type' type-id='type-id-40' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/debug/formatter.h' line='165' column='1'/>
+                      <var-decl name='_M_seq_type' type-id='type-id-38' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/debug/formatter.h' line='165' column='1'/>
                     </data-member>
                   </class-decl>
                 </member-type>
@@ -19578,10 +19541,10 @@
                       <var-decl name='_M_name' type-id='type-id-4' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/debug/formatter.h' line='171' column='1'/>
                     </data-member>
                     <data-member access='public' layout-offset-in-bits='64'>
-                      <var-decl name='_M_address' type-id='type-id-36' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/debug/formatter.h' line='172' column='1'/>
+                      <var-decl name='_M_address' type-id='type-id-34' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/debug/formatter.h' line='172' column='1'/>
                     </data-member>
                     <data-member access='public' layout-offset-in-bits='128'>
-                      <var-decl name='_M_type' type-id='type-id-40' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/debug/formatter.h' line='173' column='1'/>
+                      <var-decl name='_M_type' type-id='type-id-38' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/debug/formatter.h' line='173' column='1'/>
                     </data-member>
                   </class-decl>
                 </member-type>
@@ -19591,7 +19554,7 @@
                       <var-decl name='_M_name' type-id='type-id-4' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/debug/formatter.h' line='179' column='1'/>
                     </data-member>
                     <data-member access='public' layout-offset-in-bits='64'>
-                      <var-decl name='_M_value' type-id='type-id-22' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/debug/formatter.h' line='180' column='1'/>
+                      <var-decl name='_M_value' type-id='type-id-20' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/debug/formatter.h' line='180' column='1'/>
                     </data-member>
                   </class-decl>
                 </member-type>
@@ -19634,7 +19597,7 @@
             <member-function access='public' constructor='yes'>
               <function-decl name='_Parameter' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/debug/formatter.h' line='193' column='1' visibility='default' binding='global' size-in-bits='64'>
                 <parameter type-id='type-id-1225' is-artificial='yes'/>
-                <parameter type-id='type-id-22'/>
+                <parameter type-id='type-id-20'/>
                 <parameter type-id='type-id-4'/>
                 <return type-id='type-id-5'/>
               </function-decl>
@@ -19666,7 +19629,7 @@
         </member-type>
         <member-type access='private'>
           <enum-decl name='__anonymous_enum__' is-anonymous='yes' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/debug/formatter.h' line='445' column='1' id='type-id-1265'>
-            <underlying-type type-id='type-id-39'/>
+            <underlying-type type-id='type-id-37'/>
             <enumerator name='_M_indent' value='4'/>
           </enum-decl>
         </member-type>
@@ -19674,33 +19637,33 @@
           <var-decl name='_M_file' type-id='type-id-4' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/debug/formatter.h' line='439' column='1'/>
         </data-member>
         <data-member access='private' layout-offset-in-bits='64'>
-          <var-decl name='_M_line' type-id='type-id-94' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/debug/formatter.h' line='440' column='1'/>
+          <var-decl name='_M_line' type-id='type-id-93' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/debug/formatter.h' line='440' column='1'/>
         </data-member>
         <data-member access='private' layout-offset-in-bits='128'>
           <var-decl name='_M_parameters' type-id='type-id-1219' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/debug/formatter.h' line='441' column='1'/>
         </data-member>
         <data-member access='private' layout-offset-in-bits='4160'>
-          <var-decl name='_M_num_parameters' type-id='type-id-94' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/debug/formatter.h' line='442' column='1'/>
+          <var-decl name='_M_num_parameters' type-id='type-id-93' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/debug/formatter.h' line='442' column='1'/>
         </data-member>
         <data-member access='private' layout-offset-in-bits='4224'>
           <var-decl name='_M_text' type-id='type-id-4' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/debug/formatter.h' line='443' column='1'/>
         </data-member>
         <data-member access='private' layout-offset-in-bits='4288'>
-          <var-decl name='_M_max_length' type-id='type-id-94' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/debug/formatter.h' line='444' column='1'/>
+          <var-decl name='_M_max_length' type-id='type-id-93' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/debug/formatter.h' line='444' column='1'/>
         </data-member>
         <data-member access='private' layout-offset-in-bits='4352'>
-          <var-decl name='_M_column' type-id='type-id-94' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/debug/formatter.h' line='446' column='1'/>
+          <var-decl name='_M_column' type-id='type-id-93' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/debug/formatter.h' line='446' column='1'/>
         </data-member>
         <data-member access='private' layout-offset-in-bits='4416'>
-          <var-decl name='_M_first_line' type-id='type-id-42' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/debug/formatter.h' line='447' column='1'/>
+          <var-decl name='_M_first_line' type-id='type-id-40' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/debug/formatter.h' line='447' column='1'/>
         </data-member>
         <data-member access='private' layout-offset-in-bits='4424'>
-          <var-decl name='_M_wordwrap' type-id='type-id-42' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/debug/formatter.h' line='448' column='1'/>
+          <var-decl name='_M_wordwrap' type-id='type-id-40' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/debug/formatter.h' line='448' column='1'/>
         </data-member>
         <member-function access='private' const='yes'>
           <function-decl name='_M_integer' mangled-name='_ZNK11__gnu_debug16_Error_formatter10_M_integerElPKc' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/debug/formatter.h' line='383' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1241' is-artificial='yes'/>
-            <parameter type-id='type-id-22'/>
+            <parameter type-id='type-id-20'/>
             <parameter type-id='type-id-4'/>
             <return type-id='type-id-1240'/>
           </function-decl>
@@ -19737,7 +19700,7 @@
           <function-decl name='_Error_formatter' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/debug/formatter.h' line='419' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1224' is-artificial='yes'/>
             <parameter type-id='type-id-4'/>
-            <parameter type-id='type-id-94'/>
+            <parameter type-id='type-id-93'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
@@ -19764,24 +19727,24 @@
         <member-function access='private' static='yes'>
           <function-decl name='_M_at' mangled-name='_ZN11__gnu_debug16_Error_formatter5_M_atEPKcm' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/debug/formatter.h' line='452' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-4'/>
-            <parameter type-id='type-id-94'/>
+            <parameter type-id='type-id-93'/>
             <return type-id='type-id-1223'/>
           </function-decl>
         </member-function>
         <member-function access='private' const='yes'>
           <function-decl name='_M_format_word&lt;const void*&gt;' mangled-name='_ZNK11__gnu_debug16_Error_formatter14_M_format_wordIPKvEEvPciPKcT_' filepath='../../../.././libstdc++-v3/src/c++11/debug.cc' line='782' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1241' is-artificial='yes'/>
-            <parameter type-id='type-id-93'/>
+            <parameter type-id='type-id-92'/>
             <parameter type-id='type-id-6'/>
             <parameter type-id='type-id-4'/>
-            <parameter type-id='type-id-36'/>
+            <parameter type-id='type-id-34'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='private' const='yes'>
           <function-decl name='_M_format_word&lt;const char*&gt;' mangled-name='_ZNK11__gnu_debug16_Error_formatter14_M_format_wordIPKcEEvPciS3_T_' filepath='../../../.././libstdc++-v3/src/c++11/debug.cc' line='782' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1241' is-artificial='yes'/>
-            <parameter type-id='type-id-93'/>
+            <parameter type-id='type-id-92'/>
             <parameter type-id='type-id-6'/>
             <parameter type-id='type-id-4'/>
             <parameter type-id='type-id-4'/>
@@ -19791,26 +19754,26 @@
         <member-function access='private' const='yes'>
           <function-decl name='_M_format_word&lt;long unsigned int&gt;' mangled-name='_ZNK11__gnu_debug16_Error_formatter14_M_format_wordImEEvPciPKcT_' filepath='../../../.././libstdc++-v3/src/c++11/debug.cc' line='782' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1241' is-artificial='yes'/>
-            <parameter type-id='type-id-93'/>
+            <parameter type-id='type-id-92'/>
             <parameter type-id='type-id-6'/>
             <parameter type-id='type-id-4'/>
-            <parameter type-id='type-id-51'/>
+            <parameter type-id='type-id-49'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='private' const='yes'>
           <function-decl name='_M_format_word&lt;long int&gt;' mangled-name='_ZNK11__gnu_debug16_Error_formatter14_M_format_wordIlEEvPciPKcT_' filepath='../../../.././libstdc++-v3/src/c++11/debug.cc' line='782' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1241' is-artificial='yes'/>
-            <parameter type-id='type-id-93'/>
+            <parameter type-id='type-id-92'/>
             <parameter type-id='type-id-6'/>
             <parameter type-id='type-id-4'/>
-            <parameter type-id='type-id-22'/>
+            <parameter type-id='type-id-20'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
       </class-decl>
       <enum-decl name='_Debug_msg_id' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/debug/formatter.h' line='55' column='1' id='type-id-1266'>
-        <underlying-type type-id='type-id-39'/>
+        <underlying-type type-id='type-id-37'/>
         <enumerator name='__msg_valid_range' value='0'/>
         <enumerator name='__msg_insert_singular' value='1'/>
         <enumerator name='__msg_insert_different' value='2'/>
@@ -19871,7 +19834,7 @@
           <function-decl name='_Safe_local_iterator_base' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/debug/safe_unordered_base.h' line='64' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1232' is-artificial='yes'/>
             <parameter type-id='type-id-1251'/>
-            <parameter type-id='type-id-42'/>
+            <parameter type-id='type-id-40'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
@@ -19879,7 +19842,7 @@
           <function-decl name='_Safe_local_iterator_base' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/debug/safe_unordered_base.h' line='70' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1232' is-artificial='yes'/>
             <parameter type-id='type-id-1248'/>
-            <parameter type-id='type-id-42'/>
+            <parameter type-id='type-id-40'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
@@ -19914,7 +19877,7 @@
           <function-decl name='_M_attach' mangled-name='_ZN11__gnu_debug25_Safe_local_iterator_base9_M_attachEPNS_19_Safe_sequence_baseEb' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/debug/safe_unordered_base.h' line='91' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN11__gnu_debug25_Safe_local_iterator_base9_M_attachEPNS_19_Safe_sequence_baseEb@@GLIBCXX_3.4.17'>
             <parameter type-id='type-id-1232' is-artificial='yes'/>
             <parameter type-id='type-id-1235'/>
-            <parameter type-id='type-id-42'/>
+            <parameter type-id='type-id-40'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
@@ -19922,7 +19885,7 @@
           <function-decl name='_M_attach_single' mangled-name='_ZN11__gnu_debug25_Safe_local_iterator_base16_M_attach_singleEPNS_19_Safe_sequence_baseEb' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/debug/safe_unordered_base.h' line='94' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1232' is-artificial='yes'/>
             <parameter type-id='type-id-1235'/>
-            <parameter type-id='type-id-42'/>
+            <parameter type-id='type-id-40'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
@@ -19977,7 +19940,7 @@
           <function-decl name='_M_attach_local' mangled-name='_ZN11__gnu_debug30_Safe_unordered_container_base15_M_attach_localEPNS_19_Safe_iterator_baseEb' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/debug/safe_unordered_base.h' line='159' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1238' is-artificial='yes'/>
             <parameter type-id='type-id-1228'/>
-            <parameter type-id='type-id-42'/>
+            <parameter type-id='type-id-40'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
@@ -19985,7 +19948,7 @@
           <function-decl name='_M_attach_local_single' mangled-name='_ZN11__gnu_debug30_Safe_unordered_container_base22_M_attach_local_singleEPNS_19_Safe_iterator_baseEb' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/debug/safe_unordered_base.h' line='163' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1238' is-artificial='yes'/>
             <parameter type-id='type-id-1228'/>
-            <parameter type-id='type-id-42'/>
+            <parameter type-id='type-id-40'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
@@ -20023,7 +19986,7 @@
       </function-decl>
       <class-decl name='remove_reference&lt;unsigned int&amp;&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/type_traits' line='1330' column='1' id='type-id-1268'>
         <member-type access='public'>
-          <typedef-decl name='type' type-id='type-id-41' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/type_traits' line='1331' column='1' id='type-id-1254'/>
+          <typedef-decl name='type' type-id='type-id-39' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/type_traits' line='1331' column='1' id='type-id-1254'/>
         </member-type>
       </class-decl>
       <function-decl name='move&lt;unsigned int&amp;&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/move.h' line='102' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -20037,8 +20000,8 @@
       </function-decl>
     </namespace-decl>
     <function-decl name='snprintf' filepath='/usr/include/stdio.h' line='385' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-93'/>
       <parameter type-id='type-id-92'/>
+      <parameter type-id='type-id-91'/>
       <parameter type-id='type-id-4'/>
       <parameter is-variadic='yes'/>
       <return type-id='type-id-6'/>
@@ -20046,7 +20009,7 @@
     <function-decl name='__assert_fail' filepath='/usr/include/assert.h' line='69' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-4'/>
       <parameter type-id='type-id-4'/>
-      <parameter type-id='type-id-41'/>
+      <parameter type-id='type-id-39'/>
       <parameter type-id='type-id-4'/>
       <return type-id='type-id-5'/>
     </function-decl>
@@ -20064,7 +20027,7 @@
       <member-type access='public'>
         <union-decl name='__anonymous_union__' size-in-bits='32' is-anonymous='yes' visibility='default' filepath='/usr/include/wchar.h' line='87' column='1' id='type-id-1270'>
           <data-member access='private'>
-            <var-decl name='__wch' type-id='type-id-41' visibility='default' filepath='/usr/include/wchar.h' line='89' column='1'/>
+            <var-decl name='__wch' type-id='type-id-39' visibility='default' filepath='/usr/include/wchar.h' line='89' column='1'/>
           </data-member>
           <data-member access='private'>
             <var-decl name='__wchb' type-id='type-id-627' visibility='default' filepath='/usr/include/wchar.h' line='93' column='1'/>
@@ -20086,7 +20049,7 @@
         <var-decl name='__size' type-id='type-id-187' visibility='default' filepath='/usr/include/bits/pthreadtypes.h' line='102' column='1'/>
       </data-member>
       <data-member access='private'>
-        <var-decl name='__align' type-id='type-id-22' visibility='default' filepath='/usr/include/bits/pthreadtypes.h' line='103' column='1'/>
+        <var-decl name='__align' type-id='type-id-20' visibility='default' filepath='/usr/include/bits/pthreadtypes.h' line='103' column='1'/>
       </data-member>
     </union-decl>
     <qualified-type-def type-id='type-id-1084' const='yes' id='type-id-1272'/>
@@ -20135,7 +20098,7 @@
       <function-decl name='operator!=&lt;__mbstate_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/postypes.h' line='223' column='1' visibility='default' binding='global' size-in-bits='64'>
         <parameter type-id='type-id-1316'/>
         <parameter type-id='type-id-1316'/>
-        <return type-id='type-id-42'/>
+        <return type-id='type-id-40'/>
       </function-decl>
       <function-decl name='__check_facet&lt;std::codecvt&lt;wchar_t, char, __mbstate_t&gt; &gt;' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/basic_ios.h' line='48' column='1' visibility='default' binding='global' size-in-bits='64'>
         <parameter type-id='type-id-1317'/>
@@ -20153,7 +20116,7 @@
           <function-decl name='basic_fstream' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/fstream' line='788' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1296' is-artificial='yes'/>
             <parameter type-id='type-id-6' is-artificial='yes'/>
-            <parameter type-id='type-id-37' is-artificial='yes'/>
+            <parameter type-id='type-id-35' is-artificial='yes'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
@@ -20161,7 +20124,7 @@
           <function-decl name='basic_fstream' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/fstream' line='801' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1296' is-artificial='yes'/>
             <parameter type-id='type-id-6' is-artificial='yes'/>
-            <parameter type-id='type-id-37' is-artificial='yes'/>
+            <parameter type-id='type-id-35' is-artificial='yes'/>
             <parameter type-id='type-id-4'/>
             <parameter type-id='type-id-875'/>
             <return type-id='type-id-5'/>
@@ -20171,7 +20134,7 @@
           <function-decl name='basic_fstream' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/fstream' line='816' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1296' is-artificial='yes'/>
             <parameter type-id='type-id-6' is-artificial='yes'/>
-            <parameter type-id='type-id-37' is-artificial='yes'/>
+            <parameter type-id='type-id-35' is-artificial='yes'/>
             <parameter type-id='type-id-323'/>
             <parameter type-id='type-id-875'/>
             <return type-id='type-id-5'/>
@@ -20186,13 +20149,13 @@
         <member-function access='private'>
           <function-decl name='is_open' mangled-name='_ZNSt13basic_fstreamIcSt11char_traitsIcEE7is_openEv' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/fstream' line='850' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt13basic_fstreamIcSt11char_traitsIcEE7is_openEv@@GLIBCXX_3.4'>
             <parameter type-id='type-id-1296' is-artificial='yes'/>
-            <return type-id='type-id-42'/>
+            <return type-id='type-id-40'/>
           </function-decl>
         </member-function>
         <member-function access='private' const='yes'>
           <function-decl name='is_open' mangled-name='_ZNKSt13basic_fstreamIcSt11char_traitsIcEE7is_openEv' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/fstream' line='856' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1280' is-artificial='yes'/>
-            <return type-id='type-id-42'/>
+            <return type-id='type-id-40'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
@@ -20221,7 +20184,7 @@
           <function-decl name='basic_fstream' mangled-name='_ZNSt13basic_fstreamIcSt11char_traitsIcEEC2Ev' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/fstream' line='788' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt13basic_fstreamIcSt11char_traitsIcEEC2Ev@@GLIBCXX_3.4'>
             <parameter type-id='type-id-1296' is-artificial='yes'/>
             <parameter type-id='type-id-6' is-artificial='yes'/>
-            <parameter type-id='type-id-37' is-artificial='yes'/>
+            <parameter type-id='type-id-35' is-artificial='yes'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
@@ -20229,7 +20192,7 @@
           <function-decl name='basic_fstream' mangled-name='_ZNSt13basic_fstreamIcSt11char_traitsIcEEC1Ev' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/fstream' line='788' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt13basic_fstreamIcSt11char_traitsIcEEC1Ev@@GLIBCXX_3.4'>
             <parameter type-id='type-id-1296' is-artificial='yes'/>
             <parameter type-id='type-id-6' is-artificial='yes'/>
-            <parameter type-id='type-id-37' is-artificial='yes'/>
+            <parameter type-id='type-id-35' is-artificial='yes'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
@@ -20237,7 +20200,7 @@
           <function-decl name='basic_fstream' mangled-name='_ZNSt13basic_fstreamIcSt11char_traitsIcEEC2EPKcSt13_Ios_Openmode' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/fstream' line='801' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt13basic_fstreamIcSt11char_traitsIcEEC2EPKcSt13_Ios_Openmode@@GLIBCXX_3.4'>
             <parameter type-id='type-id-1296' is-artificial='yes'/>
             <parameter type-id='type-id-6' is-artificial='yes'/>
-            <parameter type-id='type-id-37' is-artificial='yes'/>
+            <parameter type-id='type-id-35' is-artificial='yes'/>
             <parameter type-id='type-id-4'/>
             <parameter type-id='type-id-875'/>
             <return type-id='type-id-5'/>
@@ -20247,7 +20210,7 @@
           <function-decl name='basic_fstream' mangled-name='_ZNSt13basic_fstreamIcSt11char_traitsIcEEC1EPKcSt13_Ios_Openmode' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/fstream' line='801' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt13basic_fstreamIcSt11char_traitsIcEEC1EPKcSt13_Ios_Openmode@@GLIBCXX_3.4'>
             <parameter type-id='type-id-1296' is-artificial='yes'/>
             <parameter type-id='type-id-6' is-artificial='yes'/>
-            <parameter type-id='type-id-37' is-artificial='yes'/>
+            <parameter type-id='type-id-35' is-artificial='yes'/>
             <parameter type-id='type-id-4'/>
             <parameter type-id='type-id-875'/>
             <return type-id='type-id-5'/>
@@ -20257,7 +20220,7 @@
           <function-decl name='basic_fstream' mangled-name='_ZNSt13basic_fstreamIcSt11char_traitsIcEEC2ERKSsSt13_Ios_Openmode' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/fstream' line='816' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt13basic_fstreamIcSt11char_traitsIcEEC2ERKSsSt13_Ios_Openmode@@GLIBCXX_3.4.13'>
             <parameter type-id='type-id-1296' is-artificial='yes'/>
             <parameter type-id='type-id-6' is-artificial='yes'/>
-            <parameter type-id='type-id-37' is-artificial='yes'/>
+            <parameter type-id='type-id-35' is-artificial='yes'/>
             <parameter type-id='type-id-323'/>
             <parameter type-id='type-id-875'/>
             <return type-id='type-id-5'/>
@@ -20267,7 +20230,7 @@
           <function-decl name='basic_fstream' mangled-name='_ZNSt13basic_fstreamIcSt11char_traitsIcEEC1ERKSsSt13_Ios_Openmode' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/fstream' line='816' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt13basic_fstreamIcSt11char_traitsIcEEC1ERKSsSt13_Ios_Openmode@@GLIBCXX_3.4.13'>
             <parameter type-id='type-id-1296' is-artificial='yes'/>
             <parameter type-id='type-id-6' is-artificial='yes'/>
-            <parameter type-id='type-id-37' is-artificial='yes'/>
+            <parameter type-id='type-id-35' is-artificial='yes'/>
             <parameter type-id='type-id-323'/>
             <parameter type-id='type-id-875'/>
             <return type-id='type-id-5'/>
@@ -20277,7 +20240,7 @@
           <function-decl name='~basic_fstream' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/fstream' line='831' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1296' is-artificial='yes'/>
             <parameter type-id='type-id-6' is-artificial='yes'/>
-            <parameter type-id='type-id-37' is-artificial='yes'/>
+            <parameter type-id='type-id-35' is-artificial='yes'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
@@ -20285,7 +20248,7 @@
           <function-decl name='~basic_fstream' mangled-name='_ZNSt13basic_fstreamIcSt11char_traitsIcEED0Ev' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/fstream' line='831' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt13basic_fstreamIcSt11char_traitsIcEED0Ev@@GLIBCXX_3.4'>
             <parameter type-id='type-id-1296' is-artificial='yes'/>
             <parameter type-id='type-id-6' is-artificial='yes'/>
-            <parameter type-id='type-id-37' is-artificial='yes'/>
+            <parameter type-id='type-id-35' is-artificial='yes'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
@@ -20293,7 +20256,7 @@
           <function-decl name='~basic_fstream' mangled-name='_ZNSt13basic_fstreamIcSt11char_traitsIcEED1Ev' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/fstream' line='831' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt13basic_fstreamIcSt11char_traitsIcEED1Ev@@GLIBCXX_3.4'>
             <parameter type-id='type-id-1296' is-artificial='yes'/>
             <parameter type-id='type-id-6' is-artificial='yes'/>
-            <parameter type-id='type-id-37' is-artificial='yes'/>
+            <parameter type-id='type-id-35' is-artificial='yes'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
@@ -20301,7 +20264,7 @@
           <function-decl name='~basic_fstream' mangled-name='_ZNSt13basic_fstreamIcSt11char_traitsIcEED2Ev' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/fstream' line='831' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt13basic_fstreamIcSt11char_traitsIcEED2Ev@@GLIBCXX_3.4'>
             <parameter type-id='type-id-1296' is-artificial='yes'/>
             <parameter type-id='type-id-6' is-artificial='yes'/>
-            <parameter type-id='type-id-37' is-artificial='yes'/>
+            <parameter type-id='type-id-35' is-artificial='yes'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
@@ -20318,7 +20281,7 @@
           <function-decl name='basic_ofstream' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/fstream' line='614' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1308' is-artificial='yes'/>
             <parameter type-id='type-id-6' is-artificial='yes'/>
-            <parameter type-id='type-id-37' is-artificial='yes'/>
+            <parameter type-id='type-id-35' is-artificial='yes'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
@@ -20326,7 +20289,7 @@
           <function-decl name='basic_ofstream' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/fstream' line='629' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1308' is-artificial='yes'/>
             <parameter type-id='type-id-6' is-artificial='yes'/>
-            <parameter type-id='type-id-37' is-artificial='yes'/>
+            <parameter type-id='type-id-35' is-artificial='yes'/>
             <parameter type-id='type-id-4'/>
             <parameter type-id='type-id-875'/>
             <return type-id='type-id-5'/>
@@ -20336,7 +20299,7 @@
           <function-decl name='basic_ofstream' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/fstream' line='647' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1308' is-artificial='yes'/>
             <parameter type-id='type-id-6' is-artificial='yes'/>
-            <parameter type-id='type-id-37' is-artificial='yes'/>
+            <parameter type-id='type-id-35' is-artificial='yes'/>
             <parameter type-id='type-id-323'/>
             <parameter type-id='type-id-875'/>
             <return type-id='type-id-5'/>
@@ -20351,13 +20314,13 @@
         <member-function access='private'>
           <function-decl name='is_open' mangled-name='_ZNSt14basic_ofstreamIcSt11char_traitsIcEE7is_openEv' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/fstream' line='681' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt14basic_ofstreamIcSt11char_traitsIcEE7is_openEv@@GLIBCXX_3.4'>
             <parameter type-id='type-id-1308' is-artificial='yes'/>
-            <return type-id='type-id-42'/>
+            <return type-id='type-id-40'/>
           </function-decl>
         </member-function>
         <member-function access='private' const='yes'>
           <function-decl name='is_open' mangled-name='_ZNKSt14basic_ofstreamIcSt11char_traitsIcEE7is_openEv' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/fstream' line='687' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1292' is-artificial='yes'/>
-            <return type-id='type-id-42'/>
+            <return type-id='type-id-40'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
@@ -20386,7 +20349,7 @@
           <function-decl name='basic_ofstream' mangled-name='_ZNSt14basic_ofstreamIcSt11char_traitsIcEEC2Ev' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/fstream' line='614' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt14basic_ofstreamIcSt11char_traitsIcEEC2Ev@@GLIBCXX_3.4'>
             <parameter type-id='type-id-1308' is-artificial='yes'/>
             <parameter type-id='type-id-6' is-artificial='yes'/>
-            <parameter type-id='type-id-37' is-artificial='yes'/>
+            <parameter type-id='type-id-35' is-artificial='yes'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
@@ -20394,7 +20357,7 @@
           <function-decl name='basic_ofstream' mangled-name='_ZNSt14basic_ofstreamIcSt11char_traitsIcEEC1Ev' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/fstream' line='614' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt14basic_ofstreamIcSt11char_traitsIcEEC1Ev@@GLIBCXX_3.4'>
             <parameter type-id='type-id-1308' is-artificial='yes'/>
             <parameter type-id='type-id-6' is-artificial='yes'/>
-            <parameter type-id='type-id-37' is-artificial='yes'/>
+            <parameter type-id='type-id-35' is-artificial='yes'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
@@ -20402,7 +20365,7 @@
           <function-decl name='basic_ofstream' mangled-name='_ZNSt14basic_ofstreamIcSt11char_traitsIcEEC2EPKcSt13_Ios_Openmode' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/fstream' line='629' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt14basic_ofstreamIcSt11char_traitsIcEEC2EPKcSt13_Ios_Openmode@@GLIBCXX_3.4'>
             <parameter type-id='type-id-1308' is-artificial='yes'/>
             <parameter type-id='type-id-6' is-artificial='yes'/>
-            <parameter type-id='type-id-37' is-artificial='yes'/>
+            <parameter type-id='type-id-35' is-artificial='yes'/>
             <parameter type-id='type-id-4'/>
             <parameter type-id='type-id-875'/>
             <return type-id='type-id-5'/>
@@ -20412,7 +20375,7 @@
           <function-decl name='basic_ofstream' mangled-name='_ZNSt14basic_ofstreamIcSt11char_traitsIcEEC1EPKcSt13_Ios_Openmode' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/fstream' line='629' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt14basic_ofstreamIcSt11char_traitsIcEEC1EPKcSt13_Ios_Openmode@@GLIBCXX_3.4'>
             <parameter type-id='type-id-1308' is-artificial='yes'/>
             <parameter type-id='type-id-6' is-artificial='yes'/>
-            <parameter type-id='type-id-37' is-artificial='yes'/>
+            <parameter type-id='type-id-35' is-artificial='yes'/>
             <parameter type-id='type-id-4'/>
             <parameter type-id='type-id-875'/>
             <return type-id='type-id-5'/>
@@ -20422,7 +20385,7 @@
           <function-decl name='basic_ofstream' mangled-name='_ZNSt14basic_ofstreamIcSt11char_traitsIcEEC2ERKSsSt13_Ios_Openmode' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/fstream' line='647' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt14basic_ofstreamIcSt11char_traitsIcEEC2ERKSsSt13_Ios_Openmode@@GLIBCXX_3.4.13'>
             <parameter type-id='type-id-1308' is-artificial='yes'/>
             <parameter type-id='type-id-6' is-artificial='yes'/>
-            <parameter type-id='type-id-37' is-artificial='yes'/>
+            <parameter type-id='type-id-35' is-artificial='yes'/>
             <parameter type-id='type-id-323'/>
             <parameter type-id='type-id-875'/>
             <return type-id='type-id-5'/>
@@ -20432,7 +20395,7 @@
           <function-decl name='basic_ofstream' mangled-name='_ZNSt14basic_ofstreamIcSt11char_traitsIcEEC1ERKSsSt13_Ios_Openmode' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/fstream' line='647' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt14basic_ofstreamIcSt11char_traitsIcEEC1ERKSsSt13_Ios_Openmode@@GLIBCXX_3.4.13'>
             <parameter type-id='type-id-1308' is-artificial='yes'/>
             <parameter type-id='type-id-6' is-artificial='yes'/>
-            <parameter type-id='type-id-37' is-artificial='yes'/>
+            <parameter type-id='type-id-35' is-artificial='yes'/>
             <parameter type-id='type-id-323'/>
             <parameter type-id='type-id-875'/>
             <return type-id='type-id-5'/>
@@ -20442,7 +20405,7 @@
           <function-decl name='~basic_ofstream' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/fstream' line='662' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1308' is-artificial='yes'/>
             <parameter type-id='type-id-6' is-artificial='yes'/>
-            <parameter type-id='type-id-37' is-artificial='yes'/>
+            <parameter type-id='type-id-35' is-artificial='yes'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
@@ -20450,7 +20413,7 @@
           <function-decl name='~basic_ofstream' mangled-name='_ZNSt14basic_ofstreamIcSt11char_traitsIcEED0Ev' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/fstream' line='662' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt14basic_ofstreamIcSt11char_traitsIcEED0Ev@@GLIBCXX_3.4'>
             <parameter type-id='type-id-1308' is-artificial='yes'/>
             <parameter type-id='type-id-6' is-artificial='yes'/>
-            <parameter type-id='type-id-37' is-artificial='yes'/>
+            <parameter type-id='type-id-35' is-artificial='yes'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
@@ -20458,7 +20421,7 @@
           <function-decl name='~basic_ofstream' mangled-name='_ZNSt14basic_ofstreamIcSt11char_traitsIcEED1Ev' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/fstream' line='662' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt14basic_ofstreamIcSt11char_traitsIcEED1Ev@@GLIBCXX_3.4'>
             <parameter type-id='type-id-1308' is-artificial='yes'/>
             <parameter type-id='type-id-6' is-artificial='yes'/>
-            <parameter type-id='type-id-37' is-artificial='yes'/>
+            <parameter type-id='type-id-35' is-artificial='yes'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
@@ -20466,7 +20429,7 @@
           <function-decl name='~basic_ofstream' mangled-name='_ZNSt14basic_ofstreamIcSt11char_traitsIcEED2Ev' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/fstream' line='662' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt14basic_ofstreamIcSt11char_traitsIcEED2Ev@@GLIBCXX_3.4'>
             <parameter type-id='type-id-1308' is-artificial='yes'/>
             <parameter type-id='type-id-6' is-artificial='yes'/>
-            <parameter type-id='type-id-37' is-artificial='yes'/>
+            <parameter type-id='type-id-35' is-artificial='yes'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
@@ -20483,7 +20446,7 @@
           <function-decl name='basic_ifstream' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/fstream' line='446' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1302' is-artificial='yes'/>
             <parameter type-id='type-id-6' is-artificial='yes'/>
-            <parameter type-id='type-id-37' is-artificial='yes'/>
+            <parameter type-id='type-id-35' is-artificial='yes'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
@@ -20491,7 +20454,7 @@
           <function-decl name='basic_ifstream' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/fstream' line='460' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1302' is-artificial='yes'/>
             <parameter type-id='type-id-6' is-artificial='yes'/>
-            <parameter type-id='type-id-37' is-artificial='yes'/>
+            <parameter type-id='type-id-35' is-artificial='yes'/>
             <parameter type-id='type-id-4'/>
             <parameter type-id='type-id-875'/>
             <return type-id='type-id-5'/>
@@ -20501,7 +20464,7 @@
           <function-decl name='basic_ifstream' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/fstream' line='476' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1302' is-artificial='yes'/>
             <parameter type-id='type-id-6' is-artificial='yes'/>
-            <parameter type-id='type-id-37' is-artificial='yes'/>
+            <parameter type-id='type-id-35' is-artificial='yes'/>
             <parameter type-id='type-id-323'/>
             <parameter type-id='type-id-875'/>
             <return type-id='type-id-5'/>
@@ -20516,13 +20479,13 @@
         <member-function access='private'>
           <function-decl name='is_open' mangled-name='_ZNSt14basic_ifstreamIcSt11char_traitsIcEE7is_openEv' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/fstream' line='510' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt14basic_ifstreamIcSt11char_traitsIcEE7is_openEv@@GLIBCXX_3.4'>
             <parameter type-id='type-id-1302' is-artificial='yes'/>
-            <return type-id='type-id-42'/>
+            <return type-id='type-id-40'/>
           </function-decl>
         </member-function>
         <member-function access='private' const='yes'>
           <function-decl name='is_open' mangled-name='_ZNKSt14basic_ifstreamIcSt11char_traitsIcEE7is_openEv' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/fstream' line='516' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1286' is-artificial='yes'/>
-            <return type-id='type-id-42'/>
+            <return type-id='type-id-40'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
@@ -20551,7 +20514,7 @@
           <function-decl name='basic_ifstream' mangled-name='_ZNSt14basic_ifstreamIcSt11char_traitsIcEEC2Ev' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/fstream' line='446' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt14basic_ifstreamIcSt11char_traitsIcEEC2Ev@@GLIBCXX_3.4'>
             <parameter type-id='type-id-1302' is-artificial='yes'/>
             <parameter type-id='type-id-6' is-artificial='yes'/>
-            <parameter type-id='type-id-37' is-artificial='yes'/>
+            <parameter type-id='type-id-35' is-artificial='yes'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
@@ -20559,7 +20522,7 @@
           <function-decl name='basic_ifstream' mangled-name='_ZNSt14basic_ifstreamIcSt11char_traitsIcEEC1Ev' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/fstream' line='446' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt14basic_ifstreamIcSt11char_traitsIcEEC1Ev@@GLIBCXX_3.4'>
             <parameter type-id='type-id-1302' is-artificial='yes'/>
             <parameter type-id='type-id-6' is-artificial='yes'/>
-            <parameter type-id='type-id-37' is-artificial='yes'/>
+            <parameter type-id='type-id-35' is-artificial='yes'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
@@ -20567,7 +20530,7 @@
           <function-decl name='basic_ifstream' mangled-name='_ZNSt14basic_ifstreamIcSt11char_traitsIcEEC2EPKcSt13_Ios_Openmode' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/fstream' line='460' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt14basic_ifstreamIcSt11char_traitsIcEEC2EPKcSt13_Ios_Openmode@@GLIBCXX_3.4'>
             <parameter type-id='type-id-1302' is-artificial='yes'/>
             <parameter type-id='type-id-6' is-artificial='yes'/>
-            <parameter type-id='type-id-37' is-artificial='yes'/>
+            <parameter type-id='type-id-35' is-artificial='yes'/>
             <parameter type-id='type-id-4'/>
             <parameter type-id='type-id-875'/>
             <return type-id='type-id-5'/>
@@ -20577,7 +20540,7 @@
           <function-decl name='basic_ifstream' mangled-name='_ZNSt14basic_ifstreamIcSt11char_traitsIcEEC1EPKcSt13_Ios_Openmode' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/fstream' line='460' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt14basic_ifstreamIcSt11char_traitsIcEEC1EPKcSt13_Ios_Openmode@@GLIBCXX_3.4'>
             <parameter type-id='type-id-1302' is-artificial='yes'/>
             <parameter type-id='type-id-6' is-artificial='yes'/>
-            <parameter type-id='type-id-37' is-artificial='yes'/>
+            <parameter type-id='type-id-35' is-artificial='yes'/>
             <parameter type-id='type-id-4'/>
             <parameter type-id='type-id-875'/>
             <return type-id='type-id-5'/>
@@ -20587,7 +20550,7 @@
           <function-decl name='basic_ifstream' mangled-name='_ZNSt14basic_ifstreamIcSt11char_traitsIcEEC2ERKSsSt13_Ios_Openmode' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/fstream' line='476' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt14basic_ifstreamIcSt11char_traitsIcEEC2ERKSsSt13_Ios_Openmode@@GLIBCXX_3.4.13'>
             <parameter type-id='type-id-1302' is-artificial='yes'/>
             <parameter type-id='type-id-6' is-artificial='yes'/>
-            <parameter type-id='type-id-37' is-artificial='yes'/>
+            <parameter type-id='type-id-35' is-artificial='yes'/>
             <parameter type-id='type-id-323'/>
             <parameter type-id='type-id-875'/>
             <return type-id='type-id-5'/>
@@ -20597,7 +20560,7 @@
           <function-decl name='basic_ifstream' mangled-name='_ZNSt14basic_ifstreamIcSt11char_traitsIcEEC1ERKSsSt13_Ios_Openmode' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/fstream' line='476' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt14basic_ifstreamIcSt11char_traitsIcEEC1ERKSsSt13_Ios_Openmode@@GLIBCXX_3.4.13'>
             <parameter type-id='type-id-1302' is-artificial='yes'/>
             <parameter type-id='type-id-6' is-artificial='yes'/>
-            <parameter type-id='type-id-37' is-artificial='yes'/>
+            <parameter type-id='type-id-35' is-artificial='yes'/>
             <parameter type-id='type-id-323'/>
             <parameter type-id='type-id-875'/>
             <return type-id='type-id-5'/>
@@ -20607,7 +20570,7 @@
           <function-decl name='~basic_ifstream' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/fstream' line='491' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1302' is-artificial='yes'/>
             <parameter type-id='type-id-6' is-artificial='yes'/>
-            <parameter type-id='type-id-37' is-artificial='yes'/>
+            <parameter type-id='type-id-35' is-artificial='yes'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
@@ -20615,7 +20578,7 @@
           <function-decl name='~basic_ifstream' mangled-name='_ZNSt14basic_ifstreamIcSt11char_traitsIcEED0Ev' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/fstream' line='491' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt14basic_ifstreamIcSt11char_traitsIcEED0Ev@@GLIBCXX_3.4'>
             <parameter type-id='type-id-1302' is-artificial='yes'/>
             <parameter type-id='type-id-6' is-artificial='yes'/>
-            <parameter type-id='type-id-37' is-artificial='yes'/>
+            <parameter type-id='type-id-35' is-artificial='yes'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
@@ -20623,7 +20586,7 @@
           <function-decl name='~basic_ifstream' mangled-name='_ZNSt14basic_ifstreamIcSt11char_traitsIcEED1Ev' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/fstream' line='491' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt14basic_ifstreamIcSt11char_traitsIcEED1Ev@@GLIBCXX_3.4'>
             <parameter type-id='type-id-1302' is-artificial='yes'/>
             <parameter type-id='type-id-6' is-artificial='yes'/>
-            <parameter type-id='type-id-37' is-artificial='yes'/>
+            <parameter type-id='type-id-35' is-artificial='yes'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
@@ -20631,7 +20594,7 @@
           <function-decl name='~basic_ifstream' mangled-name='_ZNSt14basic_ifstreamIcSt11char_traitsIcEED2Ev' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/fstream' line='491' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt14basic_ifstreamIcSt11char_traitsIcEED2Ev@@GLIBCXX_3.4'>
             <parameter type-id='type-id-1302' is-artificial='yes'/>
             <parameter type-id='type-id-6' is-artificial='yes'/>
-            <parameter type-id='type-id-37' is-artificial='yes'/>
+            <parameter type-id='type-id-35' is-artificial='yes'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
@@ -20648,7 +20611,7 @@
           <function-decl name='basic_fstream' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/fstream' line='788' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1299' is-artificial='yes'/>
             <parameter type-id='type-id-6' is-artificial='yes'/>
-            <parameter type-id='type-id-37' is-artificial='yes'/>
+            <parameter type-id='type-id-35' is-artificial='yes'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
@@ -20656,7 +20619,7 @@
           <function-decl name='basic_fstream' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/fstream' line='801' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1299' is-artificial='yes'/>
             <parameter type-id='type-id-6' is-artificial='yes'/>
-            <parameter type-id='type-id-37' is-artificial='yes'/>
+            <parameter type-id='type-id-35' is-artificial='yes'/>
             <parameter type-id='type-id-4'/>
             <parameter type-id='type-id-875'/>
             <return type-id='type-id-5'/>
@@ -20666,7 +20629,7 @@
           <function-decl name='basic_fstream' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/fstream' line='816' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1299' is-artificial='yes'/>
             <parameter type-id='type-id-6' is-artificial='yes'/>
-            <parameter type-id='type-id-37' is-artificial='yes'/>
+            <parameter type-id='type-id-35' is-artificial='yes'/>
             <parameter type-id='type-id-323'/>
             <parameter type-id='type-id-875'/>
             <return type-id='type-id-5'/>
@@ -20681,13 +20644,13 @@
         <member-function access='private'>
           <function-decl name='is_open' mangled-name='_ZNSt13basic_fstreamIwSt11char_traitsIwEE7is_openEv' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/fstream' line='850' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt13basic_fstreamIwSt11char_traitsIwEE7is_openEv@@GLIBCXX_3.4'>
             <parameter type-id='type-id-1299' is-artificial='yes'/>
-            <return type-id='type-id-42'/>
+            <return type-id='type-id-40'/>
           </function-decl>
         </member-function>
         <member-function access='private' const='yes'>
           <function-decl name='is_open' mangled-name='_ZNKSt13basic_fstreamIwSt11char_traitsIwEE7is_openEv' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/fstream' line='856' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1283' is-artificial='yes'/>
-            <return type-id='type-id-42'/>
+            <return type-id='type-id-40'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
@@ -20716,7 +20679,7 @@
           <function-decl name='basic_fstream' mangled-name='_ZNSt13basic_fstreamIwSt11char_traitsIwEEC2Ev' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/fstream' line='788' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt13basic_fstreamIwSt11char_traitsIwEEC2Ev@@GLIBCXX_3.4'>
             <parameter type-id='type-id-1299' is-artificial='yes'/>
             <parameter type-id='type-id-6' is-artificial='yes'/>
-            <parameter type-id='type-id-37' is-artificial='yes'/>
+            <parameter type-id='type-id-35' is-artificial='yes'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
@@ -20724,7 +20687,7 @@
           <function-decl name='basic_fstream' mangled-name='_ZNSt13basic_fstreamIwSt11char_traitsIwEEC1Ev' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/fstream' line='788' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt13basic_fstreamIwSt11char_traitsIwEEC1Ev@@GLIBCXX_3.4'>
             <parameter type-id='type-id-1299' is-artificial='yes'/>
             <parameter type-id='type-id-6' is-artificial='yes'/>
-            <parameter type-id='type-id-37' is-artificial='yes'/>
+            <parameter type-id='type-id-35' is-artificial='yes'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
@@ -20732,7 +20695,7 @@
           <function-decl name='basic_fstream' mangled-name='_ZNSt13basic_fstreamIwSt11char_traitsIwEEC2EPKcSt13_Ios_Openmode' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/fstream' line='801' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt13basic_fstreamIwSt11char_traitsIwEEC2EPKcSt13_Ios_Openmode@@GLIBCXX_3.4'>
             <parameter type-id='type-id-1299' is-artificial='yes'/>
             <parameter type-id='type-id-6' is-artificial='yes'/>
-            <parameter type-id='type-id-37' is-artificial='yes'/>
+            <parameter type-id='type-id-35' is-artificial='yes'/>
             <parameter type-id='type-id-4'/>
             <parameter type-id='type-id-875'/>
             <return type-id='type-id-5'/>
@@ -20742,7 +20705,7 @@
           <function-decl name='basic_fstream' mangled-name='_ZNSt13basic_fstreamIwSt11char_traitsIwEEC1EPKcSt13_Ios_Openmode' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/fstream' line='801' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt13basic_fstreamIwSt11char_traitsIwEEC1EPKcSt13_Ios_Openmode@@GLIBCXX_3.4'>
             <parameter type-id='type-id-1299' is-artificial='yes'/>
             <parameter type-id='type-id-6' is-artificial='yes'/>
-            <parameter type-id='type-id-37' is-artificial='yes'/>
+            <parameter type-id='type-id-35' is-artificial='yes'/>
             <parameter type-id='type-id-4'/>
             <parameter type-id='type-id-875'/>
             <return type-id='type-id-5'/>
@@ -20752,7 +20715,7 @@
           <function-decl name='basic_fstream' mangled-name='_ZNSt13basic_fstreamIwSt11char_traitsIwEEC2ERKSsSt13_Ios_Openmode' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/fstream' line='816' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt13basic_fstreamIwSt11char_traitsIwEEC2ERKSsSt13_Ios_Openmode@@GLIBCXX_3.4.13'>
             <parameter type-id='type-id-1299' is-artificial='yes'/>
             <parameter type-id='type-id-6' is-artificial='yes'/>
-            <parameter type-id='type-id-37' is-artificial='yes'/>
+            <parameter type-id='type-id-35' is-artificial='yes'/>
             <parameter type-id='type-id-323'/>
             <parameter type-id='type-id-875'/>
             <return type-id='type-id-5'/>
@@ -20762,7 +20725,7 @@
           <function-decl name='basic_fstream' mangled-name='_ZNSt13basic_fstreamIwSt11char_traitsIwEEC1ERKSsSt13_Ios_Openmode' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/fstream' line='816' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt13basic_fstreamIwSt11char_traitsIwEEC1ERKSsSt13_Ios_Openmode@@GLIBCXX_3.4.13'>
             <parameter type-id='type-id-1299' is-artificial='yes'/>
             <parameter type-id='type-id-6' is-artificial='yes'/>
-            <parameter type-id='type-id-37' is-artificial='yes'/>
+            <parameter type-id='type-id-35' is-artificial='yes'/>
             <parameter type-id='type-id-323'/>
             <parameter type-id='type-id-875'/>
             <return type-id='type-id-5'/>
@@ -20772,7 +20735,7 @@
           <function-decl name='~basic_fstream' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/fstream' line='831' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1299' is-artificial='yes'/>
             <parameter type-id='type-id-6' is-artificial='yes'/>
-            <parameter type-id='type-id-37' is-artificial='yes'/>
+            <parameter type-id='type-id-35' is-artificial='yes'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
@@ -20780,7 +20743,7 @@
           <function-decl name='~basic_fstream' mangled-name='_ZNSt13basic_fstreamIwSt11char_traitsIwEED0Ev' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/fstream' line='831' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt13basic_fstreamIwSt11char_traitsIwEED0Ev@@GLIBCXX_3.4'>
             <parameter type-id='type-id-1299' is-artificial='yes'/>
             <parameter type-id='type-id-6' is-artificial='yes'/>
-            <parameter type-id='type-id-37' is-artificial='yes'/>
+            <parameter type-id='type-id-35' is-artificial='yes'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
@@ -20788,7 +20751,7 @@
           <function-decl name='~basic_fstream' mangled-name='_ZNSt13basic_fstreamIwSt11char_traitsIwEED1Ev' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/fstream' line='831' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt13basic_fstreamIwSt11char_traitsIwEED1Ev@@GLIBCXX_3.4'>
             <parameter type-id='type-id-1299' is-artificial='yes'/>
             <parameter type-id='type-id-6' is-artificial='yes'/>
-            <parameter type-id='type-id-37' is-artificial='yes'/>
+            <parameter type-id='type-id-35' is-artificial='yes'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
@@ -20796,7 +20759,7 @@
           <function-decl name='~basic_fstream' mangled-name='_ZNSt13basic_fstreamIwSt11char_traitsIwEED2Ev' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/fstream' line='831' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt13basic_fstreamIwSt11char_traitsIwEED2Ev@@GLIBCXX_3.4'>
             <parameter type-id='type-id-1299' is-artificial='yes'/>
             <parameter type-id='type-id-6' is-artificial='yes'/>
-            <parameter type-id='type-id-37' is-artificial='yes'/>
+            <parameter type-id='type-id-35' is-artificial='yes'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
@@ -20813,7 +20776,7 @@
           <function-decl name='basic_ofstream' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/fstream' line='614' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1311' is-artificial='yes'/>
             <parameter type-id='type-id-6' is-artificial='yes'/>
-            <parameter type-id='type-id-37' is-artificial='yes'/>
+            <parameter type-id='type-id-35' is-artificial='yes'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
@@ -20821,7 +20784,7 @@
           <function-decl name='basic_ofstream' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/fstream' line='629' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1311' is-artificial='yes'/>
             <parameter type-id='type-id-6' is-artificial='yes'/>
-            <parameter type-id='type-id-37' is-artificial='yes'/>
+            <parameter type-id='type-id-35' is-artificial='yes'/>
             <parameter type-id='type-id-4'/>
             <parameter type-id='type-id-875'/>
             <return type-id='type-id-5'/>
@@ -20831,7 +20794,7 @@
           <function-decl name='basic_ofstream' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/fstream' line='647' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1311' is-artificial='yes'/>
             <parameter type-id='type-id-6' is-artificial='yes'/>
-            <parameter type-id='type-id-37' is-artificial='yes'/>
+            <parameter type-id='type-id-35' is-artificial='yes'/>
             <parameter type-id='type-id-323'/>
             <parameter type-id='type-id-875'/>
             <return type-id='type-id-5'/>
@@ -20846,13 +20809,13 @@
         <member-function access='private'>
           <function-decl name='is_open' mangled-name='_ZNSt14basic_ofstreamIwSt11char_traitsIwEE7is_openEv' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/fstream' line='681' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt14basic_ofstreamIwSt11char_traitsIwEE7is_openEv@@GLIBCXX_3.4'>
             <parameter type-id='type-id-1311' is-artificial='yes'/>
-            <return type-id='type-id-42'/>
+            <return type-id='type-id-40'/>
           </function-decl>
         </member-function>
         <member-function access='private' const='yes'>
           <function-decl name='is_open' mangled-name='_ZNKSt14basic_ofstreamIwSt11char_traitsIwEE7is_openEv' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/fstream' line='687' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1295' is-artificial='yes'/>
-            <return type-id='type-id-42'/>
+            <return type-id='type-id-40'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
@@ -20881,7 +20844,7 @@
           <function-decl name='basic_ofstream' mangled-name='_ZNSt14basic_ofstreamIwSt11char_traitsIwEEC2Ev' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/fstream' line='614' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt14basic_ofstreamIwSt11char_traitsIwEEC2Ev@@GLIBCXX_3.4'>
             <parameter type-id='type-id-1311' is-artificial='yes'/>
             <parameter type-id='type-id-6' is-artificial='yes'/>
-            <parameter type-id='type-id-37' is-artificial='yes'/>
+            <parameter type-id='type-id-35' is-artificial='yes'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
@@ -20889,7 +20852,7 @@
           <function-decl name='basic_ofstream' mangled-name='_ZNSt14basic_ofstreamIwSt11char_traitsIwEEC1Ev' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/fstream' line='614' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt14basic_ofstreamIwSt11char_traitsIwEEC1Ev@@GLIBCXX_3.4'>
             <parameter type-id='type-id-1311' is-artificial='yes'/>
             <parameter type-id='type-id-6' is-artificial='yes'/>
-            <parameter type-id='type-id-37' is-artificial='yes'/>
+            <parameter type-id='type-id-35' is-artificial='yes'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
@@ -20897,7 +20860,7 @@
           <function-decl name='basic_ofstream' mangled-name='_ZNSt14basic_ofstreamIwSt11char_traitsIwEEC2EPKcSt13_Ios_Openmode' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/fstream' line='629' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt14basic_ofstreamIwSt11char_traitsIwEEC2EPKcSt13_Ios_Openmode@@GLIBCXX_3.4'>
             <parameter type-id='type-id-1311' is-artificial='yes'/>
             <parameter type-id='type-id-6' is-artificial='yes'/>
-            <parameter type-id='type-id-37' is-artificial='yes'/>
+            <parameter type-id='type-id-35' is-artificial='yes'/>
             <parameter type-id='type-id-4'/>
             <parameter type-id='type-id-875'/>
             <return type-id='type-id-5'/>
@@ -20907,7 +20870,7 @@
           <function-decl name='basic_ofstream' mangled-name='_ZNSt14basic_ofstreamIwSt11char_traitsIwEEC1EPKcSt13_Ios_Openmode' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/fstream' line='629' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt14basic_ofstreamIwSt11char_traitsIwEEC1EPKcSt13_Ios_Openmode@@GLIBCXX_3.4'>
             <parameter type-id='type-id-1311' is-artificial='yes'/>
             <parameter type-id='type-id-6' is-artificial='yes'/>
-            <parameter type-id='type-id-37' is-artificial='yes'/>
+            <parameter type-id='type-id-35' is-artificial='yes'/>
             <parameter type-id='type-id-4'/>
             <parameter type-id='type-id-875'/>
             <return type-id='type-id-5'/>
@@ -20917,7 +20880,7 @@
           <function-decl name='basic_ofstream' mangled-name='_ZNSt14basic_ofstreamIwSt11char_traitsIwEEC2ERKSsSt13_Ios_Openmode' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/fstream' line='647' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt14basic_ofstreamIwSt11char_traitsIwEEC2ERKSsSt13_Ios_Openmode@@GLIBCXX_3.4.13'>
             <parameter type-id='type-id-1311' is-artificial='yes'/>
             <parameter type-id='type-id-6' is-artificial='yes'/>
-            <parameter type-id='type-id-37' is-artificial='yes'/>
+            <parameter type-id='type-id-35' is-artificial='yes'/>
             <parameter type-id='type-id-323'/>
             <parameter type-id='type-id-875'/>
             <return type-id='type-id-5'/>
@@ -20927,7 +20890,7 @@
           <function-decl name='basic_ofstream' mangled-name='_ZNSt14basic_ofstreamIwSt11char_traitsIwEEC1ERKSsSt13_Ios_Openmode' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/fstream' line='647' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt14basic_ofstreamIwSt11char_traitsIwEEC1ERKSsSt13_Ios_Openmode@@GLIBCXX_3.4.13'>
             <parameter type-id='type-id-1311' is-artificial='yes'/>
             <parameter type-id='type-id-6' is-artificial='yes'/>
-            <parameter type-id='type-id-37' is-artificial='yes'/>
+            <parameter type-id='type-id-35' is-artificial='yes'/>
             <parameter type-id='type-id-323'/>
             <parameter type-id='type-id-875'/>
             <return type-id='type-id-5'/>
@@ -20937,7 +20900,7 @@
           <function-decl name='~basic_ofstream' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/fstream' line='662' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1311' is-artificial='yes'/>
             <parameter type-id='type-id-6' is-artificial='yes'/>
-            <parameter type-id='type-id-37' is-artificial='yes'/>
+            <parameter type-id='type-id-35' is-artificial='yes'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
@@ -20945,7 +20908,7 @@
           <function-decl name='~basic_ofstream' mangled-name='_ZNSt14basic_ofstreamIwSt11char_traitsIwEED0Ev' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/fstream' line='662' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt14basic_ofstreamIwSt11char_traitsIwEED0Ev@@GLIBCXX_3.4'>
             <parameter type-id='type-id-1311' is-artificial='yes'/>
             <parameter type-id='type-id-6' is-artificial='yes'/>
-            <parameter type-id='type-id-37' is-artificial='yes'/>
+            <parameter type-id='type-id-35' is-artificial='yes'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
@@ -20953,7 +20916,7 @@
           <function-decl name='~basic_ofstream' mangled-name='_ZNSt14basic_ofstreamIwSt11char_traitsIwEED1Ev' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/fstream' line='662' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt14basic_ofstreamIwSt11char_traitsIwEED1Ev@@GLIBCXX_3.4'>
             <parameter type-id='type-id-1311' is-artificial='yes'/>
             <parameter type-id='type-id-6' is-artificial='yes'/>
-            <parameter type-id='type-id-37' is-artificial='yes'/>
+            <parameter type-id='type-id-35' is-artificial='yes'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
@@ -20961,7 +20924,7 @@
           <function-decl name='~basic_ofstream' mangled-name='_ZNSt14basic_ofstreamIwSt11char_traitsIwEED2Ev' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/fstream' line='662' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt14basic_ofstreamIwSt11char_traitsIwEED2Ev@@GLIBCXX_3.4'>
             <parameter type-id='type-id-1311' is-artificial='yes'/>
             <parameter type-id='type-id-6' is-artificial='yes'/>
-            <parameter type-id='type-id-37' is-artificial='yes'/>
+            <parameter type-id='type-id-35' is-artificial='yes'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
@@ -20978,7 +20941,7 @@
           <function-decl name='basic_ifstream' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/fstream' line='446' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1305' is-artificial='yes'/>
             <parameter type-id='type-id-6' is-artificial='yes'/>
-            <parameter type-id='type-id-37' is-artificial='yes'/>
+            <parameter type-id='type-id-35' is-artificial='yes'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
@@ -20986,7 +20949,7 @@
           <function-decl name='basic_ifstream' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/fstream' line='460' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1305' is-artificial='yes'/>
             <parameter type-id='type-id-6' is-artificial='yes'/>
-            <parameter type-id='type-id-37' is-artificial='yes'/>
+            <parameter type-id='type-id-35' is-artificial='yes'/>
             <parameter type-id='type-id-4'/>
             <parameter type-id='type-id-875'/>
             <return type-id='type-id-5'/>
@@ -20996,7 +20959,7 @@
           <function-decl name='basic_ifstream' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/fstream' line='476' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1305' is-artificial='yes'/>
             <parameter type-id='type-id-6' is-artificial='yes'/>
-            <parameter type-id='type-id-37' is-artificial='yes'/>
+            <parameter type-id='type-id-35' is-artificial='yes'/>
             <parameter type-id='type-id-323'/>
             <parameter type-id='type-id-875'/>
             <return type-id='type-id-5'/>
@@ -21011,13 +20974,13 @@
         <member-function access='private'>
           <function-decl name='is_open' mangled-name='_ZNSt14basic_ifstreamIwSt11char_traitsIwEE7is_openEv' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/fstream' line='510' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt14basic_ifstreamIwSt11char_traitsIwEE7is_openEv@@GLIBCXX_3.4'>
             <parameter type-id='type-id-1305' is-artificial='yes'/>
-            <return type-id='type-id-42'/>
+            <return type-id='type-id-40'/>
           </function-decl>
         </member-function>
         <member-function access='private' const='yes'>
           <function-decl name='is_open' mangled-name='_ZNKSt14basic_ifstreamIwSt11char_traitsIwEE7is_openEv' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/fstream' line='516' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1289' is-artificial='yes'/>
-            <return type-id='type-id-42'/>
+            <return type-id='type-id-40'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
@@ -21046,7 +21009,7 @@
           <function-decl name='basic_ifstream' mangled-name='_ZNSt14basic_ifstreamIwSt11char_traitsIwEEC2Ev' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/fstream' line='446' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt14basic_ifstreamIwSt11char_traitsIwEEC2Ev@@GLIBCXX_3.4'>
             <parameter type-id='type-id-1305' is-artificial='yes'/>
             <parameter type-id='type-id-6' is-artificial='yes'/>
-            <parameter type-id='type-id-37' is-artificial='yes'/>
+            <parameter type-id='type-id-35' is-artificial='yes'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
@@ -21054,7 +21017,7 @@
           <function-decl name='basic_ifstream' mangled-name='_ZNSt14basic_ifstreamIwSt11char_traitsIwEEC1Ev' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/fstream' line='446' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt14basic_ifstreamIwSt11char_traitsIwEEC1Ev@@GLIBCXX_3.4'>
             <parameter type-id='type-id-1305' is-artificial='yes'/>
             <parameter type-id='type-id-6' is-artificial='yes'/>
-            <parameter type-id='type-id-37' is-artificial='yes'/>
+            <parameter type-id='type-id-35' is-artificial='yes'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
@@ -21062,7 +21025,7 @@
           <function-decl name='basic_ifstream' mangled-name='_ZNSt14basic_ifstreamIwSt11char_traitsIwEEC2EPKcSt13_Ios_Openmode' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/fstream' line='460' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt14basic_ifstreamIwSt11char_traitsIwEEC2EPKcSt13_Ios_Openmode@@GLIBCXX_3.4'>
             <parameter type-id='type-id-1305' is-artificial='yes'/>
             <parameter type-id='type-id-6' is-artificial='yes'/>
-            <parameter type-id='type-id-37' is-artificial='yes'/>
+            <parameter type-id='type-id-35' is-artificial='yes'/>
             <parameter type-id='type-id-4'/>
             <parameter type-id='type-id-875'/>
             <return type-id='type-id-5'/>
@@ -21072,7 +21035,7 @@
           <function-decl name='basic_ifstream' mangled-name='_ZNSt14basic_ifstreamIwSt11char_traitsIwEEC1EPKcSt13_Ios_Openmode' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/fstream' line='460' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt14basic_ifstreamIwSt11char_traitsIwEEC1EPKcSt13_Ios_Openmode@@GLIBCXX_3.4'>
             <parameter type-id='type-id-1305' is-artificial='yes'/>
             <parameter type-id='type-id-6' is-artificial='yes'/>
-            <parameter type-id='type-id-37' is-artificial='yes'/>
+            <parameter type-id='type-id-35' is-artificial='yes'/>
             <parameter type-id='type-id-4'/>
             <parameter type-id='type-id-875'/>
             <return type-id='type-id-5'/>
@@ -21082,7 +21045,7 @@
           <function-decl name='basic_ifstream' mangled-name='_ZNSt14basic_ifstreamIwSt11char_traitsIwEEC2ERKSsSt13_Ios_Openmode' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/fstream' line='476' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt14basic_ifstreamIwSt11char_traitsIwEEC2ERKSsSt13_Ios_Openmode@@GLIBCXX_3.4.13'>
             <parameter type-id='type-id-1305' is-artificial='yes'/>
             <parameter type-id='type-id-6' is-artificial='yes'/>
-            <parameter type-id='type-id-37' is-artificial='yes'/>
+            <parameter type-id='type-id-35' is-artificial='yes'/>
             <parameter type-id='type-id-323'/>
             <parameter type-id='type-id-875'/>
             <return type-id='type-id-5'/>
@@ -21092,7 +21055,7 @@
           <function-decl name='basic_ifstream' mangled-name='_ZNSt14basic_ifstreamIwSt11char_traitsIwEEC1ERKSsSt13_Ios_Openmode' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/fstream' line='476' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt14basic_ifstreamIwSt11char_traitsIwEEC1ERKSsSt13_Ios_Openmode@@GLIBCXX_3.4.13'>
             <parameter type-id='type-id-1305' is-artificial='yes'/>
             <parameter type-id='type-id-6' is-artificial='yes'/>
-            <parameter type-id='type-id-37' is-artificial='yes'/>
+            <parameter type-id='type-id-35' is-artificial='yes'/>
             <parameter type-id='type-id-323'/>
             <parameter type-id='type-id-875'/>
             <return type-id='type-id-5'/>
@@ -21102,7 +21065,7 @@
           <function-decl name='~basic_ifstream' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/fstream' line='491' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1305' is-artificial='yes'/>
             <parameter type-id='type-id-6' is-artificial='yes'/>
-            <parameter type-id='type-id-37' is-artificial='yes'/>
+            <parameter type-id='type-id-35' is-artificial='yes'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
@@ -21110,7 +21073,7 @@
           <function-decl name='~basic_ifstream' mangled-name='_ZNSt14basic_ifstreamIwSt11char_traitsIwEED0Ev' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/fstream' line='491' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt14basic_ifstreamIwSt11char_traitsIwEED0Ev@@GLIBCXX_3.4'>
             <parameter type-id='type-id-1305' is-artificial='yes'/>
             <parameter type-id='type-id-6' is-artificial='yes'/>
-            <parameter type-id='type-id-37' is-artificial='yes'/>
+            <parameter type-id='type-id-35' is-artificial='yes'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
@@ -21118,7 +21081,7 @@
           <function-decl name='~basic_ifstream' mangled-name='_ZNSt14basic_ifstreamIwSt11char_traitsIwEED1Ev' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/fstream' line='491' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt14basic_ifstreamIwSt11char_traitsIwEED1Ev@@GLIBCXX_3.4'>
             <parameter type-id='type-id-1305' is-artificial='yes'/>
             <parameter type-id='type-id-6' is-artificial='yes'/>
-            <parameter type-id='type-id-37' is-artificial='yes'/>
+            <parameter type-id='type-id-35' is-artificial='yes'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
@@ -21126,7 +21089,7 @@
           <function-decl name='~basic_ifstream' mangled-name='_ZNSt14basic_ifstreamIwSt11char_traitsIwEED2Ev' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/fstream' line='491' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt14basic_ifstreamIwSt11char_traitsIwEED2Ev@@GLIBCXX_3.4'>
             <parameter type-id='type-id-1305' is-artificial='yes'/>
             <parameter type-id='type-id-6' is-artificial='yes'/>
-            <parameter type-id='type-id-37' is-artificial='yes'/>
+            <parameter type-id='type-id-35' is-artificial='yes'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
@@ -21142,7 +21105,7 @@
         <var-decl name='__pfn' type-id='type-id-1326' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/functional' line='1657' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
-        <var-decl name='__delta' type-id='type-id-22' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/functional' line='1657' column='1'/>
+        <var-decl name='__delta' type-id='type-id-20' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/functional' line='1657' column='1'/>
       </data-member>
     </class-decl>
     <pointer-type-def type-id='type-id-1327' size-in-bits='64' id='type-id-1328'/>
@@ -21263,7 +21226,7 @@
     <namespace-decl name='std'>
       <namespace-decl name='regex_constants'>
         <enum-decl name='error_type' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/regex_error.h' line='44' column='1' id='type-id-1484'>
-          <underlying-type type-id='type-id-39'/>
+          <underlying-type type-id='type-id-37'/>
           <enumerator name='_S_error_collate' value='0'/>
           <enumerator name='_S_error_ctype' value='1'/>
           <enumerator name='_S_error_escape' value='2'/>
@@ -21295,7 +21258,7 @@
             <var-decl name='_M_alt' type-id='type-id-1486' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/regex_nfa.h' line='206' column='1'/>
           </data-member>
           <data-member access='public' layout-offset-in-bits='96'>
-            <var-decl name='_M_subexpr' type-id='type-id-41' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/regex_nfa.h' line='207' column='1'/>
+            <var-decl name='_M_subexpr' type-id='type-id-39' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/regex_nfa.h' line='207' column='1'/>
           </data-member>
           <data-member access='public' layout-offset-in-bits='128'>
             <var-decl name='_M_tagger' type-id='type-id-1413' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/regex_nfa.h' line='208' column='1'/>
@@ -21321,7 +21284,7 @@
             <function-decl name='_State' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/regex_nfa.h' line='219' column='1' visibility='default' binding='global' size-in-bits='64'>
               <parameter type-id='type-id-1468' is-artificial='yes'/>
               <parameter type-id='type-id-1485'/>
-              <parameter type-id='type-id-41'/>
+              <parameter type-id='type-id-39'/>
               <parameter type-id='type-id-1415'/>
               <return type-id='type-id-5'/>
             </function-decl>
@@ -21353,7 +21316,7 @@
           <member-function access='public' const='yes' vtable-offset='3'>
             <function-decl name='_M_at_end' mangled-name='_ZNKSt7__regex14_PatternCursor9_M_at_endEv' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/regex_cursor.h' line='42' column='1' visibility='default' binding='global' size-in-bits='64'>
               <parameter type-id='type-id-1406' is-artificial='yes'/>
-              <return type-id='type-id-42'/>
+              <return type-id='type-id-40'/>
             </function-decl>
           </member-function>
         </class-decl>
@@ -21362,7 +21325,7 @@
         <typedef-decl name='_Matcher' type-id='type-id-1425' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/regex_nfa.h' line='112' column='1' id='type-id-1400'/>
         <class-decl name='_Scanner_base' size-in-bits='64' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/regex_compiler.h' line='37' column='1' id='type-id-1465'>
           <member-type access='public'>
-            <typedef-decl name='_StateT' type-id='type-id-41' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/regex_compiler.h' line='39' column='1' id='type-id-1407'/>
+            <typedef-decl name='_StateT' type-id='type-id-39' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/regex_compiler.h' line='39' column='1' id='type-id-1407'/>
           </member-type>
           <data-member access='public' static='yes'>
             <var-decl name='_S_state_at_start' type-id='type-id-1408' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/regex_compiler.h' line='41' column='1'/>
@@ -21383,7 +21346,7 @@
         </class-decl>
         <class-decl name='_Automaton' size-in-bits='64' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/regex_nfa.h' line='38' column='1' id='type-id-1397'>
           <member-type access='private'>
-            <typedef-decl name='_SizeT' type-id='type-id-41' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/regex_nfa.h' line='41' column='1' id='type-id-1487'/>
+            <typedef-decl name='_SizeT' type-id='type-id-39' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/regex_nfa.h' line='41' column='1' id='type-id-1487'/>
           </member-type>
           <member-function access='private' destructor='yes' vtable-offset='-1'>
             <function-decl name='~_Automaton' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/regex_nfa.h' line='45' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -21401,7 +21364,7 @@
         </class-decl>
       </namespace-decl>
       <enum-decl name='future_errc' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/future' line='61' column='1' id='type-id-1488'>
-        <underlying-type type-id='type-id-39'/>
+        <underlying-type type-id='type-id-37'/>
         <enumerator name='future_already_retrieved' value='1'/>
         <enumerator name='promise_already_satisfied' value='2'/>
         <enumerator name='no_state' value='3'/>
@@ -21470,7 +21433,7 @@
         <member-function access='private' const='yes'>
           <function-decl name='operator bool' mangled-name='_ZNKSt8functionIFvRKNSt7__regex14_PatternCursorERNS0_8_ResultsEEEcvbEv' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/functional' line='2223' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1432' is-artificial='yes'/>
-            <return type-id='type-id-42'/>
+            <return type-id='type-id-40'/>
           </function-decl>
         </member-function>
         <member-function access='private' const='yes'>
@@ -21524,7 +21487,7 @@
         <member-function access='private' const='yes'>
           <function-decl name='_M_empty' mangled-name='_ZNKSt14_Function_base8_M_emptyEv' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/functional' line='1888' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1352' is-artificial='yes'/>
-            <return type-id='type-id-42'/>
+            <return type-id='type-id-40'/>
           </function-decl>
         </member-function>
       </class-decl>
@@ -21538,25 +21501,25 @@
         <member-function access='private'>
           <function-decl name='_M_access' mangled-name='_ZNSt9_Any_data9_M_accessEv' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/functional' line='1662' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1438' is-artificial='yes'/>
-            <return type-id='type-id-36'/>
+            <return type-id='type-id-34'/>
           </function-decl>
         </member-function>
         <member-function access='private' const='yes'>
           <function-decl name='_M_access' mangled-name='_ZNKSt9_Any_data9_M_accessEv' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/functional' line='1663' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1349' is-artificial='yes'/>
-            <return type-id='type-id-36'/>
+            <return type-id='type-id-34'/>
           </function-decl>
         </member-function>
       </union-decl>
       <union-decl name='_Nocopy_types' size-in-bits='128' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/functional' line='1652' column='1' id='type-id-1494'>
         <data-member access='private'>
-          <var-decl name='_M_object' type-id='type-id-36' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/functional' line='1654' column='1'/>
+          <var-decl name='_M_object' type-id='type-id-34' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/functional' line='1654' column='1'/>
         </data-member>
         <data-member access='private'>
-          <var-decl name='_M_const_object' type-id='type-id-36' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/functional' line='1655' column='1'/>
+          <var-decl name='_M_const_object' type-id='type-id-34' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/functional' line='1655' column='1'/>
         </data-member>
         <data-member access='private'>
-          <var-decl name='_M_function_pointer' type-id='type-id-89' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/functional' line='1656' column='1'/>
+          <var-decl name='_M_function_pointer' type-id='type-id-88' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/functional' line='1656' column='1'/>
         </data-member>
         <data-member access='private'>
           <var-decl name='_M_member_pointer' type-id='type-id-1325' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/functional' line='1657' column='1'/>
@@ -21564,7 +21527,7 @@
       </union-decl>
       <class-decl name='_Undefined_class' visibility='default' is-declaration-only='yes' id='type-id-1453'/>
       <enum-decl name='_Manager_operation' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/functional' line='1679' column='1' id='type-id-1495'>
-        <underlying-type type-id='type-id-39'/>
+        <underlying-type type-id='type-id-37'/>
         <enumerator name='__get_type_info' value='0'/>
         <enumerator name='__get_functor_ptr' value='1'/>
         <enumerator name='__clone_functor' value='2'/>
@@ -21629,14 +21592,14 @@
         <member-function access='private' const='yes'>
           <function-decl name='operator bool' mangled-name='_ZNKSt8functionIFbRKNSt7__regex14_PatternCursorEEEcvbEv' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/functional' line='2223' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1428' is-artificial='yes'/>
-            <return type-id='type-id-42'/>
+            <return type-id='type-id-40'/>
           </function-decl>
         </member-function>
         <member-function access='private' const='yes'>
           <function-decl name='operator()' mangled-name='_ZNKSt8functionIFbRKNSt7__regex14_PatternCursorEEEclES3_' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/functional' line='2305' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1428' is-artificial='yes'/>
             <parameter type-id='type-id-1405'/>
-            <return type-id='type-id-42'/>
+            <return type-id='type-id-40'/>
           </function-decl>
         </member-function>
         <member-function access='private' const='yes'>
@@ -21818,7 +21781,7 @@
           </class-decl>
         </member-type>
         <member-type access='private'>
-          <typedef-decl name='size_type' type-id='type-id-94' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/stl_tree.h' line='350' column='1' id='type-id-1505'/>
+          <typedef-decl name='size_type' type-id='type-id-93' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/stl_tree.h' line='350' column='1' id='type-id-1505'/>
         </member-type>
         <member-type access='private'>
           <typedef-decl name='_Node_allocator' type-id='type-id-1506' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/stl_tree.h' line='335' column='1' id='type-id-1357'/>
@@ -22189,7 +22152,7 @@
         <member-function access='private' const='yes'>
           <function-decl name='empty' mangled-name='_ZNKSt8_Rb_treeIiiSt9_IdentityIiESt4lessIiESaIiEE5emptyEv' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/stl_tree.h' line='698' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1356' is-artificial='yes'/>
-            <return type-id='type-id-42'/>
+            <return type-id='type-id-40'/>
           </function-decl>
         </member-function>
         <member-function access='private' const='yes'>
@@ -22335,7 +22298,7 @@
         <member-function access='private' const='yes'>
           <function-decl name='__rb_verify' mangled-name='_ZNKSt8_Rb_treeIiiSt9_IdentityIiESt4lessIiESaIiEE11__rb_verifyEv' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/stl_tree.h' line='1581' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1356' is-artificial='yes'/>
-            <return type-id='type-id-42'/>
+            <return type-id='type-id-40'/>
           </function-decl>
         </member-function>
       </class-decl>
@@ -22375,7 +22338,7 @@
             <parameter type-id='type-id-1436' is-artificial='yes'/>
             <parameter type-id='type-id-284'/>
             <parameter type-id='type-id-284'/>
-            <return type-id='type-id-42'/>
+            <return type-id='type-id-40'/>
           </function-decl>
         </member-function>
       </class-decl>
@@ -22484,14 +22447,14 @@
           <function-decl name='operator==' mangled-name='_ZNKSt17_Rb_tree_iteratorIiEeqERKS0_' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/stl_tree.h' line='216' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1380' is-artificial='yes'/>
             <parameter type-id='type-id-1383'/>
-            <return type-id='type-id-42'/>
+            <return type-id='type-id-40'/>
           </function-decl>
         </member-function>
         <member-function access='public' const='yes'>
           <function-decl name='operator!=' mangled-name='_ZNKSt17_Rb_tree_iteratorIiEneERKS0_' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/stl_tree.h' line='220' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1380' is-artificial='yes'/>
             <parameter type-id='type-id-1383'/>
-            <return type-id='type-id-42'/>
+            <return type-id='type-id-40'/>
           </function-decl>
         </member-function>
       </class-decl>
@@ -22585,14 +22548,14 @@
           <function-decl name='operator==' mangled-name='_ZNKSt23_Rb_tree_const_iteratorIiEeqERKS0_' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/stl_tree.h' line='297' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1371' is-artificial='yes'/>
             <parameter type-id='type-id-1374'/>
-            <return type-id='type-id-42'/>
+            <return type-id='type-id-40'/>
           </function-decl>
         </member-function>
         <member-function access='public' const='yes'>
           <function-decl name='operator!=' mangled-name='_ZNKSt23_Rb_tree_const_iteratorIiEneERKS0_' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/stl_tree.h' line='301' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1371' is-artificial='yes'/>
             <parameter type-id='type-id-1374'/>
-            <return type-id='type-id-42'/>
+            <return type-id='type-id-40'/>
           </function-decl>
         </member-function>
       </class-decl>
@@ -22688,14 +22651,14 @@
         <member-function access='public'>
           <function-decl name='_Vector_base' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/stl_vector.h' line='131' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1456' is-artificial='yes'/>
-            <parameter type-id='type-id-94'/>
+            <parameter type-id='type-id-93'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Vector_base' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/stl_vector.h' line='135' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1456' is-artificial='yes'/>
-            <parameter type-id='type-id-94'/>
+            <parameter type-id='type-id-93'/>
             <parameter type-id='type-id-1396'/>
             <return type-id='type-id-5'/>
           </function-decl>
@@ -22732,7 +22695,7 @@
         <member-function access='public'>
           <function-decl name='_M_allocate' mangled-name='_ZNSt12_Vector_baseINSt7__regex6_StateESaIS1_EE11_M_allocateEm' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/stl_vector.h' line='168' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1456' is-artificial='yes'/>
-            <parameter type-id='type-id-94'/>
+            <parameter type-id='type-id-93'/>
             <return type-id='type-id-1534'/>
           </function-decl>
         </member-function>
@@ -22740,14 +22703,14 @@
           <function-decl name='_M_deallocate' mangled-name='_ZNSt12_Vector_baseINSt7__regex6_StateESaIS1_EE13_M_deallocateEPS1_m' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/stl_vector.h' line='172' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1456' is-artificial='yes'/>
             <parameter type-id='type-id-1534'/>
-            <parameter type-id='type-id-94'/>
+            <parameter type-id='type-id-93'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='_M_create_storage' mangled-name='_ZNSt12_Vector_baseINSt7__regex6_StateESaIS1_EE17_M_create_storageEm' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/stl_vector.h' line='180' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1456' is-artificial='yes'/>
-            <parameter type-id='type-id-94'/>
+            <parameter type-id='type-id-93'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
@@ -22883,7 +22846,7 @@
     <namespace-decl name='__gnu_cxx'>
       <class-decl name='new_allocator&lt;std::__regex::_State&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ext/new_allocator.h' line='54' column='1' id='type-id-1331'>
         <member-type access='public'>
-          <typedef-decl name='size_type' type-id='type-id-94' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ext/new_allocator.h' line='57' column='1' id='type-id-1547'/>
+          <typedef-decl name='size_type' type-id='type-id-93' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ext/new_allocator.h' line='57' column='1' id='type-id-1547'/>
         </member-type>
         <member-type access='public'>
           <typedef-decl name='pointer' type-id='type-id-1468' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ext/new_allocator.h' line='59' column='1' id='type-id-1548'/>
@@ -22935,7 +22898,7 @@
           <function-decl name='allocate' mangled-name='_ZN9__gnu_cxx13new_allocatorINSt7__regex6_StateEE8allocateEmPKv' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ext/new_allocator.h' line='89' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1332' is-artificial='yes'/>
             <parameter type-id='type-id-1547'/>
-            <parameter type-id='type-id-36'/>
+            <parameter type-id='type-id-34'/>
             <return type-id='type-id-1548'/>
           </function-decl>
         </member-function>
@@ -22956,7 +22919,7 @@
       </class-decl>
       <class-decl name='new_allocator&lt;std::_Rb_tree_node&lt;int&gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ext/new_allocator.h' line='54' column='1' id='type-id-1329'>
         <member-type access='public'>
-          <typedef-decl name='size_type' type-id='type-id-94' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ext/new_allocator.h' line='57' column='1' id='type-id-1552'/>
+          <typedef-decl name='size_type' type-id='type-id-93' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ext/new_allocator.h' line='57' column='1' id='type-id-1552'/>
         </member-type>
         <member-type access='public'>
           <typedef-decl name='pointer' type-id='type-id-1452' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ext/new_allocator.h' line='59' column='1' id='type-id-1553'/>
@@ -23008,7 +22971,7 @@
           <function-decl name='allocate' mangled-name='_ZN9__gnu_cxx13new_allocatorISt13_Rb_tree_nodeIiEE8allocateEmPKv' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ext/new_allocator.h' line='89' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1330' is-artificial='yes'/>
             <parameter type-id='type-id-1552'/>
-            <parameter type-id='type-id-36'/>
+            <parameter type-id='type-id-34'/>
             <return type-id='type-id-1553'/>
           </function-decl>
         </member-function>
@@ -23036,7 +22999,7 @@
       </class-decl>
       <class-decl name='new_allocator&lt;int&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ext/new_allocator.h' line='54' column='1' id='type-id-1327'>
         <member-type access='public'>
-          <typedef-decl name='size_type' type-id='type-id-94' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ext/new_allocator.h' line='57' column='1' id='type-id-1557'/>
+          <typedef-decl name='size_type' type-id='type-id-93' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ext/new_allocator.h' line='57' column='1' id='type-id-1557'/>
         </member-type>
         <member-type access='public'>
           <typedef-decl name='pointer' type-id='type-id-109' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ext/new_allocator.h' line='59' column='1' id='type-id-1558'/>
@@ -23088,7 +23051,7 @@
           <function-decl name='allocate' mangled-name='_ZN9__gnu_cxx13new_allocatorIiE8allocateEmPKv' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ext/new_allocator.h' line='89' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1328' is-artificial='yes'/>
             <parameter type-id='type-id-1557'/>
-            <parameter type-id='type-id-36'/>
+            <parameter type-id='type-id-34'/>
             <return type-id='type-id-1558'/>
           </function-decl>
         </member-function>
@@ -23123,13 +23086,13 @@
     <function-type size-in-bits='64' id='type-id-1333'>
       <parameter type-id='type-id-1348'/>
       <parameter type-id='type-id-1405'/>
-      <return type-id='type-id-42'/>
+      <return type-id='type-id-40'/>
     </function-type>
     <function-type size-in-bits='64' id='type-id-1335'>
       <parameter type-id='type-id-1437'/>
       <parameter type-id='type-id-1348'/>
       <parameter type-id='type-id-1495'/>
-      <return type-id='type-id-42'/>
+      <return type-id='type-id-40'/>
     </function-type>
     <function-type size-in-bits='64' id='type-id-1481'>
       <parameter type-id='type-id-1348'/>
@@ -23457,19 +23420,19 @@
         <member-function access='private' const='yes'>
           <function-decl name='operator bool' mangled-name='_ZNKSt12__shared_ptrINSt13__future_base11_State_baseELN9__gnu_cxx12_Lock_policyE2EEcvbEv' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/shared_ptr_base.h' line='962' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1607' is-artificial='yes'/>
-            <return type-id='type-id-42'/>
+            <return type-id='type-id-40'/>
           </function-decl>
         </member-function>
         <member-function access='private' const='yes'>
           <function-decl name='unique' mangled-name='_ZNKSt12__shared_ptrINSt13__future_base11_State_baseELN9__gnu_cxx12_Lock_policyE2EE6uniqueEv' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/shared_ptr_base.h' line='966' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1607' is-artificial='yes'/>
-            <return type-id='type-id-42'/>
+            <return type-id='type-id-40'/>
           </function-decl>
         </member-function>
         <member-function access='private' const='yes'>
           <function-decl name='use_count' mangled-name='_ZNKSt12__shared_ptrINSt13__future_base11_State_baseELN9__gnu_cxx12_Lock_policyE2EE9use_countEv' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/shared_ptr_base.h' line='970' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1607' is-artificial='yes'/>
-            <return type-id='type-id-22'/>
+            <return type-id='type-id-20'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
@@ -23483,7 +23446,7 @@
           <function-decl name='_M_get_deleter' mangled-name='_ZNKSt12__shared_ptrINSt13__future_base11_State_baseELN9__gnu_cxx12_Lock_policyE2EE14_M_get_deleterERKSt9type_info' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/shared_ptr_base.h' line='1052' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1607' is-artificial='yes'/>
             <parameter type-id='type-id-469'/>
-            <return type-id='type-id-36'/>
+            <return type-id='type-id-34'/>
           </function-decl>
         </member-function>
       </class-decl>
@@ -23601,7 +23564,7 @@
         <member-function access='private' const='yes'>
           <function-decl name='operator bool' mangled-name='_ZNKSt10unique_ptrINSt13__future_base7_ResultIvEENS0_12_Result_base8_DeleterEEcvbEv' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/unique_ptr.h' line='233' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1635' is-artificial='yes'/>
-            <return type-id='type-id-42'/>
+            <return type-id='type-id-40'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
@@ -24024,7 +23987,7 @@
         <member-function access='private' const='yes'>
           <function-decl name='valid' mangled-name='_ZNKSt14__basic_futureIvE5validEv' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/future' line='567' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1596' is-artificial='yes'/>
-            <return type-id='type-id-42'/>
+            <return type-id='type-id-40'/>
           </function-decl>
         </member-function>
         <member-function access='private' const='yes'>
@@ -24240,7 +24203,7 @@
         <member-function access='private' const='yes'>
           <function-decl name='operator bool' mangled-name='_ZNKSt10unique_ptrINSt13__future_base12_Result_baseENS1_8_DeleterEEcvbEv' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/unique_ptr.h' line='233' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1642' is-artificial='yes'/>
-            <return type-id='type-id-42'/>
+            <return type-id='type-id-40'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
@@ -24511,7 +24474,7 @@
         <member-function access='private' const='yes'>
           <function-decl name='operator bool' mangled-name='_ZNKSt8functionIFSt10unique_ptrINSt13__future_base12_Result_baseENS2_8_DeleterEEvEEcvbEv' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/functional' line='2223' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1610' is-artificial='yes'/>
-            <return type-id='type-id-42'/>
+            <return type-id='type-id-40'/>
           </function-decl>
         </member-function>
         <member-function access='private' const='yes'>
@@ -24565,7 +24528,7 @@
           <function-decl name='operator()' mangled-name='_ZNKSt4hashIeEclEe' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/functional_hash.h' line='197' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSt4hashIeEclEe@@GLIBCXX_3.4.10'>
             <parameter type-id='type-id-1719' is-artificial='yes'/>
             <parameter type-id='type-id-378'/>
-            <return type-id='type-id-94'/>
+            <return type-id='type-id-93'/>
           </function-decl>
         </member-function>
       </class-decl>
@@ -24655,13 +24618,13 @@
         </data-member>
       </class-decl>
       <enum-decl name='float_denorm_style' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/limits' line='172' column='1' id='type-id-1722'>
-        <underlying-type type-id='type-id-39'/>
+        <underlying-type type-id='type-id-37'/>
         <enumerator name='denorm_indeterminate' value='-1'/>
         <enumerator name='denorm_absent' value='0'/>
         <enumerator name='denorm_present' value='1'/>
       </enum-decl>
       <enum-decl name='float_round_style' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/limits' line='157' column='1' id='type-id-1724'>
-        <underlying-type type-id='type-id-39'/>
+        <underlying-type type-id='type-id-37'/>
         <enumerator name='round_indeterminate' value='-1'/>
         <enumerator name='round_toward_zero' value='0'/>
         <enumerator name='round_to_nearest' value='1'/>
@@ -25740,8 +25703,8 @@
       <function-decl name='__once_proxy' mangled-name='__once_proxy' filepath='../../../.././libstdc++-v3/src/c++11/mutex.cc' line='77' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__once_proxy@@GLIBCXX_3.4.11'>
         <return type-id='type-id-5'/>
       </function-decl>
-      <var-decl name='__once_callable' type-id='type-id-36' mangled-name='_ZSt15__once_callable' visibility='default' filepath='../../../.././libstdc++-v3/src/c++11/mutex.cc' line='45' column='1' elf-symbol-id='_ZSt15__once_callable@@GLIBCXX_3.4.11'/>
-      <var-decl name='__once_call' type-id='type-id-89' mangled-name='_ZSt11__once_call' visibility='default' filepath='../../../.././libstdc++-v3/src/c++11/mutex.cc' line='46' column='1' elf-symbol-id='_ZSt11__once_call@@GLIBCXX_3.4.11'/>
+      <var-decl name='__once_callable' type-id='type-id-34' mangled-name='_ZSt15__once_callable' visibility='default' filepath='../../../.././libstdc++-v3/src/c++11/mutex.cc' line='45' column='1' elf-symbol-id='_ZSt15__once_callable@@GLIBCXX_3.4.11'/>
+      <var-decl name='__once_call' type-id='type-id-88' mangled-name='_ZSt11__once_call' visibility='default' filepath='../../../.././libstdc++-v3/src/c++11/mutex.cc' line='46' column='1' elf-symbol-id='_ZSt11__once_call@@GLIBCXX_3.4.11'/>
     </namespace-decl>
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='../../../.././libstdc++-v3/src/c++11/placeholders.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/src/c++11' language='LANG_C_plus_plus'>
@@ -26004,12 +25967,12 @@
     <namespace-decl name='__gnu_cxx'>
       <function-decl name='__is_null_pointer&lt;__gnu_cxx::__normal_iterator&lt;char*, std::basic_string&lt;char&gt; &gt; &gt;' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ext/type_traits.h' line='155' column='1' visibility='default' binding='global' size-in-bits='64'>
         <parameter type-id='type-id-264'/>
-        <return type-id='type-id-42'/>
+        <return type-id='type-id-40'/>
       </function-decl>
       <function-decl name='operator!=&lt;char*, std::basic_string&lt;char&gt; &gt;' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/stl_iterator.h' line='825' column='1' visibility='default' binding='global' size-in-bits='64'>
         <parameter type-id='type-id-1815'/>
         <parameter type-id='type-id-1815'/>
-        <return type-id='type-id-42'/>
+        <return type-id='type-id-40'/>
       </function-decl>
     </namespace-decl>
   </abi-instr>
@@ -26023,7 +25986,7 @@
       <function-decl name='operator==' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/system_error' line='279' column='1' visibility='default' binding='global' size-in-bits='64'>
         <parameter type-id='type-id-367'/>
         <parameter type-id='type-id-367'/>
-        <return type-id='type-id-42'/>
+        <return type-id='type-id-40'/>
       </function-decl>
       <function-decl name='system_category' mangled-name='_ZSt15system_categoryv' filepath='../../../.././libstdc++-v3/src/c++11/system_error.cc' line='78' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt15system_categoryv@@GLIBCXX_3.4.11'>
         <return type-id='type-id-287'/>
@@ -26036,14 +25999,14 @@
     <namespace-decl name='std'>
       <namespace-decl name=''>
         <function-decl name='execute_native_thread_routine' filepath='../../../.././libstdc++-v3/src/c++11/thread.cc' line='66' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-36'/>
-          <return type-id='type-id-36'/>
+          <parameter type-id='type-id-34'/>
+          <return type-id='type-id-34'/>
         </function-decl>
       </namespace-decl>
       <function-decl name='operator!=' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/thread' line='202' column='1' visibility='default' binding='global' size-in-bits='64'>
         <parameter type-id='type-id-527'/>
         <parameter type-id='type-id-527'/>
-        <return type-id='type-id-42'/>
+        <return type-id='type-id-40'/>
       </function-decl>
       <class-decl name='remove_reference&lt;std::thread::_Impl_base*&amp;&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/type_traits' line='1330' column='1' id='type-id-1821'>
         <member-type access='public'>
@@ -26140,12 +26103,12 @@
     <namespace-decl name='__gnu_cxx'>
       <function-decl name='__is_null_pointer&lt;__gnu_cxx::__normal_iterator&lt;wchar_t*, std::basic_string&lt;wchar_t&gt; &gt; &gt;' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ext/type_traits.h' line='155' column='1' visibility='default' binding='global' size-in-bits='64'>
         <parameter type-id='type-id-267'/>
-        <return type-id='type-id-42'/>
+        <return type-id='type-id-40'/>
       </function-decl>
       <function-decl name='operator!=&lt;wchar_t*, std::basic_string&lt;wchar_t&gt; &gt;' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/stl_iterator.h' line='825' column='1' visibility='default' binding='global' size-in-bits='64'>
         <parameter type-id='type-id-1829'/>
         <parameter type-id='type-id-1829'/>
-        <return type-id='type-id-42'/>
+        <return type-id='type-id-40'/>
       </function-decl>
     </namespace-decl>
   </abi-instr>
@@ -26244,15 +26207,15 @@
     <reference-type-def kind='lvalue' type-id='type-id-1956' size-in-bits='64' id='type-id-1957'/>
     <qualified-type-def type-id='type-id-1958' const='yes' id='type-id-1959'/>
     <reference-type-def kind='lvalue' type-id='type-id-1959' size-in-bits='64' id='type-id-1960'/>
-    <qualified-type-def type-id='type-id-94' const='yes' id='type-id-1493'/>
+    <qualified-type-def type-id='type-id-93' const='yes' id='type-id-1493'/>
     <pointer-type-def type-id='type-id-1493' size-in-bits='64' id='type-id-1961'/>
     <reference-type-def kind='lvalue' type-id='type-id-470' size-in-bits='64' id='type-id-1962'/>
     <reference-type-def kind='lvalue' type-id='type-id-1955' size-in-bits='64' id='type-id-1963'/>
     <pointer-type-def type-id='type-id-1955' size-in-bits='64' id='type-id-1964'/>
     <reference-type-def kind='lvalue' type-id='type-id-1958' size-in-bits='64' id='type-id-1965'/>
     <pointer-type-def type-id='type-id-1958' size-in-bits='64' id='type-id-1966'/>
-    <pointer-type-def type-id='type-id-94' size-in-bits='64' id='type-id-1967'/>
-    <pointer-type-def type-id='type-id-51' size-in-bits='64' id='type-id-1968'/>
+    <pointer-type-def type-id='type-id-93' size-in-bits='64' id='type-id-1967'/>
+    <pointer-type-def type-id='type-id-49' size-in-bits='64' id='type-id-1968'/>
     <qualified-type-def type-id='type-id-1968' const='yes' id='type-id-1969'/>
     <reference-type-def kind='lvalue' type-id='type-id-1969' size-in-bits='64' id='type-id-1970'/>
     <reference-type-def kind='lvalue' type-id='type-id-1968' size-in-bits='64' id='type-id-1971'/>
@@ -26260,7 +26223,7 @@
     <namespace-decl name='std'>
       <function-decl name='__addressof&lt;char&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/move.h' line='47' column='1' visibility='default' binding='global' size-in-bits='64'>
         <parameter type-id='type-id-352'/>
-        <return type-id='type-id-93'/>
+        <return type-id='type-id-92'/>
       </function-decl>
       <function-decl name='__addressof&lt;const char&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/move.h' line='47' column='1' visibility='default' binding='global' size-in-bits='64'>
         <parameter type-id='type-id-674'/>
@@ -26323,7 +26286,7 @@
           <typedef-decl name='argument_type' type-id='type-id-1958' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/stl_function.h' line='106' column='1' id='type-id-1974'/>
         </member-type>
         <member-type access='public'>
-          <typedef-decl name='result_type' type-id='type-id-42' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/stl_function.h' line='109' column='1' id='type-id-1975'/>
+          <typedef-decl name='result_type' type-id='type-id-40' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/stl_function.h' line='109' column='1' id='type-id-1975'/>
         </member-type>
       </class-decl>
       <class-decl name='unary_function&lt;std::pair&lt;__gnu_cxx::bitmap_allocator&lt;char&gt;::_Alloc_block*, __gnu_cxx::bitmap_allocator&lt;char&gt;::_Alloc_block*&gt;, bool&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/stl_function.h' line='103' column='1' id='type-id-1976'>
@@ -26331,7 +26294,7 @@
           <typedef-decl name='argument_type' type-id='type-id-1955' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/stl_function.h' line='106' column='1' id='type-id-1977'/>
         </member-type>
         <member-type access='public'>
-          <typedef-decl name='result_type' type-id='type-id-42' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/stl_function.h' line='109' column='1' id='type-id-1978'/>
+          <typedef-decl name='result_type' type-id='type-id-40' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/stl_function.h' line='109' column='1' id='type-id-1978'/>
         </member-type>
       </class-decl>
       <function-decl name='make_pair&lt;__gnu_cxx::bitmap_allocator&lt;char&gt;::_Alloc_block*, __gnu_cxx::bitmap_allocator&lt;char&gt;::_Alloc_block*&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/stl_pair.h' line='278' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -26354,7 +26317,7 @@
             <parameter type-id='type-id-1945' is-artificial='yes'/>
             <parameter type-id='type-id-1875'/>
             <parameter type-id='type-id-1875'/>
-            <return type-id='type-id-42'/>
+            <return type-id='type-id-40'/>
           </function-decl>
         </member-function>
       </class-decl>
@@ -26366,7 +26329,7 @@
             <parameter type-id='type-id-1951' is-artificial='yes'/>
             <parameter type-id='type-id-1875'/>
             <parameter type-id='type-id-1875'/>
-            <return type-id='type-id-42'/>
+            <return type-id='type-id-40'/>
           </function-decl>
         </member-function>
       </class-decl>
@@ -26377,7 +26340,7 @@
             <parameter type-id='type-id-1948' is-artificial='yes'/>
             <parameter type-id='type-id-1881'/>
             <parameter type-id='type-id-1881'/>
-            <return type-id='type-id-42'/>
+            <return type-id='type-id-40'/>
           </function-decl>
         </member-function>
       </class-decl>
@@ -26389,7 +26352,7 @@
             <parameter type-id='type-id-1954' is-artificial='yes'/>
             <parameter type-id='type-id-1881'/>
             <parameter type-id='type-id-1881'/>
-            <return type-id='type-id-42'/>
+            <return type-id='type-id-40'/>
           </function-decl>
         </member-function>
       </class-decl>
@@ -26398,16 +26361,16 @@
       <namespace-decl name='__detail'>
         <function-decl name='__num_blocks&lt;std::pair&lt;__gnu_cxx::bitmap_allocator&lt;char&gt;::_Alloc_block*, __gnu_cxx::bitmap_allocator&lt;char&gt;::_Alloc_block*&gt; &gt;' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ext/bitmap_allocator.h' line='269' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-1955'/>
-          <return type-id='type-id-94'/>
+          <return type-id='type-id-93'/>
         </function-decl>
         <function-decl name='__bit_free' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ext/bitmap_allocator.h' line='500' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-1967'/>
-          <parameter type-id='type-id-94'/>
+          <parameter type-id='type-id-93'/>
           <return type-id='type-id-5'/>
         </function-decl>
         <function-decl name='__num_bitmaps&lt;std::pair&lt;__gnu_cxx::bitmap_allocator&lt;char&gt;::_Alloc_block*, __gnu_cxx::bitmap_allocator&lt;char&gt;::_Alloc_block*&gt; &gt;' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ext/bitmap_allocator.h' line='277' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-1955'/>
-          <return type-id='type-id-94'/>
+          <return type-id='type-id-93'/>
         </function-decl>
         <class-decl name='__mini_vector&lt;long unsigned int*&gt;' size-in-bits='192' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ext/bitmap_allocator.h' line='70' column='1' id='type-id-1861'>
           <member-type access='private'>
@@ -26420,7 +26383,7 @@
             <typedef-decl name='const_reference' type-id='type-id-1970' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ext/bitmap_allocator.h' line='79' column='1' id='type-id-1903'/>
           </member-type>
           <member-type access='private'>
-            <typedef-decl name='size_type' type-id='type-id-94' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ext/bitmap_allocator.h' line='80' column='1' id='type-id-1905'/>
+            <typedef-decl name='size_type' type-id='type-id-93' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ext/bitmap_allocator.h' line='80' column='1' id='type-id-1905'/>
           </member-type>
           <member-type access='private'>
             <typedef-decl name='iterator' type-id='type-id-1981' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ext/bitmap_allocator.h' line='82' column='1' id='type-id-1983'/>
@@ -26558,7 +26521,7 @@
             <typedef-decl name='const_reference' type-id='type-id-1960' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ext/bitmap_allocator.h' line='79' column='1' id='type-id-1917'/>
           </member-type>
           <member-type access='private'>
-            <typedef-decl name='size_type' type-id='type-id-94' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ext/bitmap_allocator.h' line='80' column='1' id='type-id-1919'/>
+            <typedef-decl name='size_type' type-id='type-id-93' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ext/bitmap_allocator.h' line='80' column='1' id='type-id-1919'/>
           </member-type>
           <member-type access='private'>
             <typedef-decl name='difference_type' type-id='type-id-349' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ext/bitmap_allocator.h' line='81' column='1' id='type-id-1986'/>
@@ -26714,14 +26677,14 @@
             <function-decl name='_Bitmap_counter' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ext/bitmap_allocator.h' line='413' column='1' visibility='default' binding='global' size-in-bits='64'>
               <parameter type-id='type-id-1841' is-artificial='yes'/>
               <parameter type-id='type-id-1842'/>
-              <parameter type-id='type-id-22'/>
+              <parameter type-id='type-id-20'/>
               <return type-id='type-id-5'/>
             </function-decl>
           </member-function>
           <member-function access='private'>
             <function-decl name='_M_reset' mangled-name='_ZN9__gnu_cxx8__detail15_Bitmap_counterIPNS_16bitmap_allocatorIwE12_Alloc_blockEE8_M_resetEl' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ext/bitmap_allocator.h' line='417' column='1' visibility='default' binding='global' size-in-bits='64'>
               <parameter type-id='type-id-1841' is-artificial='yes'/>
-              <parameter type-id='type-id-22'/>
+              <parameter type-id='type-id-20'/>
               <return type-id='type-id-5'/>
             </function-decl>
           </member-function>
@@ -26735,7 +26698,7 @@
           <member-function access='private' const='yes'>
             <function-decl name='_M_finished' mangled-name='_ZNK9__gnu_cxx8__detail15_Bitmap_counterIPNS_16bitmap_allocatorIwE12_Alloc_blockEE11_M_finishedEv' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ext/bitmap_allocator.h' line='446' column='1' visibility='default' binding='global' size-in-bits='64'>
               <parameter type-id='type-id-1891' is-artificial='yes'/>
-              <return type-id='type-id-42'/>
+              <return type-id='type-id-40'/>
             </function-decl>
           </member-function>
           <member-function access='private'>
@@ -26819,7 +26782,7 @@
             <function-decl name='operator()' mangled-name='_ZN9__gnu_cxx8__detail12_Ffit_finderIPNS_16bitmap_allocatorIwE12_Alloc_blockEEclESt4pairIS5_S5_E' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ext/bitmap_allocator.h' line='347' column='1' visibility='default' binding='global' size-in-bits='64'>
               <parameter type-id='type-id-1852' is-artificial='yes'/>
               <parameter type-id='type-id-1993'/>
-              <return type-id='type-id-42'/>
+              <return type-id='type-id-40'/>
             </function-decl>
           </member-function>
           <member-function access='private' const='yes'>
@@ -26857,21 +26820,21 @@
             <function-decl name='operator()' mangled-name='_ZNK9__gnu_cxx8__detail18_Inclusive_betweenIPNS_16bitmap_allocatorIwE12_Alloc_blockEEclESt4pairIS5_S5_E' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ext/bitmap_allocator.h' line='294' column='1' visibility='default' binding='global' size-in-bits='64'>
               <parameter type-id='type-id-1899' is-artificial='yes'/>
               <parameter type-id='type-id-1995'/>
-              <return type-id='type-id-42'/>
+              <return type-id='type-id-40'/>
             </function-decl>
           </member-function>
         </class-decl>
         <function-decl name='__num_blocks&lt;std::pair&lt;__gnu_cxx::bitmap_allocator&lt;wchar_t&gt;::_Alloc_block*, __gnu_cxx::bitmap_allocator&lt;wchar_t&gt;::_Alloc_block*&gt; &gt;' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ext/bitmap_allocator.h' line='269' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-1958'/>
-          <return type-id='type-id-94'/>
+          <return type-id='type-id-93'/>
         </function-decl>
         <function-decl name='__num_bitmaps&lt;std::pair&lt;__gnu_cxx::bitmap_allocator&lt;wchar_t&gt;::_Alloc_block*, __gnu_cxx::bitmap_allocator&lt;wchar_t&gt;::_Alloc_block*&gt; &gt;' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ext/bitmap_allocator.h' line='277' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-1958'/>
-          <return type-id='type-id-94'/>
+          <return type-id='type-id-93'/>
         </function-decl>
         <function-decl name='__bit_allocate' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ext/bitmap_allocator.h' line='489' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-1967'/>
-          <parameter type-id='type-id-94'/>
+          <parameter type-id='type-id-93'/>
           <return type-id='type-id-5'/>
         </function-decl>
         <function-decl name='__lower_bound&lt;long unsigned int**, long unsigned int, __gnu_cxx::free_list::_LT_pointer_compare&gt;' mangled-name='_ZN9__gnu_cxx8__detail13__lower_boundIPPmmNS_9free_list19_LT_pointer_compareEEET_S6_S6_RKT0_T1_' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ext/bitmap_allocator.h' line='237' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -26892,7 +26855,7 @@
             <typedef-decl name='const_reference' type-id='type-id-1957' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ext/bitmap_allocator.h' line='79' column='1' id='type-id-1910'/>
           </member-type>
           <member-type access='private'>
-            <typedef-decl name='size_type' type-id='type-id-94' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ext/bitmap_allocator.h' line='80' column='1' id='type-id-1912'/>
+            <typedef-decl name='size_type' type-id='type-id-93' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ext/bitmap_allocator.h' line='80' column='1' id='type-id-1912'/>
           </member-type>
           <member-type access='private'>
             <typedef-decl name='difference_type' type-id='type-id-349' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ext/bitmap_allocator.h' line='81' column='1' id='type-id-1998'/>
@@ -27048,14 +27011,14 @@
             <function-decl name='_Bitmap_counter' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ext/bitmap_allocator.h' line='413' column='1' visibility='default' binding='global' size-in-bits='64'>
               <parameter type-id='type-id-1835' is-artificial='yes'/>
               <parameter type-id='type-id-1836'/>
-              <parameter type-id='type-id-22'/>
+              <parameter type-id='type-id-20'/>
               <return type-id='type-id-5'/>
             </function-decl>
           </member-function>
           <member-function access='private'>
             <function-decl name='_M_reset' mangled-name='_ZN9__gnu_cxx8__detail15_Bitmap_counterIPNS_16bitmap_allocatorIcE12_Alloc_blockEE8_M_resetEl' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ext/bitmap_allocator.h' line='417' column='1' visibility='default' binding='global' size-in-bits='64'>
               <parameter type-id='type-id-1835' is-artificial='yes'/>
-              <parameter type-id='type-id-22'/>
+              <parameter type-id='type-id-20'/>
               <return type-id='type-id-5'/>
             </function-decl>
           </member-function>
@@ -27069,7 +27032,7 @@
           <member-function access='private' const='yes'>
             <function-decl name='_M_finished' mangled-name='_ZNK9__gnu_cxx8__detail15_Bitmap_counterIPNS_16bitmap_allocatorIcE12_Alloc_blockEE11_M_finishedEv' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ext/bitmap_allocator.h' line='446' column='1' visibility='default' binding='global' size-in-bits='64'>
               <parameter type-id='type-id-1889' is-artificial='yes'/>
-              <return type-id='type-id-42'/>
+              <return type-id='type-id-40'/>
             </function-decl>
           </member-function>
           <member-function access='private'>
@@ -27153,7 +27116,7 @@
             <function-decl name='operator()' mangled-name='_ZN9__gnu_cxx8__detail12_Ffit_finderIPNS_16bitmap_allocatorIcE12_Alloc_blockEEclESt4pairIS5_S5_E' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ext/bitmap_allocator.h' line='347' column='1' visibility='default' binding='global' size-in-bits='64'>
               <parameter type-id='type-id-1848' is-artificial='yes'/>
               <parameter type-id='type-id-2005'/>
-              <return type-id='type-id-42'/>
+              <return type-id='type-id-40'/>
             </function-decl>
           </member-function>
           <member-function access='private' const='yes'>
@@ -27191,7 +27154,7 @@
             <function-decl name='operator()' mangled-name='_ZNK9__gnu_cxx8__detail18_Inclusive_betweenIPNS_16bitmap_allocatorIcE12_Alloc_blockEEclESt4pairIS5_S5_E' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ext/bitmap_allocator.h' line='294' column='1' visibility='default' binding='global' size-in-bits='64'>
               <parameter type-id='type-id-1897' is-artificial='yes'/>
               <parameter type-id='type-id-2007'/>
-              <return type-id='type-id-42'/>
+              <return type-id='type-id-40'/>
             </function-decl>
           </member-function>
         </class-decl>
@@ -27212,7 +27175,7 @@
           <typedef-decl name='__mutex_type' type-id='type-id-1884' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ext/bitmap_allocator.h' line='698' column='1' id='type-id-2009'/>
         </member-type>
         <member-type access='private'>
-          <typedef-decl name='size_type' type-id='type-id-94' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ext/bitmap_allocator.h' line='691' column='1' id='type-id-1937'/>
+          <typedef-decl name='size_type' type-id='type-id-93' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ext/bitmap_allocator.h' line='691' column='1' id='type-id-1937'/>
         </member-type>
         <member-type access='private'>
           <typedef-decl name='pointer' type-id='type-id-333' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ext/bitmap_allocator.h' line='693' column='1' id='type-id-2010'/>
@@ -27236,7 +27199,7 @@
           <var-decl name='_S_mem_blocks' type-id='type-id-2008' mangled-name='_ZN9__gnu_cxx16bitmap_allocatorIwE13_S_mem_blocksE' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ext/bitmap_allocator.h' line='1089' column='1'/>
         </data-member>
         <data-member access='private' static='yes'>
-          <var-decl name='_S_block_size' type-id='type-id-94' mangled-name='_ZN9__gnu_cxx16bitmap_allocatorIwE13_S_block_sizeE' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ext/bitmap_allocator.h' line='1092' column='1'/>
+          <var-decl name='_S_block_size' type-id='type-id-93' mangled-name='_ZN9__gnu_cxx16bitmap_allocatorIwE13_S_block_sizeE' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ext/bitmap_allocator.h' line='1092' column='1'/>
         </data-member>
         <data-member access='private' static='yes'>
           <var-decl name='_S_last_request' type-id='type-id-1839' mangled-name='_ZN9__gnu_cxx16bitmap_allocatorIwE15_S_last_requestE' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ext/bitmap_allocator.h' line='1102' column='1'/>
@@ -27384,8 +27347,8 @@
               <function-decl name='operator()' mangled-name='_ZNK9__gnu_cxx9free_list19_LT_pointer_compareclEPKmm' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ext/bitmap_allocator.h' line='534' column='1' visibility='default' binding='global' size-in-bits='64'>
                 <parameter type-id='type-id-1941' is-artificial='yes'/>
                 <parameter type-id='type-id-1961'/>
-                <parameter type-id='type-id-94'/>
-                <return type-id='type-id-42'/>
+                <parameter type-id='type-id-93'/>
+                <return type-id='type-id-40'/>
               </function-decl>
             </member-function>
           </class-decl>
@@ -27397,7 +27360,7 @@
           <typedef-decl name='iterator' type-id='type-id-1983' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ext/bitmap_allocator.h' line='527' column='1' id='type-id-2015'/>
         </member-type>
         <member-type access='private'>
-          <typedef-decl name='__mutex_type' type-id='type-id-61' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ext/bitmap_allocator.h' line='528' column='1' id='type-id-1884'/>
+          <typedef-decl name='__mutex_type' type-id='type-id-59' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ext/bitmap_allocator.h' line='528' column='1' id='type-id-1884'/>
         </member-type>
         <member-function access='private'>
           <function-decl name='_M_get_mutex' mangled-name='_ZN9__gnu_cxx9free_list12_M_get_mutexEv' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ext/bitmap_allocator.h' line='541' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -27421,9 +27384,9 @@
         <member-function access='private'>
           <function-decl name='_M_should_i_give' mangled-name='_ZN9__gnu_cxx9free_list16_M_should_i_giveEmm' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ext/bitmap_allocator.h' line='612' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1883' is-artificial='yes'/>
-            <parameter type-id='type-id-94'/>
-            <parameter type-id='type-id-94'/>
-            <return type-id='type-id-42'/>
+            <parameter type-id='type-id-93'/>
+            <parameter type-id='type-id-93'/>
+            <return type-id='type-id-40'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
@@ -27436,7 +27399,7 @@
         <member-function access='private'>
           <function-decl name='_M_get' mangled-name='_ZN9__gnu_cxx9free_list6_M_getEm' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ext/bitmap_allocator.h' line='652' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN9__gnu_cxx9free_list6_M_getEm@@GLIBCXX_3.4.4'>
             <parameter type-id='type-id-1883' is-artificial='yes'/>
-            <parameter type-id='type-id-94'/>
+            <parameter type-id='type-id-93'/>
             <return type-id='type-id-1967'/>
           </function-decl>
         </member-function>
@@ -27449,12 +27412,12 @@
       </class-decl>
       <class-decl name='bitmap_allocator&lt;void&gt;' size-in-bits='8' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ext/bitmap_allocator.h' line='668' column='1' id='type-id-2016'>
         <member-type access='private'>
-          <typedef-decl name='const_pointer' type-id='type-id-36' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ext/bitmap_allocator.h' line='672' column='1' id='type-id-2014'/>
+          <typedef-decl name='const_pointer' type-id='type-id-34' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ext/bitmap_allocator.h' line='672' column='1' id='type-id-2014'/>
         </member-type>
       </class-decl>
       <function-decl name='_Bit_scan_forward' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ext/bitmap_allocator.h' line='514' column='1' visibility='default' binding='global' size-in-bits='64'>
-        <parameter type-id='type-id-94'/>
-        <return type-id='type-id-94'/>
+        <parameter type-id='type-id-93'/>
+        <return type-id='type-id-93'/>
       </function-decl>
       <class-decl name='bitmap_allocator&lt;char&gt;' size-in-bits='8' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ext/bitmap_allocator.h' line='688' column='1' id='type-id-1870'>
         <base-class access='private' layout-offset-in-bits='0' type-id='type-id-1882'/>
@@ -27472,10 +27435,10 @@
           <typedef-decl name='__mutex_type' type-id='type-id-1884' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ext/bitmap_allocator.h' line='698' column='1' id='type-id-2018'/>
         </member-type>
         <member-type access='private'>
-          <typedef-decl name='size_type' type-id='type-id-94' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ext/bitmap_allocator.h' line='691' column='1' id='type-id-1928'/>
+          <typedef-decl name='size_type' type-id='type-id-93' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ext/bitmap_allocator.h' line='691' column='1' id='type-id-1928'/>
         </member-type>
         <member-type access='private'>
-          <typedef-decl name='pointer' type-id='type-id-93' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ext/bitmap_allocator.h' line='693' column='1' id='type-id-2019'/>
+          <typedef-decl name='pointer' type-id='type-id-92' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ext/bitmap_allocator.h' line='693' column='1' id='type-id-2019'/>
         </member-type>
         <member-type access='private'>
           <typedef-decl name='const_pointer' type-id='type-id-4' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ext/bitmap_allocator.h' line='694' column='1' id='type-id-2020'/>
@@ -27496,7 +27459,7 @@
           <var-decl name='_S_mem_blocks' type-id='type-id-2017' mangled-name='_ZN9__gnu_cxx16bitmap_allocatorIcE13_S_mem_blocksE' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ext/bitmap_allocator.h' line='1089' column='1'/>
         </data-member>
         <data-member access='private' static='yes'>
-          <var-decl name='_S_block_size' type-id='type-id-94' mangled-name='_ZN9__gnu_cxx16bitmap_allocatorIcE13_S_block_sizeE' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ext/bitmap_allocator.h' line='1092' column='1'/>
+          <var-decl name='_S_block_size' type-id='type-id-93' mangled-name='_ZN9__gnu_cxx16bitmap_allocatorIcE13_S_block_sizeE' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ext/bitmap_allocator.h' line='1092' column='1'/>
         </data-member>
         <data-member access='private' static='yes'>
           <var-decl name='_S_last_request' type-id='type-id-1833' mangled-name='_ZN9__gnu_cxx16bitmap_allocatorIcE15_S_last_requestE' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ext/bitmap_allocator.h' line='1102' column='1'/>
@@ -27714,7 +27677,7 @@
       <class-decl name='locale' size-in-bits='64' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_classes.h' line='64' column='1' id='type-id-863'>
         <member-type access='private'>
           <enum-decl name='__anonymous_enum__' is-anonymous='yes' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_classes.h' line='306' column='1' id='type-id-2078'>
-            <underlying-type type-id='type-id-39'/>
+            <underlying-type type-id='type-id-37'/>
             <enumerator name='_S_categories_size' value='12'/>
           </enum-decl>
         </member-type>
@@ -27735,7 +27698,7 @@
             <member-function access='protected' constructor='yes'>
               <function-decl name='facet' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_classes.h' line='372' column='1' visibility='default' binding='global' size-in-bits='64'>
                 <parameter type-id='type-id-2076' is-artificial='yes'/>
-                <parameter type-id='type-id-94'/>
+                <parameter type-id='type-id-93'/>
                 <return type-id='type-id-5'/>
               </function-decl>
             </member-function>
@@ -27842,7 +27805,7 @@
               <var-decl name='_M_facets' type-id='type-id-2085' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_classes.h' line='498' column='1'/>
             </data-member>
             <data-member access='private' layout-offset-in-bits='128'>
-              <var-decl name='_M_facets_size' type-id='type-id-94' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_classes.h' line='499' column='1'/>
+              <var-decl name='_M_facets_size' type-id='type-id-93' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_classes.h' line='499' column='1'/>
             </data-member>
             <data-member access='private' layout-offset-in-bits='192'>
               <var-decl name='_M_caches' type-id='type-id-2085' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_classes.h' line='500' column='1'/>
@@ -27887,7 +27850,7 @@
               <function-decl name='_Impl' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_classes.h' line='529' column='1' visibility='default' binding='global' size-in-bits='64'>
                 <parameter type-id='type-id-2088' is-artificial='yes'/>
                 <parameter type-id='type-id-2089'/>
-                <parameter type-id='type-id-94'/>
+                <parameter type-id='type-id-93'/>
                 <return type-id='type-id-5'/>
               </function-decl>
             </member-function>
@@ -27895,14 +27858,14 @@
               <function-decl name='_Impl' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_classes.h' line='530' column='1' visibility='default' binding='global' size-in-bits='64'>
                 <parameter type-id='type-id-2088' is-artificial='yes'/>
                 <parameter type-id='type-id-4'/>
-                <parameter type-id='type-id-94'/>
+                <parameter type-id='type-id-93'/>
                 <return type-id='type-id-5'/>
               </function-decl>
             </member-function>
             <member-function access='private' constructor='yes'>
               <function-decl name='_Impl' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_classes.h' line='531' column='1' visibility='default' binding='global' size-in-bits='64'>
                 <parameter type-id='type-id-2088' is-artificial='yes'/>
-                <parameter type-id='type-id-94'/>
+                <parameter type-id='type-id-93'/>
                 <return type-id='type-id-5'/>
               </function-decl>
             </member-function>
@@ -27930,7 +27893,7 @@
             <member-function access='private'>
               <function-decl name='_M_check_same_name' mangled-name='_ZNSt6locale5_Impl18_M_check_same_nameEv' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_classes.h' line='541' column='1' visibility='default' binding='global' size-in-bits='64'>
                 <parameter type-id='type-id-2088' is-artificial='yes'/>
-                <return type-id='type-id-42'/>
+                <return type-id='type-id-40'/>
               </function-decl>
             </member-function>
             <member-function access='private'>
@@ -27969,7 +27932,7 @@
               <function-decl name='_M_install_cache' mangled-name='_ZNSt6locale5_Impl16_M_install_cacheEPKNS_5facetEm' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_classes.h' line='569' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt6locale5_Impl16_M_install_cacheEPKNS_5facetEm@@GLIBCXX_3.4.7'>
                 <parameter type-id='type-id-2088' is-artificial='yes'/>
                 <parameter type-id='type-id-2080'/>
-                <parameter type-id='type-id-94'/>
+                <parameter type-id='type-id-93'/>
                 <return type-id='type-id-5'/>
               </function-decl>
             </member-function>
@@ -27984,7 +27947,7 @@
               <function-decl name='_Impl' mangled-name='_ZNSt6locale5_ImplC2ERKS0_m' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_classes.h' line='529' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt6locale5_ImplC1ERKS0_m@@GLIBCXX_3.4'>
                 <parameter type-id='type-id-2088' is-artificial='yes'/>
                 <parameter type-id='type-id-2089'/>
-                <parameter type-id='type-id-94'/>
+                <parameter type-id='type-id-93'/>
                 <return type-id='type-id-5'/>
               </function-decl>
             </member-function>
@@ -28187,7 +28150,7 @@
             <member-function access='private' constructor='yes'>
               <function-decl name='_Impl' mangled-name='_ZNSt6locale5_ImplC2Em' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_classes.h' line='531' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt6locale5_ImplC2Em@@GLIBCXX_3.4'>
                 <parameter type-id='type-id-2088' is-artificial='yes'/>
-                <parameter type-id='type-id-94'/>
+                <parameter type-id='type-id-93'/>
                 <return type-id='type-id-5'/>
               </function-decl>
             </member-function>
@@ -28195,7 +28158,7 @@
               <function-decl name='_Impl' mangled-name='_ZNSt6locale5_ImplC2EPKcm' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_classes.h' line='530' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt6locale5_ImplC2EPKcm@@GLIBCXX_3.4'>
                 <parameter type-id='type-id-2088' is-artificial='yes'/>
                 <parameter type-id='type-id-4'/>
-                <parameter type-id='type-id-94'/>
+                <parameter type-id='type-id-93'/>
                 <return type-id='type-id-5'/>
               </function-decl>
             </member-function>
@@ -28204,7 +28167,7 @@
         <member-type access='private'>
           <class-decl name='id' size-in-bits='64' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_classes.h' line='438' column='1' id='type-id-2050'>
             <data-member access='private' layout-offset-in-bits='0'>
-              <var-decl name='_M_index' type-id='type-id-94' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_classes.h' line='455' column='1'/>
+              <var-decl name='_M_index' type-id='type-id-93' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_classes.h' line='455' column='1'/>
             </data-member>
             <data-member access='private' static='yes'>
               <var-decl name='_S_refcount' type-id='type-id-537' mangled-name='_ZNSt6locale2id11_S_refcountE' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_classes.h' line='458' column='1'/>
@@ -28232,7 +28195,7 @@
             <member-function access='private' const='yes'>
               <function-decl name='_M_id' mangled-name='_ZNKSt6locale2id5_M_idEv' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_classes.h' line='472' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSt6locale2id5_M_idEv@@GLIBCXX_3.4'>
                 <parameter type-id='type-id-2053' is-artificial='yes'/>
-                <return type-id='type-id-94'/>
+                <return type-id='type-id-93'/>
               </function-decl>
             </member-function>
           </class-decl>
@@ -28338,14 +28301,14 @@
           <function-decl name='operator==' mangled-name='_ZNKSt6localeeqERKS_' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_classes.h' line='228' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSt6localeeqERKS_@@GLIBCXX_3.4'>
             <parameter type-id='type-id-2121' is-artificial='yes'/>
             <parameter type-id='type-id-862'/>
-            <return type-id='type-id-42'/>
+            <return type-id='type-id-40'/>
           </function-decl>
         </member-function>
         <member-function access='private' const='yes'>
           <function-decl name='operator!=' mangled-name='_ZNKSt6localeneERKS_' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_classes.h' line='237' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-2121' is-artificial='yes'/>
             <parameter type-id='type-id-862'/>
-            <return type-id='type-id-42'/>
+            <return type-id='type-id-40'/>
           </function-decl>
         </member-function>
         <member-function access='private' static='yes'>
@@ -28448,7 +28411,7 @@
       <class-decl name='codecvt_base' size-in-bits='8' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/codecvt.h' line='47' column='1' id='type-id-2122'>
         <member-type access='private'>
           <enum-decl name='result' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/codecvt.h' line='50' column='1' id='type-id-2123'>
-            <underlying-type type-id='type-id-39'/>
+            <underlying-type type-id='type-id-37'/>
             <enumerator name='ok' value='0'/>
             <enumerator name='partial' value='1'/>
             <enumerator name='error' value='2'/>
@@ -28474,7 +28437,7 @@
         <member-function access='protected'>
           <function-decl name='__codecvt_abstract_base' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/codecvt.h' line='225' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-2058' is-artificial='yes'/>
-            <parameter type-id='type-id-94'/>
+            <parameter type-id='type-id-93'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
@@ -28523,7 +28486,7 @@
         <member-function access='private' const='yes'>
           <function-decl name='always_noconv' mangled-name='_ZNKSt23__codecvt_abstract_baseIcc11__mbstate_tE13always_noconvEv' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/codecvt.h' line='211' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-2128' is-artificial='yes'/>
-            <return type-id='type-id-42'/>
+            <return type-id='type-id-40'/>
           </function-decl>
         </member-function>
         <member-function access='private' const='yes'>
@@ -28532,7 +28495,7 @@
             <parameter type-id='type-id-2129'/>
             <parameter type-id='type-id-2134'/>
             <parameter type-id='type-id-2134'/>
-            <parameter type-id='type-id-94'/>
+            <parameter type-id='type-id-93'/>
             <return type-id='type-id-6'/>
           </function-decl>
         </member-function>
@@ -28608,7 +28571,7 @@
         <member-function access='protected' const='yes' vtable-offset='6'>
           <function-decl name='do_always_noconv' mangled-name='_ZNKSt23__codecvt_abstract_baseIcc11__mbstate_tE16do_always_noconvEv' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/codecvt.h' line='257' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-2128' is-artificial='yes'/>
-            <return type-id='type-id-42'/>
+            <return type-id='type-id-40'/>
           </function-decl>
         </member-function>
         <member-function access='protected' const='yes' vtable-offset='7'>
@@ -28617,7 +28580,7 @@
             <parameter type-id='type-id-2129'/>
             <parameter type-id='type-id-2134'/>
             <parameter type-id='type-id-2134'/>
-            <parameter type-id='type-id-94'/>
+            <parameter type-id='type-id-93'/>
             <return type-id='type-id-6'/>
           </function-decl>
         </member-function>
@@ -28646,7 +28609,7 @@
         <member-function access='protected'>
           <function-decl name='__codecvt_abstract_base' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/codecvt.h' line='225' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-2060' is-artificial='yes'/>
-            <parameter type-id='type-id-94'/>
+            <parameter type-id='type-id-93'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
@@ -28695,7 +28658,7 @@
         <member-function access='private' const='yes'>
           <function-decl name='always_noconv' mangled-name='_ZNKSt23__codecvt_abstract_baseIwc11__mbstate_tE13always_noconvEv' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/codecvt.h' line='211' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-2142' is-artificial='yes'/>
-            <return type-id='type-id-42'/>
+            <return type-id='type-id-40'/>
           </function-decl>
         </member-function>
         <member-function access='private' const='yes'>
@@ -28704,7 +28667,7 @@
             <parameter type-id='type-id-2143'/>
             <parameter type-id='type-id-2148'/>
             <parameter type-id='type-id-2148'/>
-            <parameter type-id='type-id-94'/>
+            <parameter type-id='type-id-93'/>
             <return type-id='type-id-6'/>
           </function-decl>
         </member-function>
@@ -28780,7 +28743,7 @@
         <member-function access='protected' const='yes' vtable-offset='6'>
           <function-decl name='do_always_noconv' mangled-name='_ZNKSt23__codecvt_abstract_baseIwc11__mbstate_tE16do_always_noconvEv' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/codecvt.h' line='257' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-2142' is-artificial='yes'/>
-            <return type-id='type-id-42'/>
+            <return type-id='type-id-40'/>
           </function-decl>
         </member-function>
         <member-function access='protected' const='yes' vtable-offset='7'>
@@ -28789,7 +28752,7 @@
             <parameter type-id='type-id-2143'/>
             <parameter type-id='type-id-2148'/>
             <parameter type-id='type-id-2148'/>
-            <parameter type-id='type-id-94'/>
+            <parameter type-id='type-id-93'/>
             <return type-id='type-id-6'/>
           </function-decl>
         </member-function>
@@ -28820,7 +28783,7 @@
         <member-function access='private'>
           <function-decl name='codecvt' filepath='../../../.././libstdc++-v3/src/c++98/codecvt.cc' line='38' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-2061' is-artificial='yes'/>
-            <parameter type-id='type-id-94'/>
+            <parameter type-id='type-id-93'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
@@ -28828,14 +28791,14 @@
           <function-decl name='codecvt' filepath='../../../.././libstdc++-v3/src/c++98/codecvt.cc' line='44' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-2061' is-artificial='yes'/>
             <parameter type-id='type-id-2055'/>
-            <parameter type-id='type-id-94'/>
+            <parameter type-id='type-id-93'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='codecvt' mangled-name='_ZNSt7codecvtIcc11__mbstate_tEC2Em' filepath='../../../.././libstdc++-v3/src/c++98/codecvt.cc' line='38' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt7codecvtIcc11__mbstate_tEC2Em@@GLIBCXX_3.4'>
             <parameter type-id='type-id-2061' is-artificial='yes'/>
-            <parameter type-id='type-id-94'/>
+            <parameter type-id='type-id-93'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
@@ -28843,7 +28806,7 @@
           <function-decl name='codecvt' mangled-name='_ZNSt7codecvtIcc11__mbstate_tEC2EP15__locale_structm' filepath='../../../.././libstdc++-v3/src/c++98/codecvt.cc' line='44' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt7codecvtIcc11__mbstate_tEC2EP15__locale_structm@@GLIBCXX_3.4'>
             <parameter type-id='type-id-2061' is-artificial='yes'/>
             <parameter type-id='type-id-2055'/>
-            <parameter type-id='type-id-94'/>
+            <parameter type-id='type-id-93'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
@@ -28913,7 +28876,7 @@
         <member-function access='protected' const='yes' vtable-offset='6'>
           <function-decl name='do_always_noconv' mangled-name='_ZNKSt7codecvtIcc11__mbstate_tE16do_always_noconvEv' filepath='../../../.././libstdc++-v3/src/c++98/codecvt.cc' line='98' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSt7codecvtIcc11__mbstate_tE16do_always_noconvEv@@GLIBCXX_3.4'>
             <parameter type-id='type-id-1314' is-artificial='yes'/>
-            <return type-id='type-id-42'/>
+            <return type-id='type-id-40'/>
           </function-decl>
         </member-function>
         <member-function access='protected' const='yes' vtable-offset='7'>
@@ -28922,7 +28885,7 @@
             <parameter type-id='type-id-2067'/>
             <parameter type-id='type-id-2035'/>
             <parameter type-id='type-id-2035'/>
-            <parameter type-id='type-id-94'/>
+            <parameter type-id='type-id-93'/>
             <return type-id='type-id-6'/>
           </function-decl>
         </member-function>
@@ -28953,7 +28916,7 @@
         <member-function access='private'>
           <function-decl name='codecvt' filepath='../../../.././libstdc++-v3/src/c++98/codecvt.cc' line='118' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-2068' is-artificial='yes'/>
-            <parameter type-id='type-id-94'/>
+            <parameter type-id='type-id-93'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
@@ -28961,14 +28924,14 @@
           <function-decl name='codecvt' filepath='../../../.././libstdc++-v3/src/c++98/codecvt.cc' line='124' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-2068' is-artificial='yes'/>
             <parameter type-id='type-id-2055'/>
-            <parameter type-id='type-id-94'/>
+            <parameter type-id='type-id-93'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='codecvt' mangled-name='_ZNSt7codecvtIwc11__mbstate_tEC2Em' filepath='../../../.././libstdc++-v3/src/c++98/codecvt.cc' line='118' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt7codecvtIwc11__mbstate_tEC2Em@@GLIBCXX_3.4'>
             <parameter type-id='type-id-2068' is-artificial='yes'/>
-            <parameter type-id='type-id-94'/>
+            <parameter type-id='type-id-93'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
@@ -28976,7 +28939,7 @@
           <function-decl name='codecvt' mangled-name='_ZNSt7codecvtIwc11__mbstate_tEC2EP15__locale_structm' filepath='../../../.././libstdc++-v3/src/c++98/codecvt.cc' line='124' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt7codecvtIwc11__mbstate_tEC2EP15__locale_structm@@GLIBCXX_3.4'>
             <parameter type-id='type-id-2068' is-artificial='yes'/>
             <parameter type-id='type-id-2055'/>
-            <parameter type-id='type-id-94'/>
+            <parameter type-id='type-id-93'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
@@ -29072,7 +29035,7 @@
         <member-function access='protected' const='yes' vtable-offset='6'>
           <function-decl name='do_always_noconv' mangled-name='_ZNKSt7codecvtIwc11__mbstate_tE16do_always_noconvEv' filepath='../../../.././libstdc++-v3/src/c++98/codecvt.cc' line='145' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSt7codecvtIwc11__mbstate_tE16do_always_noconvEv@@GLIBCXX_3.4'>
             <parameter type-id='type-id-1317' is-artificial='yes'/>
-            <return type-id='type-id-42'/>
+            <return type-id='type-id-40'/>
           </function-decl>
         </member-function>
         <member-function access='protected' const='yes' vtable-offset='7'>
@@ -29081,7 +29044,7 @@
             <parameter type-id='type-id-2074'/>
             <parameter type-id='type-id-2044'/>
             <parameter type-id='type-id-2044'/>
-            <parameter type-id='type-id-94'/>
+            <parameter type-id='type-id-93'/>
             <return type-id='type-id-6'/>
           </function-decl>
         </member-function>
@@ -29191,7 +29154,7 @@
           <var-decl name='_M_c_locale_ctype' type-id='type-id-2055' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='1186' column='1'/>
         </data-member>
         <data-member access='protected' layout-offset-in-bits='192'>
-          <var-decl name='_M_narrow_ok' type-id='type-id-42' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='1189' column='1'/>
+          <var-decl name='_M_narrow_ok' type-id='type-id-40' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='1189' column='1'/>
         </data-member>
         <data-member access='protected' layout-offset-in-bits='200'>
           <var-decl name='_M_narrow' type-id='type-id-2221' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='1190' column='1'/>
@@ -29211,7 +29174,7 @@
         <member-function access='private'>
           <function-decl name='ctype' filepath='../../../.././libstdc++-v3/src/c++98/ctype.cc' line='104' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-2105' is-artificial='yes'/>
-            <parameter type-id='type-id-94'/>
+            <parameter type-id='type-id-93'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
@@ -29219,7 +29182,7 @@
           <function-decl name='ctype' filepath='../../../.././libstdc++-v3/src/c++98/ctype.cc' line='109' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-2105' is-artificial='yes'/>
             <parameter type-id='type-id-2055'/>
-            <parameter type-id='type-id-94'/>
+            <parameter type-id='type-id-93'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
@@ -29239,7 +29202,7 @@
         <member-function access='private'>
           <function-decl name='ctype' mangled-name='_ZNSt5ctypeIwEC2Em' filepath='../../../.././libstdc++-v3/src/c++98/ctype.cc' line='104' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt5ctypeIwEC1Em@@GLIBCXX_3.4'>
             <parameter type-id='type-id-2105' is-artificial='yes'/>
-            <parameter type-id='type-id-94'/>
+            <parameter type-id='type-id-93'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
@@ -29247,7 +29210,7 @@
           <function-decl name='ctype' mangled-name='_ZNSt5ctypeIwEC2EP15__locale_structm' filepath='../../../.././libstdc++-v3/src/c++98/ctype.cc' line='109' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt5ctypeIwEC1EP15__locale_structm@@GLIBCXX_3.4'>
             <parameter type-id='type-id-2105' is-artificial='yes'/>
             <parameter type-id='type-id-2055'/>
-            <parameter type-id='type-id-94'/>
+            <parameter type-id='type-id-93'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
@@ -29277,7 +29240,7 @@
             <parameter type-id='type-id-2197' is-artificial='yes'/>
             <parameter type-id='type-id-2225'/>
             <parameter type-id='type-id-2219'/>
-            <return type-id='type-id-42'/>
+            <return type-id='type-id-40'/>
           </function-decl>
         </member-function>
         <member-function access='protected' const='yes' vtable-offset='2'>
@@ -29285,7 +29248,7 @@
             <parameter type-id='type-id-2197' is-artificial='yes'/>
             <parameter type-id='type-id-2225'/>
             <parameter type-id='type-id-375'/>
-            <return type-id='type-id-42'/>
+            <return type-id='type-id-40'/>
           </function-decl>
         </member-function>
         <member-function access='protected' const='yes' vtable-offset='3'>
@@ -29456,7 +29419,7 @@
             <parameter type-id='type-id-2226'/>
             <parameter type-id='type-id-2226'/>
             <parameter type-id='type-id-186'/>
-            <parameter type-id='type-id-93'/>
+            <parameter type-id='type-id-92'/>
             <return type-id='type-id-2226'/>
           </function-decl>
         </member-function>
@@ -29466,7 +29429,7 @@
             <parameter type-id='type-id-354'/>
             <parameter type-id='type-id-354'/>
             <parameter type-id='type-id-186'/>
-            <parameter type-id='type-id-93'/>
+            <parameter type-id='type-id-92'/>
             <return type-id='type-id-354'/>
           </function-decl>
         </member-function>
@@ -29483,12 +29446,12 @@
       <function-decl name='operator==&lt;char&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/allocator.h' line='124' column='1' visibility='default' binding='global' size-in-bits='64'>
         <parameter type-id='type-id-689'/>
         <parameter type-id='type-id-689'/>
-        <return type-id='type-id-42'/>
+        <return type-id='type-id-40'/>
       </function-decl>
       <function-decl name='operator==&lt;wchar_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/allocator.h' line='124' column='1' visibility='default' binding='global' size-in-bits='64'>
         <parameter type-id='type-id-692'/>
         <parameter type-id='type-id-692'/>
-        <return type-id='type-id-42'/>
+        <return type-id='type-id-40'/>
       </function-decl>
       <class-decl name='random_access_iterator_tag' size-in-bits='8' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/stl_iterator_base_types.h' line='104' column='1' id='type-id-347'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-2229'/>
@@ -29505,14 +29468,14 @@
         <return type-id='type-id-346'/>
       </function-decl>
       <function-decl name='__distance&lt;char*&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/stl_iterator_base_funcs.h' line='90' column='1' visibility='default' binding='global' size-in-bits='64'>
-        <parameter type-id='type-id-93'/>
-        <parameter type-id='type-id-93'/>
+        <parameter type-id='type-id-92'/>
+        <parameter type-id='type-id-92'/>
         <parameter type-id='type-id-347'/>
         <return type-id='type-id-348'/>
       </function-decl>
       <function-decl name='distance&lt;char*&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/stl_iterator_base_funcs.h' line='114' column='1' visibility='default' binding='global' size-in-bits='64'>
-        <parameter type-id='type-id-93'/>
-        <parameter type-id='type-id-93'/>
+        <parameter type-id='type-id-92'/>
+        <parameter type-id='type-id-92'/>
         <return type-id='type-id-348'/>
       </function-decl>
       <function-decl name='__iterator_category&lt;wchar_t*&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/stl_iterator_base_types.h' line='202' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -29913,7 +29876,7 @@
         <member-type access='private'>
           <class-decl name='sentry' size-in-bits='128' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ostream' line='398' column='1' id='type-id-2231'>
             <data-member access='private' layout-offset-in-bits='0'>
-              <var-decl name='_M_ok' type-id='type-id-42' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ostream' line='401' column='1'/>
+              <var-decl name='_M_ok' type-id='type-id-40' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ostream' line='401' column='1'/>
             </data-member>
             <data-member access='private' layout-offset-in-bits='64'>
               <var-decl name='_M_os' type-id='type-id-2232' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ostream' line='402' column='1'/>
@@ -29935,7 +29898,7 @@
             <member-function access='private' const='yes'>
               <function-decl name='operator bool' mangled-name='_ZNKSo6sentrycvbEv' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ostream' line='447' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSo6sentrycvbEv@@GLIBCXX_3.4'>
                 <parameter type-id='type-id-2234' is-artificial='yes'/>
-                <return type-id='type-id-42'/>
+                <return type-id='type-id-40'/>
               </function-decl>
             </member-function>
             <member-function access='private' constructor='yes'>
@@ -30003,7 +29966,7 @@
           <function-decl name='basic_ostream' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ostream' line='382' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-857' is-artificial='yes'/>
             <parameter type-id='type-id-6' is-artificial='yes'/>
-            <parameter type-id='type-id-37' is-artificial='yes'/>
+            <parameter type-id='type-id-35' is-artificial='yes'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
@@ -30025,7 +29988,7 @@
           <function-decl name='basic_ostream' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ostream' line='82' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-857' is-artificial='yes'/>
             <parameter type-id='type-id-6' is-artificial='yes'/>
-            <parameter type-id='type-id-37' is-artificial='yes'/>
+            <parameter type-id='type-id-35' is-artificial='yes'/>
             <parameter type-id='type-id-2242'/>
             <return type-id='type-id-5'/>
           </function-decl>
@@ -30054,21 +30017,21 @@
         <member-function access='private'>
           <function-decl name='operator&lt;&lt;' mangled-name='_ZNSolsEl' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ostream' line='164' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSolsEl@@GLIBCXX_3.4'>
             <parameter type-id='type-id-857' is-artificial='yes'/>
-            <parameter type-id='type-id-22'/>
+            <parameter type-id='type-id-20'/>
             <return type-id='type-id-2205'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='operator&lt;&lt;' mangled-name='_ZNSolsEm' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ostream' line='168' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSolsEm@@GLIBCXX_3.4'>
             <parameter type-id='type-id-857' is-artificial='yes'/>
-            <parameter type-id='type-id-51'/>
+            <parameter type-id='type-id-49'/>
             <return type-id='type-id-2205'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='operator&lt;&lt;' mangled-name='_ZNSolsEb' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ostream' line='172' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSolsEb@@GLIBCXX_3.4'>
             <parameter type-id='type-id-857' is-artificial='yes'/>
-            <parameter type-id='type-id-42'/>
+            <parameter type-id='type-id-40'/>
             <return type-id='type-id-2205'/>
           </function-decl>
         </member-function>
@@ -30096,7 +30059,7 @@
         <member-function access='private'>
           <function-decl name='operator&lt;&lt;' mangled-name='_ZNSolsEj' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ostream' line='190' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSolsEj@@GLIBCXX_3.4'>
             <parameter type-id='type-id-857' is-artificial='yes'/>
-            <parameter type-id='type-id-41'/>
+            <parameter type-id='type-id-39'/>
             <return type-id='type-id-2205'/>
           </function-decl>
         </member-function>
@@ -30117,7 +30080,7 @@
         <member-function access='private'>
           <function-decl name='operator&lt;&lt;' mangled-name='_ZNSolsEPKv' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ostream' line='243' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSolsEPKv@@GLIBCXX_3.4'>
             <parameter type-id='type-id-857' is-artificial='yes'/>
-            <parameter type-id='type-id-36'/>
+            <parameter type-id='type-id-34'/>
             <return type-id='type-id-2205'/>
           </function-decl>
         </member-function>
@@ -30181,21 +30144,21 @@
         <member-function access='protected'>
           <function-decl name='_M_insert&lt;long int&gt;' mangled-name='_ZNSo9_M_insertIlEERSoT_' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/ostream.tcc' line='65' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSo9_M_insertIlEERSoT_@@GLIBCXX_3.4.9'>
             <parameter type-id='type-id-857' is-artificial='yes'/>
-            <parameter type-id='type-id-22'/>
+            <parameter type-id='type-id-20'/>
             <return type-id='type-id-2203'/>
           </function-decl>
         </member-function>
         <member-function access='protected'>
           <function-decl name='_M_insert&lt;long unsigned int&gt;' mangled-name='_ZNSo9_M_insertImEERSoT_' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/ostream.tcc' line='65' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSo9_M_insertImEERSoT_@@GLIBCXX_3.4.9'>
             <parameter type-id='type-id-857' is-artificial='yes'/>
-            <parameter type-id='type-id-51'/>
+            <parameter type-id='type-id-49'/>
             <return type-id='type-id-2203'/>
           </function-decl>
         </member-function>
         <member-function access='protected'>
           <function-decl name='_M_insert&lt;bool&gt;' mangled-name='_ZNSo9_M_insertIbEERSoT_' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/ostream.tcc' line='65' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSo9_M_insertIbEERSoT_@@GLIBCXX_3.4.9'>
             <parameter type-id='type-id-857' is-artificial='yes'/>
-            <parameter type-id='type-id-42'/>
+            <parameter type-id='type-id-40'/>
             <return type-id='type-id-2203'/>
           </function-decl>
         </member-function>
@@ -30216,7 +30179,7 @@
         <member-function access='protected'>
           <function-decl name='_M_insert&lt;const void*&gt;' mangled-name='_ZNSo9_M_insertIPKvEERSoT_' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/ostream.tcc' line='65' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSo9_M_insertIPKvEERSoT_@@GLIBCXX_3.4.9'>
             <parameter type-id='type-id-857' is-artificial='yes'/>
-            <parameter type-id='type-id-36'/>
+            <parameter type-id='type-id-34'/>
             <return type-id='type-id-2203'/>
           </function-decl>
         </member-function>
@@ -30224,7 +30187,7 @@
           <function-decl name='basic_ostream' mangled-name='_ZNSoC2EPSt15basic_streambufIcSt11char_traitsIcEE' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ostream' line='82' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSoC2EPSt15basic_streambufIcSt11char_traitsIcEE@@GLIBCXX_3.4'>
             <parameter type-id='type-id-857' is-artificial='yes'/>
             <parameter type-id='type-id-6' is-artificial='yes'/>
-            <parameter type-id='type-id-37' is-artificial='yes'/>
+            <parameter type-id='type-id-35' is-artificial='yes'/>
             <parameter type-id='type-id-2242'/>
             <return type-id='type-id-5'/>
           </function-decl>
@@ -30233,7 +30196,7 @@
           <function-decl name='basic_ostream' mangled-name='_ZNSoC1EPSt15basic_streambufIcSt11char_traitsIcEE' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ostream' line='82' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSoC1EPSt15basic_streambufIcSt11char_traitsIcEE@@GLIBCXX_3.4'>
             <parameter type-id='type-id-857' is-artificial='yes'/>
             <parameter type-id='type-id-6' is-artificial='yes'/>
-            <parameter type-id='type-id-37' is-artificial='yes'/>
+            <parameter type-id='type-id-35' is-artificial='yes'/>
             <parameter type-id='type-id-2242'/>
             <return type-id='type-id-5'/>
           </function-decl>
@@ -30242,7 +30205,7 @@
           <function-decl name='basic_ostream' mangled-name='_ZNSoC2Ev' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ostream' line='382' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSoC2Ev@@GLIBCXX_3.4'>
             <parameter type-id='type-id-857' is-artificial='yes'/>
             <parameter type-id='type-id-6' is-artificial='yes'/>
-            <parameter type-id='type-id-37' is-artificial='yes'/>
+            <parameter type-id='type-id-35' is-artificial='yes'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
@@ -30250,7 +30213,7 @@
           <function-decl name='basic_ostream' mangled-name='_ZNSoC1Ev' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ostream' line='382' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSoC1Ev@@GLIBCXX_3.4'>
             <parameter type-id='type-id-857' is-artificial='yes'/>
             <parameter type-id='type-id-6' is-artificial='yes'/>
-            <parameter type-id='type-id-37' is-artificial='yes'/>
+            <parameter type-id='type-id-35' is-artificial='yes'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
@@ -30258,7 +30221,7 @@
           <function-decl name='~basic_ostream' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ostream' line='91' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-857' is-artificial='yes'/>
             <parameter type-id='type-id-6' is-artificial='yes'/>
-            <parameter type-id='type-id-37' is-artificial='yes'/>
+            <parameter type-id='type-id-35' is-artificial='yes'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
@@ -30266,7 +30229,7 @@
           <function-decl name='~basic_ostream' mangled-name='_ZNSoD0Ev' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ostream' line='91' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSoD0Ev@@GLIBCXX_3.4'>
             <parameter type-id='type-id-857' is-artificial='yes'/>
             <parameter type-id='type-id-6' is-artificial='yes'/>
-            <parameter type-id='type-id-37' is-artificial='yes'/>
+            <parameter type-id='type-id-35' is-artificial='yes'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
@@ -30274,7 +30237,7 @@
           <function-decl name='~basic_ostream' mangled-name='_ZNSoD1Ev' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ostream' line='91' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSoD1Ev@@GLIBCXX_3.4'>
             <parameter type-id='type-id-857' is-artificial='yes'/>
             <parameter type-id='type-id-6' is-artificial='yes'/>
-            <parameter type-id='type-id-37' is-artificial='yes'/>
+            <parameter type-id='type-id-35' is-artificial='yes'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
@@ -30282,7 +30245,7 @@
           <function-decl name='~basic_ostream' mangled-name='_ZNSoD2Ev' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ostream' line='91' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSoD2Ev@@GLIBCXX_3.4'>
             <parameter type-id='type-id-857' is-artificial='yes'/>
             <parameter type-id='type-id-6' is-artificial='yes'/>
-            <parameter type-id='type-id-37' is-artificial='yes'/>
+            <parameter type-id='type-id-35' is-artificial='yes'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
@@ -30321,7 +30284,7 @@
         <member-type access='private'>
           <class-decl name='sentry' size-in-bits='128' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ostream' line='398' column='1' id='type-id-2247'>
             <data-member access='private' layout-offset-in-bits='0'>
-              <var-decl name='_M_ok' type-id='type-id-42' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ostream' line='401' column='1'/>
+              <var-decl name='_M_ok' type-id='type-id-40' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ostream' line='401' column='1'/>
             </data-member>
             <data-member access='private' layout-offset-in-bits='64'>
               <var-decl name='_M_os' type-id='type-id-2248' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ostream' line='402' column='1'/>
@@ -30343,7 +30306,7 @@
             <member-function access='private' const='yes'>
               <function-decl name='operator bool' mangled-name='_ZNKSt13basic_ostreamIwSt11char_traitsIwEE6sentrycvbEv' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ostream' line='447' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSt13basic_ostreamIwSt11char_traitsIwEE6sentrycvbEv@@GLIBCXX_3.4'>
                 <parameter type-id='type-id-2250' is-artificial='yes'/>
-                <return type-id='type-id-42'/>
+                <return type-id='type-id-40'/>
               </function-decl>
             </member-function>
             <member-function access='private' constructor='yes'>
@@ -30408,7 +30371,7 @@
           <function-decl name='basic_ostream' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ostream' line='382' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-919' is-artificial='yes'/>
             <parameter type-id='type-id-6' is-artificial='yes'/>
-            <parameter type-id='type-id-37' is-artificial='yes'/>
+            <parameter type-id='type-id-35' is-artificial='yes'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
@@ -30430,7 +30393,7 @@
           <function-decl name='basic_ostream' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ostream' line='82' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-919' is-artificial='yes'/>
             <parameter type-id='type-id-6' is-artificial='yes'/>
-            <parameter type-id='type-id-37' is-artificial='yes'/>
+            <parameter type-id='type-id-35' is-artificial='yes'/>
             <parameter type-id='type-id-2257'/>
             <return type-id='type-id-5'/>
           </function-decl>
@@ -30459,21 +30422,21 @@
         <member-function access='private'>
           <function-decl name='operator&lt;&lt;' mangled-name='_ZNSt13basic_ostreamIwSt11char_traitsIwEElsEl' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ostream' line='164' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt13basic_ostreamIwSt11char_traitsIwEElsEl@@GLIBCXX_3.4'>
             <parameter type-id='type-id-919' is-artificial='yes'/>
-            <parameter type-id='type-id-22'/>
+            <parameter type-id='type-id-20'/>
             <return type-id='type-id-2208'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='operator&lt;&lt;' mangled-name='_ZNSt13basic_ostreamIwSt11char_traitsIwEElsEm' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ostream' line='168' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt13basic_ostreamIwSt11char_traitsIwEElsEm@@GLIBCXX_3.4'>
             <parameter type-id='type-id-919' is-artificial='yes'/>
-            <parameter type-id='type-id-51'/>
+            <parameter type-id='type-id-49'/>
             <return type-id='type-id-2208'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='operator&lt;&lt;' mangled-name='_ZNSt13basic_ostreamIwSt11char_traitsIwEElsEb' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ostream' line='172' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt13basic_ostreamIwSt11char_traitsIwEElsEb@@GLIBCXX_3.4'>
             <parameter type-id='type-id-919' is-artificial='yes'/>
-            <parameter type-id='type-id-42'/>
+            <parameter type-id='type-id-40'/>
             <return type-id='type-id-2208'/>
           </function-decl>
         </member-function>
@@ -30501,7 +30464,7 @@
         <member-function access='private'>
           <function-decl name='operator&lt;&lt;' mangled-name='_ZNSt13basic_ostreamIwSt11char_traitsIwEElsEj' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ostream' line='190' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt13basic_ostreamIwSt11char_traitsIwEElsEj@@GLIBCXX_3.4'>
             <parameter type-id='type-id-919' is-artificial='yes'/>
-            <parameter type-id='type-id-41'/>
+            <parameter type-id='type-id-39'/>
             <return type-id='type-id-2208'/>
           </function-decl>
         </member-function>
@@ -30522,7 +30485,7 @@
         <member-function access='private'>
           <function-decl name='operator&lt;&lt;' mangled-name='_ZNSt13basic_ostreamIwSt11char_traitsIwEElsEPKv' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ostream' line='243' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt13basic_ostreamIwSt11char_traitsIwEElsEPKv@@GLIBCXX_3.4'>
             <parameter type-id='type-id-919' is-artificial='yes'/>
-            <parameter type-id='type-id-36'/>
+            <parameter type-id='type-id-34'/>
             <return type-id='type-id-2208'/>
           </function-decl>
         </member-function>
@@ -30586,21 +30549,21 @@
         <member-function access='protected'>
           <function-decl name='_M_insert&lt;long int&gt;' mangled-name='_ZNSt13basic_ostreamIwSt11char_traitsIwEE9_M_insertIlEERS2_T_' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/ostream.tcc' line='65' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt13basic_ostreamIwSt11char_traitsIwEE9_M_insertIlEERS2_T_@@GLIBCXX_3.4.9'>
             <parameter type-id='type-id-919' is-artificial='yes'/>
-            <parameter type-id='type-id-22'/>
+            <parameter type-id='type-id-20'/>
             <return type-id='type-id-2206'/>
           </function-decl>
         </member-function>
         <member-function access='protected'>
           <function-decl name='_M_insert&lt;long unsigned int&gt;' mangled-name='_ZNSt13basic_ostreamIwSt11char_traitsIwEE9_M_insertImEERS2_T_' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/ostream.tcc' line='65' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt13basic_ostreamIwSt11char_traitsIwEE9_M_insertImEERS2_T_@@GLIBCXX_3.4.9'>
             <parameter type-id='type-id-919' is-artificial='yes'/>
-            <parameter type-id='type-id-51'/>
+            <parameter type-id='type-id-49'/>
             <return type-id='type-id-2206'/>
           </function-decl>
         </member-function>
         <member-function access='protected'>
           <function-decl name='_M_insert&lt;bool&gt;' mangled-name='_ZNSt13basic_ostreamIwSt11char_traitsIwEE9_M_insertIbEERS2_T_' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/ostream.tcc' line='65' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt13basic_ostreamIwSt11char_traitsIwEE9_M_insertIbEERS2_T_@@GLIBCXX_3.4.9'>
             <parameter type-id='type-id-919' is-artificial='yes'/>
-            <parameter type-id='type-id-42'/>
+            <parameter type-id='type-id-40'/>
             <return type-id='type-id-2206'/>
           </function-decl>
         </member-function>
@@ -30621,7 +30584,7 @@
         <member-function access='protected'>
           <function-decl name='_M_insert&lt;const void*&gt;' mangled-name='_ZNSt13basic_ostreamIwSt11char_traitsIwEE9_M_insertIPKvEERS2_T_' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/ostream.tcc' line='65' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt13basic_ostreamIwSt11char_traitsIwEE9_M_insertIPKvEERS2_T_@@GLIBCXX_3.4.9'>
             <parameter type-id='type-id-919' is-artificial='yes'/>
-            <parameter type-id='type-id-36'/>
+            <parameter type-id='type-id-34'/>
             <return type-id='type-id-2206'/>
           </function-decl>
         </member-function>
@@ -30629,7 +30592,7 @@
           <function-decl name='basic_ostream' mangled-name='_ZNSt13basic_ostreamIwSt11char_traitsIwEEC2EPSt15basic_streambufIwS1_E' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ostream' line='82' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt13basic_ostreamIwSt11char_traitsIwEEC2EPSt15basic_streambufIwS1_E@@GLIBCXX_3.4'>
             <parameter type-id='type-id-919' is-artificial='yes'/>
             <parameter type-id='type-id-6' is-artificial='yes'/>
-            <parameter type-id='type-id-37' is-artificial='yes'/>
+            <parameter type-id='type-id-35' is-artificial='yes'/>
             <parameter type-id='type-id-2257'/>
             <return type-id='type-id-5'/>
           </function-decl>
@@ -30638,7 +30601,7 @@
           <function-decl name='basic_ostream' mangled-name='_ZNSt13basic_ostreamIwSt11char_traitsIwEEC1EPSt15basic_streambufIwS1_E' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ostream' line='82' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt13basic_ostreamIwSt11char_traitsIwEEC1EPSt15basic_streambufIwS1_E@@GLIBCXX_3.4'>
             <parameter type-id='type-id-919' is-artificial='yes'/>
             <parameter type-id='type-id-6' is-artificial='yes'/>
-            <parameter type-id='type-id-37' is-artificial='yes'/>
+            <parameter type-id='type-id-35' is-artificial='yes'/>
             <parameter type-id='type-id-2257'/>
             <return type-id='type-id-5'/>
           </function-decl>
@@ -30647,7 +30610,7 @@
           <function-decl name='basic_ostream' mangled-name='_ZNSt13basic_ostreamIwSt11char_traitsIwEEC2Ev' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ostream' line='382' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt13basic_ostreamIwSt11char_traitsIwEEC2Ev@@GLIBCXX_3.4'>
             <parameter type-id='type-id-919' is-artificial='yes'/>
             <parameter type-id='type-id-6' is-artificial='yes'/>
-            <parameter type-id='type-id-37' is-artificial='yes'/>
+            <parameter type-id='type-id-35' is-artificial='yes'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
@@ -30655,7 +30618,7 @@
           <function-decl name='basic_ostream' mangled-name='_ZNSt13basic_ostreamIwSt11char_traitsIwEEC1Ev' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ostream' line='382' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt13basic_ostreamIwSt11char_traitsIwEEC1Ev@@GLIBCXX_3.4'>
             <parameter type-id='type-id-919' is-artificial='yes'/>
             <parameter type-id='type-id-6' is-artificial='yes'/>
-            <parameter type-id='type-id-37' is-artificial='yes'/>
+            <parameter type-id='type-id-35' is-artificial='yes'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
@@ -30663,7 +30626,7 @@
           <function-decl name='~basic_ostream' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ostream' line='91' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-919' is-artificial='yes'/>
             <parameter type-id='type-id-6' is-artificial='yes'/>
-            <parameter type-id='type-id-37' is-artificial='yes'/>
+            <parameter type-id='type-id-35' is-artificial='yes'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
@@ -30671,7 +30634,7 @@
           <function-decl name='~basic_ostream' mangled-name='_ZNSt13basic_ostreamIwSt11char_traitsIwEED0Ev' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ostream' line='91' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt13basic_ostreamIwSt11char_traitsIwEED0Ev@@GLIBCXX_3.4'>
             <parameter type-id='type-id-919' is-artificial='yes'/>
             <parameter type-id='type-id-6' is-artificial='yes'/>
-            <parameter type-id='type-id-37' is-artificial='yes'/>
+            <parameter type-id='type-id-35' is-artificial='yes'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
@@ -30679,7 +30642,7 @@
           <function-decl name='~basic_ostream' mangled-name='_ZNSt13basic_ostreamIwSt11char_traitsIwEED1Ev' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ostream' line='91' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt13basic_ostreamIwSt11char_traitsIwEED1Ev@@GLIBCXX_3.4'>
             <parameter type-id='type-id-919' is-artificial='yes'/>
             <parameter type-id='type-id-6' is-artificial='yes'/>
-            <parameter type-id='type-id-37' is-artificial='yes'/>
+            <parameter type-id='type-id-35' is-artificial='yes'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
@@ -30687,7 +30650,7 @@
           <function-decl name='~basic_ostream' mangled-name='_ZNSt13basic_ostreamIwSt11char_traitsIwEED2Ev' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ostream' line='91' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt13basic_ostreamIwSt11char_traitsIwEED2Ev@@GLIBCXX_3.4'>
             <parameter type-id='type-id-919' is-artificial='yes'/>
             <parameter type-id='type-id-6' is-artificial='yes'/>
-            <parameter type-id='type-id-37' is-artificial='yes'/>
+            <parameter type-id='type-id-35' is-artificial='yes'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
@@ -30748,7 +30711,7 @@
         <return type-id='type-id-2206'/>
       </function-decl>
       <enum-decl name='_Ios_Fmtflags' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/ios_base.h' line='53' column='1' id='type-id-899'>
-        <underlying-type type-id='type-id-39'/>
+        <underlying-type type-id='type-id-37'/>
         <enumerator name='_S_boolalpha' value='1'/>
         <enumerator name='_S_dec' value='2'/>
         <enumerator name='_S_fixed' value='4'/>
@@ -30785,7 +30748,7 @@
         <member-function access='protected'>
           <function-decl name='__ctype_abstract_base' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='354' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-2263' is-artificial='yes'/>
-            <parameter type-id='type-id-94'/>
+            <parameter type-id='type-id-93'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
@@ -30802,7 +30765,7 @@
             <parameter type-id='type-id-2164' is-artificial='yes'/>
             <parameter type-id='type-id-2225'/>
             <parameter type-id='type-id-2262'/>
-            <return type-id='type-id-42'/>
+            <return type-id='type-id-40'/>
           </function-decl>
         </member-function>
         <member-function access='private' const='yes'>
@@ -30877,7 +30840,7 @@
             <parameter type-id='type-id-2265'/>
             <parameter type-id='type-id-2265'/>
             <parameter type-id='type-id-186'/>
-            <parameter type-id='type-id-93'/>
+            <parameter type-id='type-id-92'/>
             <return type-id='type-id-2265'/>
           </function-decl>
         </member-function>
@@ -30907,7 +30870,7 @@
             <parameter type-id='type-id-2164' is-artificial='yes'/>
             <parameter type-id='type-id-2225'/>
             <parameter type-id='type-id-2262'/>
-            <return type-id='type-id-42'/>
+            <return type-id='type-id-40'/>
           </function-decl>
         </member-function>
         <member-function access='protected' const='yes' vtable-offset='3'>
@@ -30997,7 +30960,7 @@
             <parameter type-id='type-id-2265'/>
             <parameter type-id='type-id-2265'/>
             <parameter type-id='type-id-186'/>
-            <parameter type-id='type-id-93'/>
+            <parameter type-id='type-id-92'/>
             <return type-id='type-id-2265'/>
           </function-decl>
         </member-function>
@@ -31172,7 +31135,7 @@
           <function-decl name='basic_ostringstream' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/sstream' line='409' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-2209' is-artificial='yes'/>
             <parameter type-id='type-id-6' is-artificial='yes'/>
-            <parameter type-id='type-id-37' is-artificial='yes'/>
+            <parameter type-id='type-id-35' is-artificial='yes'/>
             <parameter type-id='type-id-875'/>
             <return type-id='type-id-5'/>
           </function-decl>
@@ -31187,7 +31150,7 @@
           <function-decl name='basic_ostringstream' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/sstream' line='427' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-2209' is-artificial='yes'/>
             <parameter type-id='type-id-6' is-artificial='yes'/>
-            <parameter type-id='type-id-37' is-artificial='yes'/>
+            <parameter type-id='type-id-35' is-artificial='yes'/>
             <parameter type-id='type-id-2278'/>
             <parameter type-id='type-id-875'/>
             <return type-id='type-id-5'/>
@@ -31210,7 +31173,7 @@
           <function-decl name='basic_ostringstream' mangled-name='_ZNSt19basic_ostringstreamIcSt11char_traitsIcESaIcEEC2ESt13_Ios_Openmode' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/sstream' line='409' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt19basic_ostringstreamIcSt11char_traitsIcESaIcEEC2ESt13_Ios_Openmode@@GLIBCXX_3.4'>
             <parameter type-id='type-id-2209' is-artificial='yes'/>
             <parameter type-id='type-id-6' is-artificial='yes'/>
-            <parameter type-id='type-id-37' is-artificial='yes'/>
+            <parameter type-id='type-id-35' is-artificial='yes'/>
             <parameter type-id='type-id-875'/>
             <return type-id='type-id-5'/>
           </function-decl>
@@ -31219,7 +31182,7 @@
           <function-decl name='basic_ostringstream' mangled-name='_ZNSt19basic_ostringstreamIcSt11char_traitsIcESaIcEEC1ESt13_Ios_Openmode' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/sstream' line='409' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt19basic_ostringstreamIcSt11char_traitsIcESaIcEEC1ESt13_Ios_Openmode@@GLIBCXX_3.4'>
             <parameter type-id='type-id-2209' is-artificial='yes'/>
             <parameter type-id='type-id-6' is-artificial='yes'/>
-            <parameter type-id='type-id-37' is-artificial='yes'/>
+            <parameter type-id='type-id-35' is-artificial='yes'/>
             <parameter type-id='type-id-875'/>
             <return type-id='type-id-5'/>
           </function-decl>
@@ -31228,7 +31191,7 @@
           <function-decl name='basic_ostringstream' mangled-name='_ZNSt19basic_ostringstreamIcSt11char_traitsIcESaIcEEC2ERKSsSt13_Ios_Openmode' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/sstream' line='427' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt19basic_ostringstreamIcSt11char_traitsIcESaIcEEC2ERKSsSt13_Ios_Openmode@@GLIBCXX_3.4'>
             <parameter type-id='type-id-2209' is-artificial='yes'/>
             <parameter type-id='type-id-6' is-artificial='yes'/>
-            <parameter type-id='type-id-37' is-artificial='yes'/>
+            <parameter type-id='type-id-35' is-artificial='yes'/>
             <parameter type-id='type-id-2278'/>
             <parameter type-id='type-id-875'/>
             <return type-id='type-id-5'/>
@@ -31238,7 +31201,7 @@
           <function-decl name='basic_ostringstream' mangled-name='_ZNSt19basic_ostringstreamIcSt11char_traitsIcESaIcEEC1ERKSsSt13_Ios_Openmode' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/sstream' line='427' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt19basic_ostringstreamIcSt11char_traitsIcESaIcEEC1ERKSsSt13_Ios_Openmode@@GLIBCXX_3.4'>
             <parameter type-id='type-id-2209' is-artificial='yes'/>
             <parameter type-id='type-id-6' is-artificial='yes'/>
-            <parameter type-id='type-id-37' is-artificial='yes'/>
+            <parameter type-id='type-id-35' is-artificial='yes'/>
             <parameter type-id='type-id-2278'/>
             <parameter type-id='type-id-875'/>
             <return type-id='type-id-5'/>
@@ -31248,7 +31211,7 @@
           <function-decl name='~basic_ostringstream' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/sstream' line='438' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-2209' is-artificial='yes'/>
             <parameter type-id='type-id-6' is-artificial='yes'/>
-            <parameter type-id='type-id-37' is-artificial='yes'/>
+            <parameter type-id='type-id-35' is-artificial='yes'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
@@ -31256,7 +31219,7 @@
           <function-decl name='~basic_ostringstream' mangled-name='_ZNSt19basic_ostringstreamIcSt11char_traitsIcESaIcEED0Ev' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/sstream' line='438' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt19basic_ostringstreamIcSt11char_traitsIcESaIcEED0Ev@@GLIBCXX_3.4'>
             <parameter type-id='type-id-2209' is-artificial='yes'/>
             <parameter type-id='type-id-6' is-artificial='yes'/>
-            <parameter type-id='type-id-37' is-artificial='yes'/>
+            <parameter type-id='type-id-35' is-artificial='yes'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
@@ -31264,7 +31227,7 @@
           <function-decl name='~basic_ostringstream' mangled-name='_ZNSt19basic_ostringstreamIcSt11char_traitsIcESaIcEED1Ev' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/sstream' line='438' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt19basic_ostringstreamIcSt11char_traitsIcESaIcEED1Ev@@GLIBCXX_3.4'>
             <parameter type-id='type-id-2209' is-artificial='yes'/>
             <parameter type-id='type-id-6' is-artificial='yes'/>
-            <parameter type-id='type-id-37' is-artificial='yes'/>
+            <parameter type-id='type-id-35' is-artificial='yes'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
@@ -31272,7 +31235,7 @@
           <function-decl name='~basic_ostringstream' mangled-name='_ZNSt19basic_ostringstreamIcSt11char_traitsIcESaIcEED2Ev' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/sstream' line='438' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt19basic_ostringstreamIcSt11char_traitsIcESaIcEED2Ev@@GLIBCXX_3.4'>
             <parameter type-id='type-id-2209' is-artificial='yes'/>
             <parameter type-id='type-id-6' is-artificial='yes'/>
-            <parameter type-id='type-id-37' is-artificial='yes'/>
+            <parameter type-id='type-id-35' is-artificial='yes'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
@@ -31447,7 +31410,7 @@
           <function-decl name='basic_ostringstream' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/sstream' line='409' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-2210' is-artificial='yes'/>
             <parameter type-id='type-id-6' is-artificial='yes'/>
-            <parameter type-id='type-id-37' is-artificial='yes'/>
+            <parameter type-id='type-id-35' is-artificial='yes'/>
             <parameter type-id='type-id-875'/>
             <return type-id='type-id-5'/>
           </function-decl>
@@ -31462,7 +31425,7 @@
           <function-decl name='basic_ostringstream' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/sstream' line='427' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-2210' is-artificial='yes'/>
             <parameter type-id='type-id-6' is-artificial='yes'/>
-            <parameter type-id='type-id-37' is-artificial='yes'/>
+            <parameter type-id='type-id-35' is-artificial='yes'/>
             <parameter type-id='type-id-2292'/>
             <parameter type-id='type-id-875'/>
             <return type-id='type-id-5'/>
@@ -31485,7 +31448,7 @@
           <function-decl name='basic_ostringstream' mangled-name='_ZNSt19basic_ostringstreamIwSt11char_traitsIwESaIwEEC2ESt13_Ios_Openmode' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/sstream' line='409' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt19basic_ostringstreamIwSt11char_traitsIwESaIwEEC2ESt13_Ios_Openmode@@GLIBCXX_3.4'>
             <parameter type-id='type-id-2210' is-artificial='yes'/>
             <parameter type-id='type-id-6' is-artificial='yes'/>
-            <parameter type-id='type-id-37' is-artificial='yes'/>
+            <parameter type-id='type-id-35' is-artificial='yes'/>
             <parameter type-id='type-id-875'/>
             <return type-id='type-id-5'/>
           </function-decl>
@@ -31494,7 +31457,7 @@
           <function-decl name='basic_ostringstream' mangled-name='_ZNSt19basic_ostringstreamIwSt11char_traitsIwESaIwEEC1ESt13_Ios_Openmode' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/sstream' line='409' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt19basic_ostringstreamIwSt11char_traitsIwESaIwEEC1ESt13_Ios_Openmode@@GLIBCXX_3.4'>
             <parameter type-id='type-id-2210' is-artificial='yes'/>
             <parameter type-id='type-id-6' is-artificial='yes'/>
-            <parameter type-id='type-id-37' is-artificial='yes'/>
+            <parameter type-id='type-id-35' is-artificial='yes'/>
             <parameter type-id='type-id-875'/>
             <return type-id='type-id-5'/>
           </function-decl>
@@ -31503,7 +31466,7 @@
           <function-decl name='basic_ostringstream' mangled-name='_ZNSt19basic_ostringstreamIwSt11char_traitsIwESaIwEEC2ERKSbIwS1_S2_ESt13_Ios_Openmode' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/sstream' line='427' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt19basic_ostringstreamIwSt11char_traitsIwESaIwEEC2ERKSbIwS1_S2_ESt13_Ios_Openmode@@GLIBCXX_3.4'>
             <parameter type-id='type-id-2210' is-artificial='yes'/>
             <parameter type-id='type-id-6' is-artificial='yes'/>
-            <parameter type-id='type-id-37' is-artificial='yes'/>
+            <parameter type-id='type-id-35' is-artificial='yes'/>
             <parameter type-id='type-id-2292'/>
             <parameter type-id='type-id-875'/>
             <return type-id='type-id-5'/>
@@ -31513,7 +31476,7 @@
           <function-decl name='basic_ostringstream' mangled-name='_ZNSt19basic_ostringstreamIwSt11char_traitsIwESaIwEEC1ERKSbIwS1_S2_ESt13_Ios_Openmode' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/sstream' line='427' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt19basic_ostringstreamIwSt11char_traitsIwESaIwEEC1ERKSbIwS1_S2_ESt13_Ios_Openmode@@GLIBCXX_3.4'>
             <parameter type-id='type-id-2210' is-artificial='yes'/>
             <parameter type-id='type-id-6' is-artificial='yes'/>
-            <parameter type-id='type-id-37' is-artificial='yes'/>
+            <parameter type-id='type-id-35' is-artificial='yes'/>
             <parameter type-id='type-id-2292'/>
             <parameter type-id='type-id-875'/>
             <return type-id='type-id-5'/>
@@ -31523,7 +31486,7 @@
           <function-decl name='~basic_ostringstream' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/sstream' line='438' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-2210' is-artificial='yes'/>
             <parameter type-id='type-id-6' is-artificial='yes'/>
-            <parameter type-id='type-id-37' is-artificial='yes'/>
+            <parameter type-id='type-id-35' is-artificial='yes'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
@@ -31531,7 +31494,7 @@
           <function-decl name='~basic_ostringstream' mangled-name='_ZNSt19basic_ostringstreamIwSt11char_traitsIwESaIwEED0Ev' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/sstream' line='438' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt19basic_ostringstreamIwSt11char_traitsIwESaIwEED0Ev@@GLIBCXX_3.4'>
             <parameter type-id='type-id-2210' is-artificial='yes'/>
             <parameter type-id='type-id-6' is-artificial='yes'/>
-            <parameter type-id='type-id-37' is-artificial='yes'/>
+            <parameter type-id='type-id-35' is-artificial='yes'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
@@ -31539,7 +31502,7 @@
           <function-decl name='~basic_ostringstream' mangled-name='_ZNSt19basic_ostringstreamIwSt11char_traitsIwESaIwEED1Ev' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/sstream' line='438' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt19basic_ostringstreamIwSt11char_traitsIwESaIwEED1Ev@@GLIBCXX_3.4'>
             <parameter type-id='type-id-2210' is-artificial='yes'/>
             <parameter type-id='type-id-6' is-artificial='yes'/>
-            <parameter type-id='type-id-37' is-artificial='yes'/>
+            <parameter type-id='type-id-35' is-artificial='yes'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
@@ -31547,7 +31510,7 @@
           <function-decl name='~basic_ostringstream' mangled-name='_ZNSt19basic_ostringstreamIwSt11char_traitsIwESaIwEED2Ev' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/sstream' line='438' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt19basic_ostringstreamIwSt11char_traitsIwESaIwEED2Ev@@GLIBCXX_3.4'>
             <parameter type-id='type-id-2210' is-artificial='yes'/>
             <parameter type-id='type-id-6' is-artificial='yes'/>
-            <parameter type-id='type-id-37' is-artificial='yes'/>
+            <parameter type-id='type-id-35' is-artificial='yes'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
@@ -31555,12 +31518,12 @@
     </namespace-decl>
     <namespace-decl name='__gnu_cxx'>
       <function-decl name='__is_null_pointer&lt;char&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ext/type_traits.h' line='150' column='1' visibility='default' binding='global' size-in-bits='64'>
-        <parameter type-id='type-id-93'/>
-        <return type-id='type-id-42'/>
+        <parameter type-id='type-id-92'/>
+        <return type-id='type-id-40'/>
       </function-decl>
       <function-decl name='__is_null_pointer&lt;wchar_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ext/type_traits.h' line='150' column='1' visibility='default' binding='global' size-in-bits='64'>
         <parameter type-id='type-id-333'/>
-        <return type-id='type-id-42'/>
+        <return type-id='type-id-40'/>
       </function-decl>
     </namespace-decl>
   </abi-instr>
@@ -31645,7 +31608,7 @@
           <var-decl name='_M_sbuf' type-id='type-id-2333' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/streambuf_iterator.h' line='238' column='1'/>
         </data-member>
         <data-member access='private' layout-offset-in-bits='64'>
-          <var-decl name='_M_failed' type-id='type-id-42' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/streambuf_iterator.h' line='239' column='1'/>
+          <var-decl name='_M_failed' type-id='type-id-40' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/streambuf_iterator.h' line='239' column='1'/>
         </data-member>
         <member-function access='private'>
           <function-decl name='ostreambuf_iterator' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/streambuf_iterator.h' line='243' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -31690,7 +31653,7 @@
         <member-function access='private' const='yes'>
           <function-decl name='failed' mangled-name='_ZNKSt19ostreambuf_iteratorIcSt11char_traitsIcEE6failedEv' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/streambuf_iterator.h' line='277' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-2323' is-artificial='yes'/>
-            <return type-id='type-id-42'/>
+            <return type-id='type-id-40'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
@@ -31715,7 +31678,7 @@
           <var-decl name='_M_sbuf' type-id='type-id-2339' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/streambuf_iterator.h' line='238' column='1'/>
         </data-member>
         <data-member access='private' layout-offset-in-bits='64'>
-          <var-decl name='_M_failed' type-id='type-id-42' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/streambuf_iterator.h' line='239' column='1'/>
+          <var-decl name='_M_failed' type-id='type-id-40' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/streambuf_iterator.h' line='239' column='1'/>
         </data-member>
         <member-function access='private'>
           <function-decl name='ostreambuf_iterator' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/streambuf_iterator.h' line='243' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -31760,7 +31723,7 @@
         <member-function access='private' const='yes'>
           <function-decl name='failed' mangled-name='_ZNKSt19ostreambuf_iteratorIwSt11char_traitsIwEE6failedEv' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/streambuf_iterator.h' line='277' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-2327' is-artificial='yes'/>
-            <return type-id='type-id-42'/>
+            <return type-id='type-id-40'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
@@ -31920,22 +31883,22 @@
       <function-decl name='operator&lt; &lt;const char*, std::basic_string&lt;char&gt; &gt;' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/stl_iterator.h' line='838' column='1' visibility='default' binding='global' size-in-bits='64'>
         <parameter type-id='type-id-2315'/>
         <parameter type-id='type-id-2315'/>
-        <return type-id='type-id-42'/>
+        <return type-id='type-id-40'/>
       </function-decl>
       <function-decl name='operator&gt;&lt;const char*, std::basic_string&lt;char&gt; &gt;' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/stl_iterator.h' line='850' column='1' visibility='default' binding='global' size-in-bits='64'>
         <parameter type-id='type-id-2315'/>
         <parameter type-id='type-id-2315'/>
-        <return type-id='type-id-42'/>
+        <return type-id='type-id-40'/>
       </function-decl>
       <function-decl name='operator&lt;=&lt;const char*, std::basic_string&lt;char&gt; &gt;' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/stl_iterator.h' line='862' column='1' visibility='default' binding='global' size-in-bits='64'>
         <parameter type-id='type-id-2315'/>
         <parameter type-id='type-id-2315'/>
-        <return type-id='type-id-42'/>
+        <return type-id='type-id-40'/>
       </function-decl>
       <function-decl name='operator&gt;=&lt;const char*, std::basic_string&lt;char&gt; &gt;' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/stl_iterator.h' line='874' column='1' visibility='default' binding='global' size-in-bits='64'>
         <parameter type-id='type-id-2315'/>
         <parameter type-id='type-id-2315'/>
-        <return type-id='type-id-42'/>
+        <return type-id='type-id-40'/>
       </function-decl>
       <function-decl name='__function_requires&lt;__gnu_cxx::_ForwardIteratorConcept&lt;__gnu_cxx::__normal_iterator&lt;char*, std::basic_string&lt;char&gt; &gt; &gt; &gt;' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/boost_concept_check.h' line='58' column='1' visibility='default' binding='global' size-in-bits='64'>
         <return type-id='type-id-5'/>
@@ -31943,22 +31906,22 @@
       <function-decl name='operator&lt; &lt;char*, std::basic_string&lt;char&gt; &gt;' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/stl_iterator.h' line='838' column='1' visibility='default' binding='global' size-in-bits='64'>
         <parameter type-id='type-id-1815'/>
         <parameter type-id='type-id-1815'/>
-        <return type-id='type-id-42'/>
+        <return type-id='type-id-40'/>
       </function-decl>
       <function-decl name='operator&gt;&lt;char*, std::basic_string&lt;char&gt; &gt;' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/stl_iterator.h' line='850' column='1' visibility='default' binding='global' size-in-bits='64'>
         <parameter type-id='type-id-1815'/>
         <parameter type-id='type-id-1815'/>
-        <return type-id='type-id-42'/>
+        <return type-id='type-id-40'/>
       </function-decl>
       <function-decl name='operator&lt;=&lt;char*, std::basic_string&lt;char&gt; &gt;' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/stl_iterator.h' line='862' column='1' visibility='default' binding='global' size-in-bits='64'>
         <parameter type-id='type-id-1815'/>
         <parameter type-id='type-id-1815'/>
-        <return type-id='type-id-42'/>
+        <return type-id='type-id-40'/>
       </function-decl>
       <function-decl name='operator&gt;=&lt;char*, std::basic_string&lt;char&gt; &gt;' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/stl_iterator.h' line='874' column='1' visibility='default' binding='global' size-in-bits='64'>
         <parameter type-id='type-id-1815'/>
         <parameter type-id='type-id-1815'/>
-        <return type-id='type-id-42'/>
+        <return type-id='type-id-40'/>
       </function-decl>
       <function-decl name='__function_requires&lt;__gnu_cxx::_ForwardIteratorConcept&lt;__gnu_cxx::__normal_iterator&lt;const wchar_t*, std::basic_string&lt;wchar_t&gt; &gt; &gt; &gt;' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/boost_concept_check.h' line='58' column='1' visibility='default' binding='global' size-in-bits='64'>
         <return type-id='type-id-5'/>
@@ -31966,22 +31929,22 @@
       <function-decl name='operator&lt; &lt;const wchar_t*, std::basic_string&lt;wchar_t&gt; &gt;' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/stl_iterator.h' line='838' column='1' visibility='default' binding='global' size-in-bits='64'>
         <parameter type-id='type-id-2318'/>
         <parameter type-id='type-id-2318'/>
-        <return type-id='type-id-42'/>
+        <return type-id='type-id-40'/>
       </function-decl>
       <function-decl name='operator&gt;&lt;const wchar_t*, std::basic_string&lt;wchar_t&gt; &gt;' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/stl_iterator.h' line='850' column='1' visibility='default' binding='global' size-in-bits='64'>
         <parameter type-id='type-id-2318'/>
         <parameter type-id='type-id-2318'/>
-        <return type-id='type-id-42'/>
+        <return type-id='type-id-40'/>
       </function-decl>
       <function-decl name='operator&lt;=&lt;const wchar_t*, std::basic_string&lt;wchar_t&gt; &gt;' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/stl_iterator.h' line='862' column='1' visibility='default' binding='global' size-in-bits='64'>
         <parameter type-id='type-id-2318'/>
         <parameter type-id='type-id-2318'/>
-        <return type-id='type-id-42'/>
+        <return type-id='type-id-40'/>
       </function-decl>
       <function-decl name='operator&gt;=&lt;const wchar_t*, std::basic_string&lt;wchar_t&gt; &gt;' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/stl_iterator.h' line='874' column='1' visibility='default' binding='global' size-in-bits='64'>
         <parameter type-id='type-id-2318'/>
         <parameter type-id='type-id-2318'/>
-        <return type-id='type-id-42'/>
+        <return type-id='type-id-40'/>
       </function-decl>
       <function-decl name='__function_requires&lt;__gnu_cxx::_ForwardIteratorConcept&lt;__gnu_cxx::__normal_iterator&lt;wchar_t*, std::basic_string&lt;wchar_t&gt; &gt; &gt; &gt;' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/boost_concept_check.h' line='58' column='1' visibility='default' binding='global' size-in-bits='64'>
         <return type-id='type-id-5'/>
@@ -31989,22 +31952,22 @@
       <function-decl name='operator&lt; &lt;wchar_t*, std::basic_string&lt;wchar_t&gt; &gt;' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/stl_iterator.h' line='838' column='1' visibility='default' binding='global' size-in-bits='64'>
         <parameter type-id='type-id-1829'/>
         <parameter type-id='type-id-1829'/>
-        <return type-id='type-id-42'/>
+        <return type-id='type-id-40'/>
       </function-decl>
       <function-decl name='operator&gt;&lt;wchar_t*, std::basic_string&lt;wchar_t&gt; &gt;' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/stl_iterator.h' line='850' column='1' visibility='default' binding='global' size-in-bits='64'>
         <parameter type-id='type-id-1829'/>
         <parameter type-id='type-id-1829'/>
-        <return type-id='type-id-42'/>
+        <return type-id='type-id-40'/>
       </function-decl>
       <function-decl name='operator&lt;=&lt;wchar_t*, std::basic_string&lt;wchar_t&gt; &gt;' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/stl_iterator.h' line='862' column='1' visibility='default' binding='global' size-in-bits='64'>
         <parameter type-id='type-id-1829'/>
         <parameter type-id='type-id-1829'/>
-        <return type-id='type-id-42'/>
+        <return type-id='type-id-40'/>
       </function-decl>
       <function-decl name='operator&gt;=&lt;wchar_t*, std::basic_string&lt;wchar_t&gt; &gt;' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/stl_iterator.h' line='874' column='1' visibility='default' binding='global' size-in-bits='64'>
         <parameter type-id='type-id-1829'/>
         <parameter type-id='type-id-1829'/>
-        <return type-id='type-id-42'/>
+        <return type-id='type-id-40'/>
       </function-decl>
       <function-decl name='__function_requires&lt;__gnu_cxx::_ForwardIteratorConcept&lt;wchar_t*&gt; &gt;' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/boost_concept_check.h' line='58' column='1' visibility='default' binding='global' size-in-bits='64'>
         <return type-id='type-id-5'/>
@@ -32102,22 +32065,22 @@
       <function-decl name='operator==&lt;const char*, std::basic_string&lt;char&gt; &gt;' mangled-name='_ZN9__gnu_cxxeqIPKcSsEEbRKNS_17__normal_iteratorIT_T0_EES8_' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/stl_iterator.h' line='813' column='1' visibility='default' binding='global' size-in-bits='64'>
         <parameter type-id='type-id-2315'/>
         <parameter type-id='type-id-2315'/>
-        <return type-id='type-id-42'/>
+        <return type-id='type-id-40'/>
       </function-decl>
       <function-decl name='operator==&lt;char*, std::basic_string&lt;char&gt; &gt;' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/stl_iterator.h' line='813' column='1' visibility='default' binding='global' size-in-bits='64'>
         <parameter type-id='type-id-1815'/>
         <parameter type-id='type-id-1815'/>
-        <return type-id='type-id-42'/>
+        <return type-id='type-id-40'/>
       </function-decl>
       <function-decl name='operator==&lt;const wchar_t*, std::basic_string&lt;wchar_t&gt; &gt;' mangled-name='_ZN9__gnu_cxxeqIPKwSbIwSt11char_traitsIwESaIwEEEEbRKNS_17__normal_iteratorIT_T0_EESC_' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/stl_iterator.h' line='813' column='1' visibility='default' binding='global' size-in-bits='64'>
         <parameter type-id='type-id-2318'/>
         <parameter type-id='type-id-2318'/>
-        <return type-id='type-id-42'/>
+        <return type-id='type-id-40'/>
       </function-decl>
       <function-decl name='operator==&lt;wchar_t*, std::basic_string&lt;wchar_t&gt; &gt;' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/stl_iterator.h' line='813' column='1' visibility='default' binding='global' size-in-bits='64'>
         <parameter type-id='type-id-1829'/>
         <parameter type-id='type-id-1829'/>
-        <return type-id='type-id-42'/>
+        <return type-id='type-id-40'/>
       </function-decl>
       <function-decl name='__aux_require_boolean_expr&lt;bool&gt;' mangled-name='_ZN9__gnu_cxx26__aux_require_boolean_exprIbEEvRKT_' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/boost_concept_check.h' line='236' column='1' visibility='default' binding='global' size-in-bits='64'>
         <parameter type-id='type-id-2345'/>
@@ -32212,7 +32175,7 @@
       </class-decl>
       <class-decl name='_AssignableConcept&lt;char*&gt;' size-in-bits='64' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/boost_concept_check.h' line='172' column='1' id='type-id-2302'>
         <data-member access='public' layout-offset-in-bits='0'>
-          <var-decl name='__a' type-id='type-id-93' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/boost_concept_check.h' line='181' column='1'/>
+          <var-decl name='__a' type-id='type-id-92' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/boost_concept_check.h' line='181' column='1'/>
         </data-member>
         <member-function access='public'>
           <function-decl name='__constraints' mangled-name='_ZN9__gnu_cxx18_AssignableConceptIPcE13__constraintsEv' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/boost_concept_check.h' line='174' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -32363,10 +32326,10 @@
     <array-type-def dimensions='1' type-id='type-id-186' size-in-bits='2048' id='type-id-2347'>
       <subrange length='256' type-id='type-id-174' id='type-id-2348'/>
     </array-type-def>
-    <array-type-def dimensions='1' type-id='type-id-41' size-in-bits='8192' id='type-id-2222'>
+    <array-type-def dimensions='1' type-id='type-id-39' size-in-bits='8192' id='type-id-2222'>
       <subrange length='256' type-id='type-id-174' id='type-id-2348'/>
     </array-type-def>
-    <array-type-def dimensions='1' type-id='type-id-51' size-in-bits='1024' id='type-id-2224'>
+    <array-type-def dimensions='1' type-id='type-id-49' size-in-bits='1024' id='type-id-2224'>
       <subrange length='16' type-id='type-id-174' id='type-id-1324'/>
     </array-type-def>
     <array-type-def dimensions='1' type-id='type-id-634' size-in-bits='256' id='type-id-2223'>
@@ -32398,7 +32361,7 @@
           <var-decl name='_M_c_locale_ctype' type-id='type-id-2055' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='685' column='1'/>
         </data-member>
         <data-member access='protected' layout-offset-in-bits='192'>
-          <var-decl name='_M_del' type-id='type-id-42' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='686' column='1'/>
+          <var-decl name='_M_del' type-id='type-id-40' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='686' column='1'/>
         </data-member>
         <data-member access='protected' layout-offset-in-bits='256'>
           <var-decl name='_M_toupper' type-id='type-id-2360' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='687' column='1'/>
@@ -32431,8 +32394,8 @@
           <function-decl name='ctype' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='713' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-2092' is-artificial='yes'/>
             <parameter type-id='type-id-2356'/>
-            <parameter type-id='type-id-42'/>
-            <parameter type-id='type-id-94'/>
+            <parameter type-id='type-id-40'/>
+            <parameter type-id='type-id-93'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
@@ -32441,8 +32404,8 @@
             <parameter type-id='type-id-2092' is-artificial='yes'/>
             <parameter type-id='type-id-2055'/>
             <parameter type-id='type-id-2356'/>
-            <parameter type-id='type-id-42'/>
-            <parameter type-id='type-id-94'/>
+            <parameter type-id='type-id-40'/>
+            <parameter type-id='type-id-93'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
@@ -32451,7 +32414,7 @@
             <parameter type-id='type-id-2350' is-artificial='yes'/>
             <parameter type-id='type-id-2225'/>
             <parameter type-id='type-id-186'/>
-            <return type-id='type-id-42'/>
+            <return type-id='type-id-40'/>
           </function-decl>
         </member-function>
         <member-function access='private' const='yes'>
@@ -32541,7 +32504,7 @@
             <parameter type-id='type-id-2353'/>
             <parameter type-id='type-id-2353'/>
             <parameter type-id='type-id-186'/>
-            <parameter type-id='type-id-93'/>
+            <parameter type-id='type-id-92'/>
             <return type-id='type-id-2353'/>
           </function-decl>
         </member-function>
@@ -32573,8 +32536,8 @@
             <parameter type-id='type-id-2092' is-artificial='yes'/>
             <parameter type-id='type-id-2055'/>
             <parameter type-id='type-id-2356'/>
-            <parameter type-id='type-id-42'/>
-            <parameter type-id='type-id-94'/>
+            <parameter type-id='type-id-40'/>
+            <parameter type-id='type-id-93'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
@@ -32582,8 +32545,8 @@
           <function-decl name='ctype' mangled-name='_ZNSt5ctypeIcEC2EPKtbm' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='713' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt5ctypeIcEC1EPKtbm@@GLIBCXX_3.4'>
             <parameter type-id='type-id-2092' is-artificial='yes'/>
             <parameter type-id='type-id-2356'/>
-            <parameter type-id='type-id-42'/>
-            <parameter type-id='type-id-94'/>
+            <parameter type-id='type-id-40'/>
+            <parameter type-id='type-id-93'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
@@ -32633,7 +32596,7 @@
         <member-function access='protected' const='yes' vtable-offset='3'>
           <function-decl name='do_toupper' mangled-name='_ZNKSt5ctypeIcE10do_toupperEPcPKc' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/src/c++98/ctype_configure_char.cc' line='170' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSt5ctypeIcE10do_toupperEPcPKc@@GLIBCXX_3.4'>
             <parameter type-id='type-id-2350' is-artificial='yes'/>
-            <parameter type-id='type-id-93'/>
+            <parameter type-id='type-id-92'/>
             <parameter type-id='type-id-4'/>
             <return type-id='type-id-4'/>
           </function-decl>
@@ -32663,7 +32626,7 @@
         <member-function access='protected' const='yes' vtable-offset='5'>
           <function-decl name='do_tolower' mangled-name='_ZNKSt5ctypeIcE10do_tolowerEPcPKc' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/src/c++98/ctype_configure_char.cc' line='185' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSt5ctypeIcE10do_tolowerEPcPKc@@GLIBCXX_3.4'>
             <parameter type-id='type-id-2350' is-artificial='yes'/>
-            <parameter type-id='type-id-93'/>
+            <parameter type-id='type-id-92'/>
             <parameter type-id='type-id-4'/>
             <return type-id='type-id-4'/>
           </function-decl>
@@ -32698,7 +32661,7 @@
             <parameter type-id='type-id-2353'/>
             <parameter type-id='type-id-2353'/>
             <parameter type-id='type-id-186'/>
-            <parameter type-id='type-id-93'/>
+            <parameter type-id='type-id-92'/>
             <return type-id='type-id-2353'/>
           </function-decl>
         </member-function>
@@ -32750,7 +32713,7 @@
           <function-decl name='ctype_byname' filepath='../../../.././libstdc++-v3/src/c++98/ctype.cc' line='117' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-2359' is-artificial='yes'/>
             <parameter type-id='type-id-4'/>
-            <parameter type-id='type-id-94'/>
+            <parameter type-id='type-id-93'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
@@ -32758,7 +32721,7 @@
           <function-decl name='ctype_byname' mangled-name='_ZNSt12ctype_bynameIwEC2EPKcm' filepath='../../../.././libstdc++-v3/src/c++98/ctype.cc' line='117' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt12ctype_bynameIwEC2EPKcm@@GLIBCXX_3.4'>
             <parameter type-id='type-id-2359' is-artificial='yes'/>
             <parameter type-id='type-id-4'/>
-            <parameter type-id='type-id-94'/>
+            <parameter type-id='type-id-93'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
@@ -32875,7 +32838,7 @@
     <namespace-decl name='__gnu_cxx'>
       <namespace-decl name='__detail'>
         <enum-decl name='_Tag' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ext/rope' line='72' column='1' id='type-id-2477'>
-          <underlying-type type-id='type-id-39'/>
+          <underlying-type type-id='type-id-37'/>
           <enumerator name='_S_leaf' value='0'/>
           <enumerator name='_S_concat' value='1'/>
           <enumerator name='_S_substringfn' value='2'/>
@@ -32885,7 +32848,7 @@
       <class-decl name='stdio_filebuf&lt;wchar_t, std::char_traits&lt;wchar_t&gt; &gt;' size-in-bits='1920' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ext/stdio_filebuf.h' line='51' column='1' id='type-id-2427'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-696'/>
         <member-type access='private'>
-          <typedef-decl name='size_t' type-id='type-id-94' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ext/stdio_filebuf.h' line='60' column='1' id='type-id-2478'/>
+          <typedef-decl name='size_t' type-id='type-id-93' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ext/stdio_filebuf.h' line='60' column='1' id='type-id-2478'/>
         </member-type>
         <member-function access='private'>
           <function-decl name='stdio_filebuf' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ext/stdio_filebuf.h' line='66' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -32972,7 +32935,7 @@
       <class-decl name='stdio_filebuf&lt;char, std::char_traits&lt;char&gt; &gt;' size-in-bits='1920' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ext/stdio_filebuf.h' line='51' column='1' id='type-id-2425'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-693'/>
         <member-type access='private'>
-          <typedef-decl name='size_t' type-id='type-id-94' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ext/stdio_filebuf.h' line='60' column='1' id='type-id-2480'/>
+          <typedef-decl name='size_t' type-id='type-id-93' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ext/stdio_filebuf.h' line='60' column='1' id='type-id-2480'/>
         </member-type>
         <member-function access='private'>
           <function-decl name='stdio_filebuf' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ext/stdio_filebuf.h' line='66' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -33058,7 +33021,7 @@
       </class-decl>
       <class-decl name='rope&lt;char, std::allocator&lt;char&gt; &gt;' size-in-bits='64' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ext/rope' line='1522' column='1' id='type-id-2481'>
         <member-type access='private'>
-          <typedef-decl name='size_type' type-id='type-id-94' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ext/rope' line='1527' column='1' id='type-id-2482'/>
+          <typedef-decl name='size_type' type-id='type-id-93' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ext/rope' line='1527' column='1' id='type-id-2482'/>
         </member-type>
         <member-type access='protected'>
           <typedef-decl name='_RopeRep' type-id='type-id-2383' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ext/rope' line='1561' column='1' id='type-id-2421'/>
@@ -33093,32 +33056,32 @@
           <var-decl name='_M_tag' type-id='type-id-2477' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ext/rope' line='590' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='456'>
-          <var-decl name='_M_is_balanced' type-id='type-id-42' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ext/rope' line='591' column='1'/>
+          <var-decl name='_M_is_balanced' type-id='type-id-40' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ext/rope' line='591' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='464'>
-          <var-decl name='_M_depth' type-id='type-id-82' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ext/rope' line='592' column='1'/>
+          <var-decl name='_M_depth' type-id='type-id-80' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ext/rope' line='592' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='512'>
-          <var-decl name='_M_c_string' type-id='type-id-93' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ext/rope' line='593' column='1'/>
+          <var-decl name='_M_c_string' type-id='type-id-92' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ext/rope' line='593' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='576'>
-          <var-decl name='_M_c_string_lock' type-id='type-id-70' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ext/rope' line='595' column='1'/>
+          <var-decl name='_M_c_string_lock' type-id='type-id-68' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ext/rope' line='595' column='1'/>
         </data-member>
         <member-function access='public'>
           <function-decl name='_Rope_RopeRep' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ext/rope' line='611' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-2385' is-artificial='yes'/>
             <parameter type-id='type-id-2477'/>
             <parameter type-id='type-id-6'/>
-            <parameter type-id='type-id-42'/>
-            <parameter type-id='type-id-94'/>
+            <parameter type-id='type-id-40'/>
+            <parameter type-id='type-id-93'/>
             <parameter type-id='type-id-2462'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='public' static='yes'>
           <function-decl name='_S_free_string' mangled-name='_ZN9__gnu_cxx13_Rope_RopeRepIcSaIcEE14_S_free_stringEPcmRS1_' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ext/ropeimpl.h' line='354' column='1' visibility='default' binding='global' size-in-bits='64'>
+            <parameter type-id='type-id-92'/>
             <parameter type-id='type-id-93'/>
-            <parameter type-id='type-id-94'/>
             <parameter type-id='type-id-2387'/>
             <return type-id='type-id-5'/>
           </function-decl>
@@ -33198,7 +33161,7 @@
           <typedef-decl name='__S' type-id='type-id-2486' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ext/rope' line='578' column='1' id='type-id-2401'/>
         </member-type>
         <data-member access='public' layout-offset-in-bits='0'>
-          <var-decl name='_M_size' type-id='type-id-94' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ext/rope' line='569' column='1'/>
+          <var-decl name='_M_size' type-id='type-id-93' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ext/rope' line='569' column='1'/>
         </data-member>
         <member-function access='public' const='yes'>
           <function-decl name='get_allocator' mangled-name='_ZNK9__gnu_cxx14_Rope_rep_baseIcSaIcEE13get_allocatorEv' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ext/rope' line='555' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -33221,73 +33184,73 @@
         <member-function access='public'>
           <function-decl name='_Rope_rep_base' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ext/rope' line='566' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-2394' is-artificial='yes'/>
-            <parameter type-id='type-id-94'/>
+            <parameter type-id='type-id-93'/>
             <parameter type-id='type-id-2470'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='public' static='yes'>
           <function-decl name='_Data_allocate' mangled-name='_ZN9__gnu_cxx14_Rope_rep_baseIcSaIcEE14_Data_allocateEm' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ext/rope' line='578' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-94'/>
-            <return type-id='type-id-93'/>
+            <parameter type-id='type-id-93'/>
+            <return type-id='type-id-92'/>
           </function-decl>
         </member-function>
         <member-function access='public' static='yes'>
           <function-decl name='_Data_deallocate' mangled-name='_ZN9__gnu_cxx14_Rope_rep_baseIcSaIcEE16_Data_deallocateEPcm' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ext/rope' line='578' column='1' visibility='default' binding='global' size-in-bits='64'>
+            <parameter type-id='type-id-92'/>
             <parameter type-id='type-id-93'/>
-            <parameter type-id='type-id-94'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='public' static='yes'>
           <function-decl name='_C_allocate' mangled-name='_ZN9__gnu_cxx14_Rope_rep_baseIcSaIcEE11_C_allocateEm' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ext/rope' line='578' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-94'/>
+            <parameter type-id='type-id-93'/>
             <return type-id='type-id-2396'/>
           </function-decl>
         </member-function>
         <member-function access='public' static='yes'>
           <function-decl name='_C_deallocate' mangled-name='_ZN9__gnu_cxx14_Rope_rep_baseIcSaIcEE13_C_deallocateEPNS_23_Rope_RopeConcatenationIcS1_EEm' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ext/rope' line='578' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-2396'/>
-            <parameter type-id='type-id-94'/>
+            <parameter type-id='type-id-93'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='public' static='yes'>
           <function-decl name='_L_allocate' mangled-name='_ZN9__gnu_cxx14_Rope_rep_baseIcSaIcEE11_L_allocateEm' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ext/rope' line='578' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-94'/>
+            <parameter type-id='type-id-93'/>
             <return type-id='type-id-2400'/>
           </function-decl>
         </member-function>
         <member-function access='public' static='yes'>
           <function-decl name='_L_deallocate' mangled-name='_ZN9__gnu_cxx14_Rope_rep_baseIcSaIcEE13_L_deallocateEPNS_14_Rope_RopeLeafIcS1_EEm' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ext/rope' line='578' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-2400'/>
-            <parameter type-id='type-id-94'/>
+            <parameter type-id='type-id-93'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='public' static='yes'>
           <function-decl name='_F_allocate' mangled-name='_ZN9__gnu_cxx14_Rope_rep_baseIcSaIcEE11_F_allocateEm' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ext/rope' line='578' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-94'/>
+            <parameter type-id='type-id-93'/>
             <return type-id='type-id-2398'/>
           </function-decl>
         </member-function>
         <member-function access='public' static='yes'>
           <function-decl name='_F_deallocate' mangled-name='_ZN9__gnu_cxx14_Rope_rep_baseIcSaIcEE13_F_deallocateEPNS_18_Rope_RopeFunctionIcS1_EEm' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ext/rope' line='578' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-2398'/>
-            <parameter type-id='type-id-94'/>
+            <parameter type-id='type-id-93'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='public' static='yes'>
           <function-decl name='_S_allocate' mangled-name='_ZN9__gnu_cxx14_Rope_rep_baseIcSaIcEE11_S_allocateEm' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ext/rope' line='578' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-94'/>
+            <parameter type-id='type-id-93'/>
             <return type-id='type-id-2402'/>
           </function-decl>
         </member-function>
         <member-function access='public' static='yes'>
           <function-decl name='_S_deallocate' mangled-name='_ZN9__gnu_cxx14_Rope_rep_baseIcSaIcEE13_S_deallocateEPNS_19_Rope_RopeSubstringIcS1_EEm' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ext/rope' line='578' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-2402'/>
-            <parameter type-id='type-id-94'/>
+            <parameter type-id='type-id-93'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
@@ -33340,19 +33303,19 @@
           <typedef-decl name='allocator_type' type-id='type-id-2403' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ext/rope' line='722' column='1' id='type-id-2451'/>
         </member-type>
         <data-member access='public' layout-offset-in-bits='896'>
-          <var-decl name='_M_data' type-id='type-id-93' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ext/rope' line='716' column='1'/>
+          <var-decl name='_M_data' type-id='type-id-92' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ext/rope' line='716' column='1'/>
         </data-member>
         <member-function access='public' static='yes'>
           <function-decl name='_S_rounded_up_size' mangled-name='_ZN9__gnu_cxx14_Rope_RopeLeafIcSaIcEE18_S_rounded_up_sizeEm' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ext/rope' line='700' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-94'/>
-            <return type-id='type-id-94'/>
+            <parameter type-id='type-id-93'/>
+            <return type-id='type-id-93'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Rope_RopeLeaf' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ext/rope' line='724' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-2379' is-artificial='yes'/>
+            <parameter type-id='type-id-92'/>
             <parameter type-id='type-id-93'/>
-            <parameter type-id='type-id-94'/>
             <parameter type-id='type-id-2453'/>
             <return type-id='type-id-5'/>
           </function-decl>
@@ -33388,14 +33351,14 @@
           <var-decl name='_M_fn' type-id='type-id-2418' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ext/rope' line='795' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='960'>
-          <var-decl name='_M_delete_when_done' type-id='type-id-42' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ext/rope' line='797' column='1'/>
+          <var-decl name='_M_delete_when_done' type-id='type-id-40' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ext/rope' line='797' column='1'/>
         </data-member>
         <member-function access='public'>
           <function-decl name='_Rope_RopeFunction' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ext/rope' line='814' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-2373' is-artificial='yes'/>
             <parameter type-id='type-id-2418'/>
-            <parameter type-id='type-id-94'/>
-            <parameter type-id='type-id-42'/>
+            <parameter type-id='type-id-93'/>
+            <parameter type-id='type-id-40'/>
             <parameter type-id='type-id-2443'/>
             <return type-id='type-id-5'/>
           </function-decl>
@@ -33426,13 +33389,13 @@
       <class-decl name='_Rope_RopeSubstring&lt;char, std::allocator&lt;char&gt; &gt;' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-2486'/>
       <class-decl name='_Refcount_Base' size-in-bits='384' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ext/rope' line='454' column='1' id='type-id-2363'>
         <member-type access='public'>
-          <typedef-decl name='_RC_t' type-id='type-id-94' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ext/rope' line='457' column='1' id='type-id-2475'/>
+          <typedef-decl name='_RC_t' type-id='type-id-93' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ext/rope' line='457' column='1' id='type-id-2475'/>
         </member-type>
         <data-member access='public' layout-offset-in-bits='0'>
           <var-decl name='_M_ref_count' type-id='type-id-2476' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ext/rope' line='460' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='64'>
-          <var-decl name='_M_ref_count_lock' type-id='type-id-70' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ext/rope' line='464' column='1'/>
+          <var-decl name='_M_ref_count_lock' type-id='type-id-68' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ext/rope' line='464' column='1'/>
         </data-member>
         <member-function access='public' constructor='yes'>
           <function-decl name='_Refcount_Base' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ext/rope' line='469' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -33456,7 +33419,7 @@
       </class-decl>
       <class-decl name='rope&lt;wchar_t, std::allocator&lt;wchar_t&gt; &gt;' size-in-bits='64' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ext/rope' line='1522' column='1' id='type-id-2487'>
         <member-type access='private'>
-          <typedef-decl name='size_type' type-id='type-id-94' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ext/rope' line='1527' column='1' id='type-id-2488'/>
+          <typedef-decl name='size_type' type-id='type-id-93' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ext/rope' line='1527' column='1' id='type-id-2488'/>
         </member-type>
         <member-type access='protected'>
           <typedef-decl name='_RopeRep' type-id='type-id-2388' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ext/rope' line='1561' column='1' id='type-id-2423'/>
@@ -33491,24 +33454,24 @@
           <var-decl name='_M_tag' type-id='type-id-2477' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ext/rope' line='590' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='456'>
-          <var-decl name='_M_is_balanced' type-id='type-id-42' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ext/rope' line='591' column='1'/>
+          <var-decl name='_M_is_balanced' type-id='type-id-40' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ext/rope' line='591' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='464'>
-          <var-decl name='_M_depth' type-id='type-id-82' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ext/rope' line='592' column='1'/>
+          <var-decl name='_M_depth' type-id='type-id-80' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ext/rope' line='592' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='512'>
           <var-decl name='_M_c_string' type-id='type-id-333' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ext/rope' line='593' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='576'>
-          <var-decl name='_M_c_string_lock' type-id='type-id-70' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ext/rope' line='595' column='1'/>
+          <var-decl name='_M_c_string_lock' type-id='type-id-68' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ext/rope' line='595' column='1'/>
         </data-member>
         <member-function access='public'>
           <function-decl name='_Rope_RopeRep' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ext/rope' line='611' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-2390' is-artificial='yes'/>
             <parameter type-id='type-id-2477'/>
             <parameter type-id='type-id-6'/>
-            <parameter type-id='type-id-42'/>
-            <parameter type-id='type-id-94'/>
+            <parameter type-id='type-id-40'/>
+            <parameter type-id='type-id-93'/>
             <parameter type-id='type-id-2466'/>
             <return type-id='type-id-5'/>
           </function-decl>
@@ -33516,7 +33479,7 @@
         <member-function access='public' static='yes'>
           <function-decl name='_S_free_string' mangled-name='_ZN9__gnu_cxx13_Rope_RopeRepIwSaIwEE14_S_free_stringEPwmRS1_' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ext/ropeimpl.h' line='354' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-333'/>
-            <parameter type-id='type-id-94'/>
+            <parameter type-id='type-id-93'/>
             <parameter type-id='type-id-2392'/>
             <return type-id='type-id-5'/>
           </function-decl>
@@ -33596,7 +33559,7 @@
           <typedef-decl name='__S' type-id='type-id-2492' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ext/rope' line='578' column='1' id='type-id-2413'/>
         </member-type>
         <data-member access='public' layout-offset-in-bits='0'>
-          <var-decl name='_M_size' type-id='type-id-94' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ext/rope' line='569' column='1'/>
+          <var-decl name='_M_size' type-id='type-id-93' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ext/rope' line='569' column='1'/>
         </data-member>
         <member-function access='public' const='yes'>
           <function-decl name='get_allocator' mangled-name='_ZNK9__gnu_cxx14_Rope_rep_baseIwSaIwEE13get_allocatorEv' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ext/rope' line='555' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -33619,73 +33582,73 @@
         <member-function access='public'>
           <function-decl name='_Rope_rep_base' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ext/rope' line='566' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-2406' is-artificial='yes'/>
-            <parameter type-id='type-id-94'/>
+            <parameter type-id='type-id-93'/>
             <parameter type-id='type-id-2474'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='public' static='yes'>
           <function-decl name='_Data_allocate' mangled-name='_ZN9__gnu_cxx14_Rope_rep_baseIwSaIwEE14_Data_allocateEm' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ext/rope' line='578' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-94'/>
+            <parameter type-id='type-id-93'/>
             <return type-id='type-id-333'/>
           </function-decl>
         </member-function>
         <member-function access='public' static='yes'>
           <function-decl name='_Data_deallocate' mangled-name='_ZN9__gnu_cxx14_Rope_rep_baseIwSaIwEE16_Data_deallocateEPwm' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ext/rope' line='578' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-333'/>
-            <parameter type-id='type-id-94'/>
+            <parameter type-id='type-id-93'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='public' static='yes'>
           <function-decl name='_C_allocate' mangled-name='_ZN9__gnu_cxx14_Rope_rep_baseIwSaIwEE11_C_allocateEm' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ext/rope' line='578' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-94'/>
+            <parameter type-id='type-id-93'/>
             <return type-id='type-id-2408'/>
           </function-decl>
         </member-function>
         <member-function access='public' static='yes'>
           <function-decl name='_C_deallocate' mangled-name='_ZN9__gnu_cxx14_Rope_rep_baseIwSaIwEE13_C_deallocateEPNS_23_Rope_RopeConcatenationIwS1_EEm' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ext/rope' line='578' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-2408'/>
-            <parameter type-id='type-id-94'/>
+            <parameter type-id='type-id-93'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='public' static='yes'>
           <function-decl name='_L_allocate' mangled-name='_ZN9__gnu_cxx14_Rope_rep_baseIwSaIwEE11_L_allocateEm' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ext/rope' line='578' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-94'/>
+            <parameter type-id='type-id-93'/>
             <return type-id='type-id-2412'/>
           </function-decl>
         </member-function>
         <member-function access='public' static='yes'>
           <function-decl name='_L_deallocate' mangled-name='_ZN9__gnu_cxx14_Rope_rep_baseIwSaIwEE13_L_deallocateEPNS_14_Rope_RopeLeafIwS1_EEm' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ext/rope' line='578' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-2412'/>
-            <parameter type-id='type-id-94'/>
+            <parameter type-id='type-id-93'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='public' static='yes'>
           <function-decl name='_F_allocate' mangled-name='_ZN9__gnu_cxx14_Rope_rep_baseIwSaIwEE11_F_allocateEm' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ext/rope' line='578' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-94'/>
+            <parameter type-id='type-id-93'/>
             <return type-id='type-id-2410'/>
           </function-decl>
         </member-function>
         <member-function access='public' static='yes'>
           <function-decl name='_F_deallocate' mangled-name='_ZN9__gnu_cxx14_Rope_rep_baseIwSaIwEE13_F_deallocateEPNS_18_Rope_RopeFunctionIwS1_EEm' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ext/rope' line='578' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-2410'/>
-            <parameter type-id='type-id-94'/>
+            <parameter type-id='type-id-93'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='public' static='yes'>
           <function-decl name='_S_allocate' mangled-name='_ZN9__gnu_cxx14_Rope_rep_baseIwSaIwEE11_S_allocateEm' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ext/rope' line='578' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-94'/>
+            <parameter type-id='type-id-93'/>
             <return type-id='type-id-2414'/>
           </function-decl>
         </member-function>
         <member-function access='public' static='yes'>
           <function-decl name='_S_deallocate' mangled-name='_ZN9__gnu_cxx14_Rope_rep_baseIwSaIwEE13_S_deallocateEPNS_19_Rope_RopeSubstringIwS1_EEm' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ext/rope' line='578' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-2414'/>
-            <parameter type-id='type-id-94'/>
+            <parameter type-id='type-id-93'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
@@ -33742,15 +33705,15 @@
         </data-member>
         <member-function access='public' static='yes'>
           <function-decl name='_S_rounded_up_size' mangled-name='_ZN9__gnu_cxx14_Rope_RopeLeafIwSaIwEE18_S_rounded_up_sizeEm' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ext/rope' line='700' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-94'/>
-            <return type-id='type-id-94'/>
+            <parameter type-id='type-id-93'/>
+            <return type-id='type-id-93'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Rope_RopeLeaf' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ext/rope' line='724' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-2382' is-artificial='yes'/>
             <parameter type-id='type-id-333'/>
-            <parameter type-id='type-id-94'/>
+            <parameter type-id='type-id-93'/>
             <parameter type-id='type-id-2458'/>
             <return type-id='type-id-5'/>
           </function-decl>
@@ -33786,14 +33749,14 @@
           <var-decl name='_M_fn' type-id='type-id-2420' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ext/rope' line='795' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='960'>
-          <var-decl name='_M_delete_when_done' type-id='type-id-42' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ext/rope' line='797' column='1'/>
+          <var-decl name='_M_delete_when_done' type-id='type-id-40' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ext/rope' line='797' column='1'/>
         </data-member>
         <member-function access='public'>
           <function-decl name='_Rope_RopeFunction' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ext/rope' line='814' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-2376' is-artificial='yes'/>
             <parameter type-id='type-id-2420'/>
-            <parameter type-id='type-id-94'/>
-            <parameter type-id='type-id-42'/>
+            <parameter type-id='type-id-93'/>
+            <parameter type-id='type-id-40'/>
             <parameter type-id='type-id-2448'/>
             <return type-id='type-id-5'/>
           </function-decl>
@@ -34007,15 +33970,15 @@
           <member-function access='public' static='yes'>
             <function-decl name='hash&lt;char&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/tr1/functional_hash.h' line='125' column='1' visibility='default' binding='global' size-in-bits='64'>
               <parameter type-id='type-id-4'/>
-              <parameter type-id='type-id-94'/>
-              <return type-id='type-id-94'/>
+              <parameter type-id='type-id-93'/>
+              <return type-id='type-id-93'/>
             </function-decl>
           </member-function>
           <member-function access='public' static='yes'>
             <function-decl name='hash&lt;wchar_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/tr1/functional_hash.h' line='125' column='1' visibility='default' binding='global' size-in-bits='64'>
               <parameter type-id='type-id-354'/>
-              <parameter type-id='type-id-94'/>
-              <return type-id='type-id-94'/>
+              <parameter type-id='type-id-93'/>
+              <return type-id='type-id-93'/>
             </function-decl>
           </member-function>
         </class-decl>
@@ -34025,7 +33988,7 @@
             <function-decl name='operator()' mangled-name='_ZNKSt3tr14hashIeEclEe' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/tr1/functional_hash.h' line='48' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSt3tr14hashIeEclEe@@GLIBCXX_3.4.10'>
               <parameter type-id='type-id-2521' is-artificial='yes'/>
               <parameter type-id='type-id-378'/>
-              <return type-id='type-id-94'/>
+              <return type-id='type-id-93'/>
             </function-decl>
           </member-function>
         </class-decl>
@@ -34035,7 +33998,7 @@
             <function-decl name='operator()' mangled-name='_ZNKSt3tr14hashISsEclESs' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/tr1/functional_hash.h' line='48' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSt3tr14hashISsEclESs@@GLIBCXX_3.4.10'>
               <parameter type-id='type-id-2524' is-artificial='yes'/>
               <parameter type-id='type-id-369'/>
-              <return type-id='type-id-94'/>
+              <return type-id='type-id-93'/>
             </function-decl>
           </member-function>
         </class-decl>
@@ -34045,7 +34008,7 @@
             <function-decl name='operator()' mangled-name='_ZNKSt3tr14hashIRKSsEclES2_' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/tr1/functional_hash.h' line='48' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSt3tr14hashIRKSsEclES2_@@GLIBCXX_3.4.10'>
               <parameter type-id='type-id-2515' is-artificial='yes'/>
               <parameter type-id='type-id-740'/>
-              <return type-id='type-id-94'/>
+              <return type-id='type-id-93'/>
             </function-decl>
           </member-function>
         </class-decl>
@@ -34055,7 +34018,7 @@
             <function-decl name='operator()' mangled-name='_ZNKSt3tr14hashISbIwSt11char_traitsIwESaIwEEEclES4_' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/tr1/functional_hash.h' line='48' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSt3tr14hashISbIwSt11char_traitsIwESaIwEEEclES4_@@GLIBCXX_3.4.10'>
               <parameter type-id='type-id-2527' is-artificial='yes'/>
               <parameter type-id='type-id-370'/>
-              <return type-id='type-id-94'/>
+              <return type-id='type-id-93'/>
             </function-decl>
           </member-function>
         </class-decl>
@@ -34065,7 +34028,7 @@
             <function-decl name='operator()' mangled-name='_ZNKSt3tr14hashIRKSbIwSt11char_traitsIwESaIwEEEclES6_' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/tr1/functional_hash.h' line='48' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSt3tr14hashIRKSbIwSt11char_traitsIwESaIwEEEclES6_@@GLIBCXX_3.4.10'>
               <parameter type-id='type-id-2518' is-artificial='yes'/>
               <parameter type-id='type-id-748'/>
-              <return type-id='type-id-94'/>
+              <return type-id='type-id-93'/>
             </function-decl>
           </member-function>
         </class-decl>
@@ -34121,11 +34084,11 @@
       </function-decl>
       <function-decl name='has_facet&lt;std::ctype&lt;char&gt; &gt;' mangled-name='_ZSt9has_facetISt5ctypeIcEEbRKSt6locale' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_classes.tcc' line='103' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt9has_facetISt5ctypeIcEEbRKSt6locale@@GLIBCXX_3.4'>
         <parameter type-id='type-id-862'/>
-        <return type-id='type-id-42'/>
+        <return type-id='type-id-40'/>
       </function-decl>
       <function-decl name='has_facet&lt;std::num_put&lt;char&gt; &gt;' mangled-name='_ZSt9has_facetISt7num_putIcSt19ostreambuf_iteratorIcSt11char_traitsIcEEEEbRKSt6locale' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_classes.tcc' line='103' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt9has_facetISt7num_putIcSt19ostreambuf_iteratorIcSt11char_traitsIcEEEEbRKSt6locale@@GLIBCXX_3.4'>
         <parameter type-id='type-id-862'/>
-        <return type-id='type-id-42'/>
+        <return type-id='type-id-40'/>
       </function-decl>
       <function-decl name='use_facet&lt;std::num_put&lt;char&gt; &gt;' mangled-name='_ZSt9use_facetISt7num_putIcSt19ostreambuf_iteratorIcSt11char_traitsIcEEEERKT_RKSt6locale' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_classes.tcc' line='130' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt9use_facetISt7num_putIcSt19ostreambuf_iteratorIcSt11char_traitsIcEEEERKT_RKSt6locale@@GLIBCXX_3.4'>
         <parameter type-id='type-id-862'/>
@@ -34133,7 +34096,7 @@
       </function-decl>
       <function-decl name='has_facet&lt;std::num_get&lt;char&gt; &gt;' mangled-name='_ZSt9has_facetISt7num_getIcSt19istreambuf_iteratorIcSt11char_traitsIcEEEEbRKSt6locale' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_classes.tcc' line='103' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt9has_facetISt7num_getIcSt19istreambuf_iteratorIcSt11char_traitsIcEEEEbRKSt6locale@@GLIBCXX_3.4'>
         <parameter type-id='type-id-862'/>
-        <return type-id='type-id-42'/>
+        <return type-id='type-id-40'/>
       </function-decl>
       <function-decl name='use_facet&lt;std::num_get&lt;char&gt; &gt;' mangled-name='_ZSt9use_facetISt7num_getIcSt19istreambuf_iteratorIcSt11char_traitsIcEEEERKT_RKSt6locale' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_classes.tcc' line='130' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt9use_facetISt7num_getIcSt19istreambuf_iteratorIcSt11char_traitsIcEEEERKT_RKSt6locale@@GLIBCXX_3.4'>
         <parameter type-id='type-id-862'/>
@@ -34141,7 +34104,7 @@
       </function-decl>
       <function-decl name='has_facet&lt;std::ctype&lt;wchar_t&gt; &gt;' mangled-name='_ZSt9has_facetISt5ctypeIwEEbRKSt6locale' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_classes.tcc' line='103' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt9has_facetISt5ctypeIwEEbRKSt6locale@@GLIBCXX_3.4'>
         <parameter type-id='type-id-862'/>
-        <return type-id='type-id-42'/>
+        <return type-id='type-id-40'/>
       </function-decl>
       <function-decl name='use_facet&lt;std::ctype&lt;wchar_t&gt; &gt;' mangled-name='_ZSt9use_facetISt5ctypeIwEERKT_RKSt6locale' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_classes.tcc' line='130' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt9use_facetISt5ctypeIwEERKT_RKSt6locale@@GLIBCXX_3.4'>
         <parameter type-id='type-id-862'/>
@@ -34149,7 +34112,7 @@
       </function-decl>
       <function-decl name='has_facet&lt;std::num_put&lt;wchar_t&gt; &gt;' mangled-name='_ZSt9has_facetISt7num_putIwSt19ostreambuf_iteratorIwSt11char_traitsIwEEEEbRKSt6locale' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_classes.tcc' line='103' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt9has_facetISt7num_putIwSt19ostreambuf_iteratorIwSt11char_traitsIwEEEEbRKSt6locale@@GLIBCXX_3.4'>
         <parameter type-id='type-id-862'/>
-        <return type-id='type-id-42'/>
+        <return type-id='type-id-40'/>
       </function-decl>
       <function-decl name='use_facet&lt;std::num_put&lt;wchar_t&gt; &gt;' mangled-name='_ZSt9use_facetISt7num_putIwSt19ostreambuf_iteratorIwSt11char_traitsIwEEEERKT_RKSt6locale' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_classes.tcc' line='130' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt9use_facetISt7num_putIwSt19ostreambuf_iteratorIwSt11char_traitsIwEEEERKT_RKSt6locale@@GLIBCXX_3.4'>
         <parameter type-id='type-id-862'/>
@@ -34157,7 +34120,7 @@
       </function-decl>
       <function-decl name='has_facet&lt;std::num_get&lt;wchar_t&gt; &gt;' mangled-name='_ZSt9has_facetISt7num_getIwSt19istreambuf_iteratorIwSt11char_traitsIwEEEEbRKSt6locale' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_classes.tcc' line='103' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt9has_facetISt7num_getIwSt19istreambuf_iteratorIwSt11char_traitsIwEEEEbRKSt6locale@@GLIBCXX_3.4'>
         <parameter type-id='type-id-862'/>
-        <return type-id='type-id-42'/>
+        <return type-id='type-id-40'/>
       </function-decl>
       <function-decl name='use_facet&lt;std::num_get&lt;wchar_t&gt; &gt;' mangled-name='_ZSt9use_facetISt7num_getIwSt19istreambuf_iteratorIwSt11char_traitsIwEEEERKT_RKSt6locale' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_classes.tcc' line='130' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt9use_facetISt7num_getIwSt19istreambuf_iteratorIwSt11char_traitsIwEEEERKT_RKSt6locale@@GLIBCXX_3.4'>
         <parameter type-id='type-id-862'/>
@@ -34170,13 +34133,13 @@
       <subrange length='8' type-id='type-id-174' id='type-id-1832'/>
     </array-type-def>
     <reference-type-def kind='lvalue' type-id='type-id-2198' size-in-bits='64' id='type-id-910'/>
-    <reference-type-def kind='lvalue' type-id='type-id-22' size-in-bits='64' id='type-id-908'/>
+    <reference-type-def kind='lvalue' type-id='type-id-20' size-in-bits='64' id='type-id-908'/>
     <reference-type-def kind='lvalue' type-id='type-id-849' size-in-bits='64' id='type-id-911'/>
     <pointer-type-def type-id='type-id-896' size-in-bits='64' id='type-id-897'/>
     <reference-type-def kind='lvalue' type-id='type-id-890' size-in-bits='64' id='type-id-907'/>
     <pointer-type-def type-id='type-id-890' size-in-bits='64' id='type-id-891'/>
     <pointer-type-def type-id='type-id-2550' size-in-bits='64' id='type-id-885'/>
-    <reference-type-def kind='lvalue' type-id='type-id-36' size-in-bits='64' id='type-id-909'/>
+    <reference-type-def kind='lvalue' type-id='type-id-34' size-in-bits='64' id='type-id-909'/>
     <namespace-decl name='std'>
       <function-decl name='__throw_ios_failure' mangled-name='_ZSt19__throw_ios_failurePKc' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/functexcept.h' line='92' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt19__throw_ios_failurePKc@@GLIBCXX_3.4'>
         <parameter type-id='type-id-4'/>
@@ -34378,7 +34341,7 @@
         <member-function access='protected' vtable-offset='8'>
           <function-decl name='xsgetn' mangled-name='_ZN9__gnu_cxx18stdio_sync_filebufIcSt11char_traitsIcEE6xsgetnEPcl' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ext/stdio_sync_filebuf.h' line='210' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN9__gnu_cxx18stdio_sync_filebufIcSt11char_traitsIcEE6xsgetnEPcl@@GLIBCXX_3.4.10'>
             <parameter type-id='type-id-2554' is-artificial='yes'/>
-            <parameter type-id='type-id-93'/>
+            <parameter type-id='type-id-92'/>
             <parameter type-id='type-id-872'/>
             <return type-id='type-id-872'/>
           </function-decl>
@@ -34450,7 +34413,7 @@
           <function-decl name='basic_iostream' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/istream' line='814' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-2560' is-artificial='yes'/>
             <parameter type-id='type-id-6' is-artificial='yes'/>
-            <parameter type-id='type-id-37' is-artificial='yes'/>
+            <parameter type-id='type-id-35' is-artificial='yes'/>
             <parameter type-id='type-id-816'/>
             <return type-id='type-id-5'/>
           </function-decl>
@@ -34459,7 +34422,7 @@
           <function-decl name='basic_iostream' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/istream' line='824' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-2560' is-artificial='yes'/>
             <parameter type-id='type-id-6' is-artificial='yes'/>
-            <parameter type-id='type-id-37' is-artificial='yes'/>
+            <parameter type-id='type-id-35' is-artificial='yes'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
@@ -34467,7 +34430,7 @@
           <function-decl name='basic_iostream' mangled-name='_ZNSt14basic_iostreamIwSt11char_traitsIwEEC2EPSt15basic_streambufIwS1_E' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/istream' line='814' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt14basic_iostreamIwSt11char_traitsIwEEC2EPSt15basic_streambufIwS1_E@@GLIBCXX_3.4'>
             <parameter type-id='type-id-2560' is-artificial='yes'/>
             <parameter type-id='type-id-6' is-artificial='yes'/>
-            <parameter type-id='type-id-37' is-artificial='yes'/>
+            <parameter type-id='type-id-35' is-artificial='yes'/>
             <parameter type-id='type-id-816'/>
             <return type-id='type-id-5'/>
           </function-decl>
@@ -34476,7 +34439,7 @@
           <function-decl name='basic_iostream' mangled-name='_ZNSt14basic_iostreamIwSt11char_traitsIwEEC1EPSt15basic_streambufIwS1_E' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/istream' line='814' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt14basic_iostreamIwSt11char_traitsIwEEC1EPSt15basic_streambufIwS1_E@@GLIBCXX_3.4'>
             <parameter type-id='type-id-2560' is-artificial='yes'/>
             <parameter type-id='type-id-6' is-artificial='yes'/>
-            <parameter type-id='type-id-37' is-artificial='yes'/>
+            <parameter type-id='type-id-35' is-artificial='yes'/>
             <parameter type-id='type-id-816'/>
             <return type-id='type-id-5'/>
           </function-decl>
@@ -34485,7 +34448,7 @@
           <function-decl name='basic_iostream' mangled-name='_ZNSt14basic_iostreamIwSt11char_traitsIwEEC2Ev' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/istream' line='824' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt14basic_iostreamIwSt11char_traitsIwEEC2Ev@@GLIBCXX_3.4'>
             <parameter type-id='type-id-2560' is-artificial='yes'/>
             <parameter type-id='type-id-6' is-artificial='yes'/>
-            <parameter type-id='type-id-37' is-artificial='yes'/>
+            <parameter type-id='type-id-35' is-artificial='yes'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
@@ -34493,7 +34456,7 @@
           <function-decl name='basic_iostream' mangled-name='_ZNSt14basic_iostreamIwSt11char_traitsIwEEC1Ev' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/istream' line='824' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt14basic_iostreamIwSt11char_traitsIwEEC1Ev@@GLIBCXX_3.4'>
             <parameter type-id='type-id-2560' is-artificial='yes'/>
             <parameter type-id='type-id-6' is-artificial='yes'/>
-            <parameter type-id='type-id-37' is-artificial='yes'/>
+            <parameter type-id='type-id-35' is-artificial='yes'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
@@ -34501,7 +34464,7 @@
           <function-decl name='~basic_iostream' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/istream' line='821' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-2560' is-artificial='yes'/>
             <parameter type-id='type-id-6' is-artificial='yes'/>
-            <parameter type-id='type-id-37' is-artificial='yes'/>
+            <parameter type-id='type-id-35' is-artificial='yes'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
@@ -34509,7 +34472,7 @@
           <function-decl name='~basic_iostream' mangled-name='_ZNSt14basic_iostreamIwSt11char_traitsIwEED0Ev' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/istream' line='821' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt14basic_iostreamIwSt11char_traitsIwEED0Ev@@GLIBCXX_3.4'>
             <parameter type-id='type-id-2560' is-artificial='yes'/>
             <parameter type-id='type-id-6' is-artificial='yes'/>
-            <parameter type-id='type-id-37' is-artificial='yes'/>
+            <parameter type-id='type-id-35' is-artificial='yes'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
@@ -34517,7 +34480,7 @@
           <function-decl name='~basic_iostream' mangled-name='_ZNSt14basic_iostreamIwSt11char_traitsIwEED1Ev' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/istream' line='821' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt14basic_iostreamIwSt11char_traitsIwEED1Ev@@GLIBCXX_3.4'>
             <parameter type-id='type-id-2560' is-artificial='yes'/>
             <parameter type-id='type-id-6' is-artificial='yes'/>
-            <parameter type-id='type-id-37' is-artificial='yes'/>
+            <parameter type-id='type-id-35' is-artificial='yes'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
@@ -34525,7 +34488,7 @@
           <function-decl name='~basic_iostream' mangled-name='_ZNSt14basic_iostreamIwSt11char_traitsIwEED2Ev' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/istream' line='821' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt14basic_iostreamIwSt11char_traitsIwEED2Ev@@GLIBCXX_3.4'>
             <parameter type-id='type-id-2560' is-artificial='yes'/>
             <parameter type-id='type-id-6' is-artificial='yes'/>
-            <parameter type-id='type-id-37' is-artificial='yes'/>
+            <parameter type-id='type-id-35' is-artificial='yes'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
@@ -34581,8 +34544,8 @@
     <pointer-type-def type-id='type-id-2577' size-in-bits='64' id='type-id-2604'/>
     <reference-type-def kind='lvalue' type-id='type-id-2605' size-in-bits='64' id='type-id-2606'/>
     <pointer-type-def type-id='type-id-2607' size-in-bits='64' id='type-id-2608'/>
-    <reference-type-def kind='lvalue' type-id='type-id-82' size-in-bits='64' id='type-id-2609'/>
-    <reference-type-def kind='lvalue' type-id='type-id-41' size-in-bits='64' id='type-id-1047'/>
+    <reference-type-def kind='lvalue' type-id='type-id-80' size-in-bits='64' id='type-id-2609'/>
+    <reference-type-def kind='lvalue' type-id='type-id-39' size-in-bits='64' id='type-id-1047'/>
     <reference-type-def kind='lvalue' type-id='type-id-634' size-in-bits='64' id='type-id-1045'/>
     <namespace-decl name='std'>
       <function-decl name='operator~' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/ios_base.h' line='89' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -34657,7 +34620,7 @@
           <function-decl name='equal' mangled-name='_ZNKSt19istreambuf_iteratorIcSt11char_traitsIcEE5equalERKS2_' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/streambuf_iterator.h' line='174' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-2576' is-artificial='yes'/>
             <parameter type-id='type-id-2575'/>
-            <return type-id='type-id-42'/>
+            <return type-id='type-id-40'/>
           </function-decl>
         </member-function>
         <member-function access='private' const='yes'>
@@ -34669,7 +34632,7 @@
         <member-function access='private' const='yes'>
           <function-decl name='_M_at_eof' mangled-name='_ZNKSt19istreambuf_iteratorIcSt11char_traitsIcEE9_M_at_eofEv' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/streambuf_iterator.h' line='197' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-2576' is-artificial='yes'/>
-            <return type-id='type-id-42'/>
+            <return type-id='type-id-40'/>
           </function-decl>
         </member-function>
       </class-decl>
@@ -34744,7 +34707,7 @@
           <function-decl name='equal' mangled-name='_ZNKSt19istreambuf_iteratorIwSt11char_traitsIwEE5equalERKS2_' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/streambuf_iterator.h' line='174' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-2580' is-artificial='yes'/>
             <parameter type-id='type-id-2579'/>
-            <return type-id='type-id-42'/>
+            <return type-id='type-id-40'/>
           </function-decl>
         </member-function>
         <member-function access='private' const='yes'>
@@ -34756,7 +34719,7 @@
         <member-function access='private' const='yes'>
           <function-decl name='_M_at_eof' mangled-name='_ZNKSt19istreambuf_iteratorIwSt11char_traitsIwEE9_M_at_eofEv' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/streambuf_iterator.h' line='197' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-2580' is-artificial='yes'/>
-            <return type-id='type-id-42'/>
+            <return type-id='type-id-40'/>
           </function-decl>
         </member-function>
       </class-decl>
@@ -34768,17 +34731,17 @@
       <function-decl name='operator==&lt;__mbstate_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/postypes.h' line='218' column='1' visibility='default' binding='global' size-in-bits='64'>
         <parameter type-id='type-id-1316'/>
         <parameter type-id='type-id-1316'/>
-        <return type-id='type-id-42'/>
+        <return type-id='type-id-40'/>
       </function-decl>
       <function-decl name='operator==&lt;char, std::char_traits&lt;char&gt; &gt;' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/streambuf_iterator.h' line='206' column='1' visibility='default' binding='global' size-in-bits='64'>
         <parameter type-id='type-id-2575'/>
         <parameter type-id='type-id-2575'/>
-        <return type-id='type-id-42'/>
+        <return type-id='type-id-40'/>
       </function-decl>
       <function-decl name='operator==&lt;wchar_t, std::char_traits&lt;wchar_t&gt; &gt;' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/streambuf_iterator.h' line='206' column='1' visibility='default' binding='global' size-in-bits='64'>
         <parameter type-id='type-id-2579'/>
         <parameter type-id='type-id-2579'/>
-        <return type-id='type-id-42'/>
+        <return type-id='type-id-40'/>
       </function-decl>
       <function-decl name='ws&lt;char, std::char_traits&lt;char&gt; &gt;' mangled-name='_ZSt2wsIcSt11char_traitsIcEERSt13basic_istreamIT_T0_ES6_' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/istream.tcc' line='1018' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt2wsIcSt11char_traitsIcEERSt13basic_istreamIT_T0_ES6_@@GLIBCXX_3.4'>
         <parameter type-id='type-id-802'/>
@@ -34936,7 +34899,7 @@
     <namespace-decl name='std'>
       <function-decl name='operator&gt;&gt;&lt;char, std::char_traits&lt;char&gt; &gt;' mangled-name='_ZStrsIcSt11char_traitsIcEERSt13basic_istreamIT_T0_ES6_PS3_' filepath='../../../.././libstdc++-v3/src/c++98/istream.cc' line='198' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZStrsIcSt11char_traitsIcEERSt13basic_istreamIT_T0_ES6_PS3_@@GLIBCXX_3.4'>
         <parameter type-id='type-id-802'/>
-        <parameter type-id='type-id-93'/>
+        <parameter type-id='type-id-92'/>
         <return type-id='type-id-802'/>
       </function-decl>
       <function-decl name='operator&gt;&gt;&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;' mangled-name='_ZStrsIcSt11char_traitsIcESaIcEERSt13basic_istreamIT_T0_ES7_RSbIS4_S5_T1_E' filepath='../../../.././libstdc++-v3/src/c++98/istream.cc' line='279' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZStrsIcSt11char_traitsIcESaIcEERSt13basic_istreamIT_T0_ES7_RSbIS4_S5_T1_E@@GLIBCXX_3.4'>
@@ -35131,7 +35094,7 @@
       </function-decl>
       <function-decl name='__convert_from_v' mangled-name='_ZSt16__convert_from_vRKP15__locale_structPciPKcz' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/x86_64-unknown-linux-gnu/bits/c++locale.h' line='70' column='1' visibility='default' binding='global' size-in-bits='64'>
         <parameter type-id='type-id-2745'/>
-        <parameter type-id='type-id-93'/>
+        <parameter type-id='type-id-92'/>
         <parameter type-id='type-id-6'/>
         <parameter type-id='type-id-4'/>
         <parameter is-variadic='yes'/>
@@ -35140,7 +35103,7 @@
       <function-decl name='operator!=&lt;char, std::char_traits&lt;char&gt; &gt;' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/streambuf_iterator.h' line='212' column='1' visibility='default' binding='global' size-in-bits='64'>
         <parameter type-id='type-id-2575'/>
         <parameter type-id='type-id-2575'/>
-        <return type-id='type-id-42'/>
+        <return type-id='type-id-40'/>
       </function-decl>
       <function-decl name='use_facet&lt;std::codecvt&lt;char, char, __mbstate_t&gt; &gt;' mangled-name='_ZSt9use_facetISt7codecvtIcc11__mbstate_tEERKT_RKSt6locale' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_classes.tcc' line='130' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt9use_facetISt7codecvtIcc11__mbstate_tEERKT_RKSt6locale@@GLIBCXX_3.4'>
         <parameter type-id='type-id-862'/>
@@ -35188,67 +35151,67 @@
       </function-decl>
       <function-decl name='has_facet&lt;std::codecvt&lt;char, char, __mbstate_t&gt; &gt;' mangled-name='_ZSt9has_facetISt7codecvtIcc11__mbstate_tEEbRKSt6locale' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_classes.tcc' line='103' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt9has_facetISt7codecvtIcc11__mbstate_tEEbRKSt6locale@@GLIBCXX_3.4'>
         <parameter type-id='type-id-862'/>
-        <return type-id='type-id-42'/>
+        <return type-id='type-id-40'/>
       </function-decl>
       <function-decl name='has_facet&lt;std::collate&lt;char&gt; &gt;' mangled-name='_ZSt9has_facetISt7collateIcEEbRKSt6locale' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_classes.tcc' line='103' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt9has_facetISt7collateIcEEbRKSt6locale@@GLIBCXX_3.4'>
         <parameter type-id='type-id-862'/>
-        <return type-id='type-id-42'/>
+        <return type-id='type-id-40'/>
       </function-decl>
       <function-decl name='has_facet&lt;std::numpunct&lt;char&gt; &gt;' mangled-name='_ZSt9has_facetISt8numpunctIcEEbRKSt6locale' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_classes.tcc' line='103' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt9has_facetISt8numpunctIcEEbRKSt6locale@@GLIBCXX_3.4'>
         <parameter type-id='type-id-862'/>
-        <return type-id='type-id-42'/>
+        <return type-id='type-id-40'/>
       </function-decl>
       <function-decl name='has_facet&lt;std::moneypunct&lt;char, false&gt; &gt;' mangled-name='_ZSt9has_facetISt10moneypunctIcLb0EEEbRKSt6locale' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_classes.tcc' line='103' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt9has_facetISt10moneypunctIcLb0EEEbRKSt6locale@@GLIBCXX_3.4'>
         <parameter type-id='type-id-862'/>
-        <return type-id='type-id-42'/>
+        <return type-id='type-id-40'/>
       </function-decl>
       <function-decl name='has_facet&lt;std::money_put&lt;char&gt; &gt;' mangled-name='_ZSt9has_facetISt9money_putIcSt19ostreambuf_iteratorIcSt11char_traitsIcEEEEbRKSt6locale' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_classes.tcc' line='103' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt9has_facetISt9money_putIcSt19ostreambuf_iteratorIcSt11char_traitsIcEEEEbRKSt6locale@@GLIBCXX_3.4'>
         <parameter type-id='type-id-862'/>
-        <return type-id='type-id-42'/>
+        <return type-id='type-id-40'/>
       </function-decl>
       <function-decl name='has_facet&lt;std::money_get&lt;char&gt; &gt;' mangled-name='_ZSt9has_facetISt9money_getIcSt19istreambuf_iteratorIcSt11char_traitsIcEEEEbRKSt6locale' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_classes.tcc' line='103' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt9has_facetISt9money_getIcSt19istreambuf_iteratorIcSt11char_traitsIcEEEEbRKSt6locale@@GLIBCXX_3.4'>
         <parameter type-id='type-id-862'/>
-        <return type-id='type-id-42'/>
+        <return type-id='type-id-40'/>
       </function-decl>
       <function-decl name='has_facet&lt;std::__timepunct&lt;char&gt; &gt;' mangled-name='_ZSt9has_facetISt11__timepunctIcEEbRKSt6locale' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_classes.tcc' line='103' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt9has_facetISt11__timepunctIcEEbRKSt6locale@@GLIBCXX_3.4'>
         <parameter type-id='type-id-862'/>
-        <return type-id='type-id-42'/>
+        <return type-id='type-id-40'/>
       </function-decl>
       <function-decl name='has_facet&lt;std::time_put&lt;char&gt; &gt;' mangled-name='_ZSt9has_facetISt8time_putIcSt19ostreambuf_iteratorIcSt11char_traitsIcEEEEbRKSt6locale' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_classes.tcc' line='103' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt9has_facetISt8time_putIcSt19ostreambuf_iteratorIcSt11char_traitsIcEEEEbRKSt6locale@@GLIBCXX_3.4'>
         <parameter type-id='type-id-862'/>
-        <return type-id='type-id-42'/>
+        <return type-id='type-id-40'/>
       </function-decl>
       <function-decl name='has_facet&lt;std::time_get&lt;char&gt; &gt;' mangled-name='_ZSt9has_facetISt8time_getIcSt19istreambuf_iteratorIcSt11char_traitsIcEEEEbRKSt6locale' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_classes.tcc' line='103' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt9has_facetISt8time_getIcSt19istreambuf_iteratorIcSt11char_traitsIcEEEEbRKSt6locale@@GLIBCXX_3.4'>
         <parameter type-id='type-id-862'/>
-        <return type-id='type-id-42'/>
+        <return type-id='type-id-40'/>
       </function-decl>
       <function-decl name='has_facet&lt;std::messages&lt;char&gt; &gt;' mangled-name='_ZSt9has_facetISt8messagesIcEEbRKSt6locale' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_classes.tcc' line='103' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt9has_facetISt8messagesIcEEbRKSt6locale@@GLIBCXX_3.4'>
         <parameter type-id='type-id-862'/>
-        <return type-id='type-id-42'/>
+        <return type-id='type-id-40'/>
       </function-decl>
       <function-decl name='__add_grouping&lt;char&gt;' mangled-name='_ZSt14__add_groupingIcEPT_S1_S0_PKcmPKS0_S5_' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='1242' column='1' visibility='default' binding='global' size-in-bits='64'>
-        <parameter type-id='type-id-93'/>
+        <parameter type-id='type-id-92'/>
         <parameter type-id='type-id-186'/>
         <parameter type-id='type-id-4'/>
-        <parameter type-id='type-id-94'/>
+        <parameter type-id='type-id-93'/>
         <parameter type-id='type-id-4'/>
         <parameter type-id='type-id-4'/>
-        <return type-id='type-id-93'/>
+        <return type-id='type-id-92'/>
       </function-decl>
       <function-decl name='__int_to_char&lt;char, long unsigned int&gt;' mangled-name='_ZSt13__int_to_charIcmEiPT_T0_PKS0_St13_Ios_Fmtflagsb' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='791' column='1' visibility='default' binding='global' size-in-bits='64'>
-        <parameter type-id='type-id-93'/>
-        <parameter type-id='type-id-51'/>
+        <parameter type-id='type-id-92'/>
+        <parameter type-id='type-id-49'/>
         <parameter type-id='type-id-4'/>
         <parameter type-id='type-id-898'/>
-        <parameter type-id='type-id-42'/>
+        <parameter type-id='type-id-40'/>
         <return type-id='type-id-6'/>
       </function-decl>
       <function-decl name='__int_to_char&lt;char, long long unsigned int&gt;' mangled-name='_ZSt13__int_to_charIcyEiPT_T0_PKS0_St13_Ios_Fmtflagsb' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='791' column='1' visibility='default' binding='global' size-in-bits='64'>
-        <parameter type-id='type-id-93'/>
+        <parameter type-id='type-id-92'/>
         <parameter type-id='type-id-376'/>
         <parameter type-id='type-id-4'/>
         <parameter type-id='type-id-898'/>
-        <parameter type-id='type-id-42'/>
+        <parameter type-id='type-id-40'/>
         <return type-id='type-id-6'/>
       </function-decl>
       <function-decl name='__write&lt;char&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='114' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -35268,7 +35231,7 @@
             <parameter type-id='type-id-2641' is-artificial='yes'/>
             <parameter type-id='type-id-2225'/>
             <parameter type-id='type-id-2642'/>
-            <return type-id='type-id-42'/>
+            <return type-id='type-id-40'/>
           </function-decl>
         </member-function>
         <member-function access='private' const='yes'>
@@ -35358,14 +35321,14 @@
             <parameter type-id='type-id-2644'/>
             <parameter type-id='type-id-2644'/>
             <parameter type-id='type-id-186'/>
-            <parameter type-id='type-id-93'/>
+            <parameter type-id='type-id-92'/>
             <return type-id='type-id-2644'/>
           </function-decl>
         </member-function>
         <member-function access='protected'>
           <function-decl name='__ctype_abstract_base' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='354' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-2718' is-artificial='yes'/>
-            <parameter type-id='type-id-94'/>
+            <parameter type-id='type-id-93'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
@@ -35395,7 +35358,7 @@
             <parameter type-id='type-id-2641' is-artificial='yes'/>
             <parameter type-id='type-id-2225'/>
             <parameter type-id='type-id-2642'/>
-            <return type-id='type-id-42'/>
+            <return type-id='type-id-40'/>
           </function-decl>
         </member-function>
         <member-function access='protected' const='yes' vtable-offset='3'>
@@ -35485,7 +35448,7 @@
             <parameter type-id='type-id-2644'/>
             <parameter type-id='type-id-2644'/>
             <parameter type-id='type-id-186'/>
-            <parameter type-id='type-id-93'/>
+            <parameter type-id='type-id-92'/>
             <return type-id='type-id-2644'/>
           </function-decl>
         </member-function>
@@ -35496,7 +35459,7 @@
           <function-decl name='collate_byname' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_classes.h' line='770' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-2729' is-artificial='yes'/>
             <parameter type-id='type-id-4'/>
-            <parameter type-id='type-id-94'/>
+            <parameter type-id='type-id-93'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
@@ -35504,7 +35467,7 @@
           <function-decl name='collate_byname' mangled-name='_ZNSt14collate_bynameIcEC2EPKcm' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_classes.h' line='770' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt14collate_bynameIcEC1EPKcm@@GLIBCXX_3.4'>
             <parameter type-id='type-id-2729' is-artificial='yes'/>
             <parameter type-id='type-id-4'/>
-            <parameter type-id='type-id-94'/>
+            <parameter type-id='type-id-93'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
@@ -35536,7 +35499,7 @@
           <function-decl name='codecvt_byname' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/codecvt.h' line='463' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-2727' is-artificial='yes'/>
             <parameter type-id='type-id-4'/>
-            <parameter type-id='type-id-94'/>
+            <parameter type-id='type-id-93'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
@@ -35544,7 +35507,7 @@
           <function-decl name='codecvt_byname' mangled-name='_ZNSt14codecvt_bynameIcc11__mbstate_tEC2EPKcm' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/codecvt.h' line='463' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt14codecvt_bynameIcc11__mbstate_tEC1EPKcm@@GLIBCXX_3.4'>
             <parameter type-id='type-id-2727' is-artificial='yes'/>
             <parameter type-id='type-id-4'/>
-            <parameter type-id='type-id-94'/>
+            <parameter type-id='type-id-93'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
@@ -35576,7 +35539,7 @@
           <function-decl name='messages_byname' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/x86_64-unknown-linux-gnu/bits/messages_members.h' line='105' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-2731' is-artificial='yes'/>
             <parameter type-id='type-id-4'/>
-            <parameter type-id='type-id-94'/>
+            <parameter type-id='type-id-93'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
@@ -35584,7 +35547,7 @@
           <function-decl name='messages_byname' mangled-name='_ZNSt15messages_bynameIcEC2EPKcm' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/x86_64-unknown-linux-gnu/bits/messages_members.h' line='105' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt15messages_bynameIcEC1EPKcm@@GLIBCXX_3.4'>
             <parameter type-id='type-id-2731' is-artificial='yes'/>
             <parameter type-id='type-id-4'/>
-            <parameter type-id='type-id-94'/>
+            <parameter type-id='type-id-93'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
@@ -35616,7 +35579,7 @@
           <function-decl name='numpunct_byname' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='1883' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-2739' is-artificial='yes'/>
             <parameter type-id='type-id-4'/>
-            <parameter type-id='type-id-94'/>
+            <parameter type-id='type-id-93'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
@@ -35624,7 +35587,7 @@
           <function-decl name='numpunct_byname' mangled-name='_ZNSt15numpunct_bynameIcEC2EPKcm' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='1883' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt15numpunct_bynameIcEC1EPKcm@@GLIBCXX_3.4'>
             <parameter type-id='type-id-2739' is-artificial='yes'/>
             <parameter type-id='type-id-4'/>
-            <parameter type-id='type-id-94'/>
+            <parameter type-id='type-id-93'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
@@ -35659,7 +35622,7 @@
           <function-decl name='moneypunct_byname' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='1333' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-2737' is-artificial='yes'/>
             <parameter type-id='type-id-4'/>
-            <parameter type-id='type-id-94'/>
+            <parameter type-id='type-id-93'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
@@ -35667,7 +35630,7 @@
           <function-decl name='moneypunct_byname' mangled-name='_ZNSt17moneypunct_bynameIcLb1EEC2EPKcm' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='1333' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt17moneypunct_bynameIcLb1EEC2EPKcm@@GLIBCXX_3.4'>
             <parameter type-id='type-id-2737' is-artificial='yes'/>
             <parameter type-id='type-id-4'/>
-            <parameter type-id='type-id-94'/>
+            <parameter type-id='type-id-93'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
@@ -35702,7 +35665,7 @@
           <function-decl name='moneypunct_byname' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='1333' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-2735' is-artificial='yes'/>
             <parameter type-id='type-id-4'/>
-            <parameter type-id='type-id-94'/>
+            <parameter type-id='type-id-93'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
@@ -35710,7 +35673,7 @@
           <function-decl name='moneypunct_byname' mangled-name='_ZNSt17moneypunct_bynameIcLb0EEC2EPKcm' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='1333' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt17moneypunct_bynameIcLb0EEC2EPKcm@@GLIBCXX_3.4'>
             <parameter type-id='type-id-2735' is-artificial='yes'/>
             <parameter type-id='type-id-4'/>
-            <parameter type-id='type-id-94'/>
+            <parameter type-id='type-id-93'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
@@ -35742,7 +35705,7 @@
           <function-decl name='time_put_byname' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='819' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-2744' is-artificial='yes'/>
             <parameter type-id='type-id-4'/>
-            <parameter type-id='type-id-94'/>
+            <parameter type-id='type-id-93'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
@@ -35750,7 +35713,7 @@
           <function-decl name='time_put_byname' mangled-name='_ZNSt15time_put_bynameIcSt19ostreambuf_iteratorIcSt11char_traitsIcEEEC2EPKcm' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='819' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt15time_put_bynameIcSt19ostreambuf_iteratorIcSt11char_traitsIcEEEC1EPKcm@@GLIBCXX_3.4'>
             <parameter type-id='type-id-2744' is-artificial='yes'/>
             <parameter type-id='type-id-4'/>
-            <parameter type-id='type-id-94'/>
+            <parameter type-id='type-id-93'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
@@ -35782,7 +35745,7 @@
           <function-decl name='time_get_byname' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='694' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-2742' is-artificial='yes'/>
             <parameter type-id='type-id-4'/>
-            <parameter type-id='type-id-94'/>
+            <parameter type-id='type-id-93'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
@@ -35790,7 +35753,7 @@
           <function-decl name='time_get_byname' mangled-name='_ZNSt15time_get_bynameIcSt19istreambuf_iteratorIcSt11char_traitsIcEEEC2EPKcm' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='694' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt15time_get_bynameIcSt19istreambuf_iteratorIcSt11char_traitsIcEEEC1EPKcm@@GLIBCXX_3.4'>
             <parameter type-id='type-id-2742' is-artificial='yes'/>
             <parameter type-id='type-id-4'/>
-            <parameter type-id='type-id-94'/>
+            <parameter type-id='type-id-93'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
@@ -35821,7 +35784,7 @@
           <function-decl name='_S_pad' mangled-name='_ZNSt5__padIcSt11char_traitsIcEE6_S_padERSt8ios_basecPcPKcll' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='1193' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-911'/>
             <parameter type-id='type-id-186'/>
-            <parameter type-id='type-id-93'/>
+            <parameter type-id='type-id-92'/>
             <parameter type-id='type-id-4'/>
             <parameter type-id='type-id-872'/>
             <parameter type-id='type-id-872'/>
@@ -35860,7 +35823,7 @@
     <namespace-decl name='__gnu_cxx'>
       <function-decl name='__is_null_pointer&lt;const char&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ext/type_traits.h' line='150' column='1' visibility='default' binding='global' size-in-bits='64'>
         <parameter type-id='type-id-4'/>
-        <return type-id='type-id-42'/>
+        <return type-id='type-id-40'/>
       </function-decl>
       <function-decl name='__uselocale' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/x86_64-unknown-linux-gnu/bits/c++locale.h' line='53' column='1' visibility='default' binding='global' size-in-bits='64'>
         <parameter type-id='type-id-2030'/>
@@ -35869,12 +35832,12 @@
     </namespace-decl>
     <function-decl name='textdomain' filepath='/usr/include/libintl.h' line='83' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-4'/>
-      <return type-id='type-id-93'/>
+      <return type-id='type-id-92'/>
     </function-decl>
     <function-decl name='bindtextdomain' filepath='/usr/include/libintl.h' line='87' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-4'/>
       <parameter type-id='type-id-4'/>
-      <return type-id='type-id-93'/>
+      <return type-id='type-id-92'/>
     </function-decl>
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='../../../.././libstdc++-v3/src/c++98/locale.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/src/c++98' language='LANG_C_plus_plus'>
@@ -35897,7 +35860,7 @@
     <namespace-decl name='__gnu_cxx'>
       <class-decl name='__enable_if&lt;true, bool&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ext/type_traits.h' line='47' column='1' id='type-id-2751'>
         <member-type access='public'>
-          <typedef-decl name='__type' type-id='type-id-42' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ext/type_traits.h' line='48' column='1' id='type-id-2750'/>
+          <typedef-decl name='__type' type-id='type-id-40' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ext/type_traits.h' line='48' column='1' id='type-id-2750'/>
         </member-type>
       </class-decl>
     </namespace-decl>
@@ -35922,9 +35885,9 @@
       </function-decl>
       <function-decl name='__verify_grouping' mangled-name='_ZSt17__verify_groupingPKcmRKSs' filepath='../../../.././libstdc++-v3/src/c++98/locale_facets.cc' line='93' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt17__verify_groupingPKcmRKSs@@GLIBCXX_3.4.10'>
         <parameter type-id='type-id-4'/>
-        <parameter type-id='type-id-94'/>
+        <parameter type-id='type-id-93'/>
         <parameter type-id='type-id-323'/>
-        <return type-id='type-id-42'/>
+        <return type-id='type-id-40'/>
       </function-decl>
       <class-decl name='__num_base' size-in-bits='8' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='1520' column='1' id='type-id-2755'>
         <data-member access='private' static='yes'>
@@ -35936,7 +35899,7 @@
         <member-function access='private' static='yes'>
           <function-decl name='_S_format_float' mangled-name='_ZNSt10__num_base15_S_format_floatERKSt8ios_basePcc' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='1566' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt10__num_base15_S_format_floatERKSt8ios_basePcc@@GLIBCXX_3.4'>
             <parameter type-id='type-id-910'/>
-            <parameter type-id='type-id-93'/>
+            <parameter type-id='type-id-92'/>
             <parameter type-id='type-id-186'/>
             <return type-id='type-id-5'/>
           </function-decl>
@@ -35988,17 +35951,17 @@
       <function-decl name='operator!=&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/basic_string.h' line='2553' column='1' visibility='default' binding='global' size-in-bits='64'>
         <parameter type-id='type-id-740'/>
         <parameter type-id='type-id-4'/>
-        <return type-id='type-id-42'/>
+        <return type-id='type-id-40'/>
       </function-decl>
       <function-decl name='operator==&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/basic_string.h' line='2516' column='1' visibility='default' binding='global' size-in-bits='64'>
         <parameter type-id='type-id-740'/>
         <parameter type-id='type-id-4'/>
-        <return type-id='type-id-42'/>
+        <return type-id='type-id-40'/>
       </function-decl>
       <class-decl name='money_base' size-in-bits='8' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='840' column='1' id='type-id-2792'>
         <member-type access='private'>
           <enum-decl name='__anonymous_enum__' is-anonymous='yes' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='849' column='1' id='type-id-2793'>
-            <underlying-type type-id='type-id-39'/>
+            <underlying-type type-id='type-id-37'/>
             <enumerator name='_S_minus' value='0'/>
             <enumerator name='_S_zero' value='1'/>
             <enumerator name='_S_end' value='11'/>
@@ -36006,7 +35969,7 @@
         </member-type>
         <member-type access='private'>
           <enum-decl name='part' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='843' column='1' id='type-id-2794'>
-            <underlying-type type-id='type-id-39'/>
+            <underlying-type type-id='type-id-37'/>
             <enumerator name='none' value='0'/>
             <enumerator name='space' value='1'/>
             <enumerator name='symbol' value='2'/>
@@ -36039,7 +36002,7 @@
       <class-decl name='time_base' size-in-bits='8' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='52' column='1' id='type-id-2795'>
         <member-type access='private'>
           <enum-decl name='dateorder' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='55' column='1' id='type-id-2796'>
-            <underlying-type type-id='type-id-39'/>
+            <underlying-type type-id='type-id-37'/>
             <enumerator name='no_order' value='0'/>
             <enumerator name='dmy' value='1'/>
             <enumerator name='mdy' value='2'/>
@@ -36054,22 +36017,22 @@
           <var-decl name='_M_grouping' type-id='type-id-4' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='1572' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='192'>
-          <var-decl name='_M_grouping_size' type-id='type-id-94' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='1573' column='1'/>
+          <var-decl name='_M_grouping_size' type-id='type-id-93' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='1573' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='256'>
-          <var-decl name='_M_use_grouping' type-id='type-id-42' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='1574' column='1'/>
+          <var-decl name='_M_use_grouping' type-id='type-id-40' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='1574' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='320'>
           <var-decl name='_M_truename' type-id='type-id-4' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='1575' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='384'>
-          <var-decl name='_M_truename_size' type-id='type-id-94' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='1576' column='1'/>
+          <var-decl name='_M_truename_size' type-id='type-id-93' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='1576' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='448'>
           <var-decl name='_M_falsename' type-id='type-id-4' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='1577' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='512'>
-          <var-decl name='_M_falsename_size' type-id='type-id-94' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='1578' column='1'/>
+          <var-decl name='_M_falsename_size' type-id='type-id-93' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='1578' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='576'>
           <var-decl name='_M_decimal_point' type-id='type-id-186' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='1579' column='1'/>
@@ -36084,12 +36047,12 @@
           <var-decl name='_M_atoms_in' type-id='type-id-2632' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='1592' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='1088'>
-          <var-decl name='_M_allocated' type-id='type-id-42' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='1594' column='1'/>
+          <var-decl name='_M_allocated' type-id='type-id-40' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='1594' column='1'/>
         </data-member>
         <member-function access='public'>
           <function-decl name='__numpunct_cache' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='1596' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-2764' is-artificial='yes'/>
-            <parameter type-id='type-id-94'/>
+            <parameter type-id='type-id-93'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
@@ -36117,7 +36080,7 @@
         <member-function access='public'>
           <function-decl name='__numpunct_cache' mangled-name='_ZNSt16__numpunct_cacheIcEC2Em' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='1596' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt16__numpunct_cacheIcEC1Em@@GLIBCXX_3.4'>
             <parameter type-id='type-id-2764' is-artificial='yes'/>
-            <parameter type-id='type-id-94'/>
+            <parameter type-id='type-id-93'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
@@ -36157,7 +36120,7 @@
         <member-function access='private'>
           <function-decl name='num_get' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='1938' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-2094' is-artificial='yes'/>
-            <parameter type-id='type-id-94'/>
+            <parameter type-id='type-id-93'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
@@ -36286,7 +36249,7 @@
           <function-decl name='_M_find&lt;char&gt;' mangled-name='_ZNKSt7num_getIcSt19istreambuf_iteratorIcSt11char_traitsIcEEE7_M_findIcEEN9__gnu_cxx11__enable_ifIXsrSt9__is_charIT_E7__valueEiE6__typeEPKS9_mS9_' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2120' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-2581' is-artificial='yes'/>
             <parameter type-id='type-id-4'/>
-            <parameter type-id='type-id-94'/>
+            <parameter type-id='type-id-93'/>
             <parameter type-id='type-id-186'/>
             <return type-id='type-id-2623'/>
           </function-decl>
@@ -36371,7 +36334,7 @@
         <member-function access='private'>
           <function-decl name='num_get' mangled-name='_ZNSt7num_getIcSt19istreambuf_iteratorIcSt11char_traitsIcEEEC2Em' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='1938' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt7num_getIcSt19istreambuf_iteratorIcSt11char_traitsIcEEEC1Em@@GLIBCXX_3.4'>
             <parameter type-id='type-id-2094' is-artificial='yes'/>
-            <parameter type-id='type-id-94'/>
+            <parameter type-id='type-id-93'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
@@ -36532,7 +36495,7 @@
         <member-function access='private'>
           <function-decl name='num_put' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2274' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-2095' is-artificial='yes'/>
-            <parameter type-id='type-id-94'/>
+            <parameter type-id='type-id-93'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
@@ -36542,7 +36505,7 @@
             <parameter type-id='type-id-2800'/>
             <parameter type-id='type-id-911'/>
             <parameter type-id='type-id-2799'/>
-            <parameter type-id='type-id-42'/>
+            <parameter type-id='type-id-40'/>
             <return type-id='type-id-2800'/>
           </function-decl>
         </member-function>
@@ -36552,7 +36515,7 @@
             <parameter type-id='type-id-2800'/>
             <parameter type-id='type-id-911'/>
             <parameter type-id='type-id-2799'/>
-            <parameter type-id='type-id-22'/>
+            <parameter type-id='type-id-20'/>
             <return type-id='type-id-2800'/>
           </function-decl>
         </member-function>
@@ -36562,7 +36525,7 @@
             <parameter type-id='type-id-2800'/>
             <parameter type-id='type-id-911'/>
             <parameter type-id='type-id-2799'/>
-            <parameter type-id='type-id-51'/>
+            <parameter type-id='type-id-49'/>
             <return type-id='type-id-2800'/>
           </function-decl>
         </member-function>
@@ -36612,7 +36575,7 @@
             <parameter type-id='type-id-2800'/>
             <parameter type-id='type-id-911'/>
             <parameter type-id='type-id-2799'/>
-            <parameter type-id='type-id-36'/>
+            <parameter type-id='type-id-34'/>
             <return type-id='type-id-2800'/>
           </function-decl>
         </member-function>
@@ -36620,11 +36583,11 @@
           <function-decl name='_M_group_float' mangled-name='_ZNKSt7num_putIcSt19ostreambuf_iteratorIcSt11char_traitsIcEEE14_M_group_floatEPKcmcS6_PcS7_Ri' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='935' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSt7num_putIcSt19ostreambuf_iteratorIcSt11char_traitsIcEEE14_M_group_floatEPKcmcS6_PcS7_Ri@@GLIBCXX_3.4'>
             <parameter type-id='type-id-2706' is-artificial='yes'/>
             <parameter type-id='type-id-4'/>
-            <parameter type-id='type-id-94'/>
+            <parameter type-id='type-id-93'/>
             <parameter type-id='type-id-186'/>
             <parameter type-id='type-id-4'/>
-            <parameter type-id='type-id-93'/>
-            <parameter type-id='type-id-93'/>
+            <parameter type-id='type-id-92'/>
+            <parameter type-id='type-id-92'/>
             <parameter type-id='type-id-1046'/>
             <return type-id='type-id-5'/>
           </function-decl>
@@ -36633,11 +36596,11 @@
           <function-decl name='_M_group_int' mangled-name='_ZNKSt7num_putIcSt19ostreambuf_iteratorIcSt11char_traitsIcEEE12_M_group_intEPKcmcRSt8ios_basePcS9_Ri' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='835' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSt7num_putIcSt19ostreambuf_iteratorIcSt11char_traitsIcEEE12_M_group_intEPKcmcRSt8ios_basePcS9_Ri@@GLIBCXX_3.4'>
             <parameter type-id='type-id-2706' is-artificial='yes'/>
             <parameter type-id='type-id-4'/>
-            <parameter type-id='type-id-94'/>
+            <parameter type-id='type-id-93'/>
             <parameter type-id='type-id-186'/>
             <parameter type-id='type-id-911'/>
-            <parameter type-id='type-id-93'/>
-            <parameter type-id='type-id-93'/>
+            <parameter type-id='type-id-92'/>
+            <parameter type-id='type-id-92'/>
             <parameter type-id='type-id-1046'/>
             <return type-id='type-id-5'/>
           </function-decl>
@@ -36648,7 +36611,7 @@
             <parameter type-id='type-id-186'/>
             <parameter type-id='type-id-872'/>
             <parameter type-id='type-id-911'/>
-            <parameter type-id='type-id-93'/>
+            <parameter type-id='type-id-92'/>
             <parameter type-id='type-id-4'/>
             <parameter type-id='type-id-1046'/>
             <return type-id='type-id-5'/>
@@ -36702,7 +36665,7 @@
             <parameter type-id='type-id-2320'/>
             <parameter type-id='type-id-911'/>
             <parameter type-id='type-id-186'/>
-            <parameter type-id='type-id-51'/>
+            <parameter type-id='type-id-49'/>
             <return type-id='type-id-2320'/>
           </function-decl>
         </member-function>
@@ -36712,14 +36675,14 @@
             <parameter type-id='type-id-2320'/>
             <parameter type-id='type-id-911'/>
             <parameter type-id='type-id-186'/>
-            <parameter type-id='type-id-22'/>
+            <parameter type-id='type-id-20'/>
             <return type-id='type-id-2320'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='num_put' mangled-name='_ZNSt7num_putIcSt19ostreambuf_iteratorIcSt11char_traitsIcEEEC2Em' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2274' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt7num_putIcSt19ostreambuf_iteratorIcSt11char_traitsIcEEEC1Em@@GLIBCXX_3.4'>
             <parameter type-id='type-id-2095' is-artificial='yes'/>
-            <parameter type-id='type-id-94'/>
+            <parameter type-id='type-id-93'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
@@ -36750,7 +36713,7 @@
             <parameter type-id='type-id-2800'/>
             <parameter type-id='type-id-911'/>
             <parameter type-id='type-id-2799'/>
-            <parameter type-id='type-id-42'/>
+            <parameter type-id='type-id-40'/>
             <return type-id='type-id-2320'/>
           </function-decl>
         </member-function>
@@ -36760,7 +36723,7 @@
             <parameter type-id='type-id-2800'/>
             <parameter type-id='type-id-911'/>
             <parameter type-id='type-id-2799'/>
-            <parameter type-id='type-id-22'/>
+            <parameter type-id='type-id-20'/>
             <return type-id='type-id-2800'/>
           </function-decl>
         </member-function>
@@ -36770,7 +36733,7 @@
             <parameter type-id='type-id-2800'/>
             <parameter type-id='type-id-911'/>
             <parameter type-id='type-id-2799'/>
-            <parameter type-id='type-id-51'/>
+            <parameter type-id='type-id-49'/>
             <return type-id='type-id-2800'/>
           </function-decl>
         </member-function>
@@ -36820,7 +36783,7 @@
             <parameter type-id='type-id-2800'/>
             <parameter type-id='type-id-911'/>
             <parameter type-id='type-id-2799'/>
-            <parameter type-id='type-id-36'/>
+            <parameter type-id='type-id-34'/>
             <return type-id='type-id-2320'/>
           </function-decl>
         </member-function>
@@ -36842,7 +36805,7 @@
         <member-function access='private'>
           <function-decl name='money_get' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='1392' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-2099' is-artificial='yes'/>
-            <parameter type-id='type-id-94'/>
+            <parameter type-id='type-id-93'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
@@ -36851,7 +36814,7 @@
             <parameter type-id='type-id-2684' is-artificial='yes'/>
             <parameter type-id='type-id-2801'/>
             <parameter type-id='type-id-2801'/>
-            <parameter type-id='type-id-42'/>
+            <parameter type-id='type-id-40'/>
             <parameter type-id='type-id-911'/>
             <parameter type-id='type-id-2798'/>
             <parameter type-id='type-id-1038'/>
@@ -36863,7 +36826,7 @@
             <parameter type-id='type-id-2684' is-artificial='yes'/>
             <parameter type-id='type-id-2801'/>
             <parameter type-id='type-id-2801'/>
-            <parameter type-id='type-id-42'/>
+            <parameter type-id='type-id-40'/>
             <parameter type-id='type-id-911'/>
             <parameter type-id='type-id-2798'/>
             <parameter type-id='type-id-2733'/>
@@ -36895,7 +36858,7 @@
         <member-function access='private'>
           <function-decl name='money_get' mangled-name='_ZNSt9money_getIcSt19istreambuf_iteratorIcSt11char_traitsIcEEEC2Em' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='1392' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt9money_getIcSt19istreambuf_iteratorIcSt11char_traitsIcEEEC2Em@@GLIBCXX_3.4'>
             <parameter type-id='type-id-2099' is-artificial='yes'/>
-            <parameter type-id='type-id-94'/>
+            <parameter type-id='type-id-93'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
@@ -36925,7 +36888,7 @@
             <parameter type-id='type-id-2684' is-artificial='yes'/>
             <parameter type-id='type-id-2801'/>
             <parameter type-id='type-id-2801'/>
-            <parameter type-id='type-id-42'/>
+            <parameter type-id='type-id-40'/>
             <parameter type-id='type-id-911'/>
             <parameter type-id='type-id-2798'/>
             <parameter type-id='type-id-1038'/>
@@ -36937,7 +36900,7 @@
             <parameter type-id='type-id-2684' is-artificial='yes'/>
             <parameter type-id='type-id-2801'/>
             <parameter type-id='type-id-2801'/>
-            <parameter type-id='type-id-42'/>
+            <parameter type-id='type-id-40'/>
             <parameter type-id='type-id-911'/>
             <parameter type-id='type-id-2798'/>
             <parameter type-id='type-id-2733'/>
@@ -36962,7 +36925,7 @@
         <member-function access='private'>
           <function-decl name='money_put' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='1542' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-2100' is-artificial='yes'/>
-            <parameter type-id='type-id-94'/>
+            <parameter type-id='type-id-93'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
@@ -36970,7 +36933,7 @@
           <function-decl name='put' mangled-name='_ZNKSt9money_putIcSt19ostreambuf_iteratorIcSt11char_traitsIcEEE3putES3_bRSt8ios_basece' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='1562' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSt9money_putIcSt19ostreambuf_iteratorIcSt11char_traitsIcEEE3putES3_bRSt8ios_basece@@GLIBCXX_3.4'>
             <parameter type-id='type-id-2690' is-artificial='yes'/>
             <parameter type-id='type-id-2802'/>
-            <parameter type-id='type-id-42'/>
+            <parameter type-id='type-id-40'/>
             <parameter type-id='type-id-911'/>
             <parameter type-id='type-id-2691'/>
             <parameter type-id='type-id-378'/>
@@ -36981,7 +36944,7 @@
           <function-decl name='put' mangled-name='_ZNKSt9money_putIcSt19ostreambuf_iteratorIcSt11char_traitsIcEEE3putES3_bRSt8ios_basecRKSs' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='1585' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSt9money_putIcSt19ostreambuf_iteratorIcSt11char_traitsIcEEE3putES3_bRSt8ios_basecRKSs@@GLIBCXX_3.4'>
             <parameter type-id='type-id-2690' is-artificial='yes'/>
             <parameter type-id='type-id-2802'/>
-            <parameter type-id='type-id-42'/>
+            <parameter type-id='type-id-40'/>
             <parameter type-id='type-id-911'/>
             <parameter type-id='type-id-2691'/>
             <parameter type-id='type-id-2695'/>
@@ -37011,7 +36974,7 @@
         <member-function access='private'>
           <function-decl name='money_put' mangled-name='_ZNSt9money_putIcSt19ostreambuf_iteratorIcSt11char_traitsIcEEEC2Em' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='1542' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt9money_putIcSt19ostreambuf_iteratorIcSt11char_traitsIcEEEC1Em@@GLIBCXX_3.4'>
             <parameter type-id='type-id-2100' is-artificial='yes'/>
-            <parameter type-id='type-id-94'/>
+            <parameter type-id='type-id-93'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
@@ -37040,7 +37003,7 @@
           <function-decl name='do_put' mangled-name='_ZNKSt9money_putIcSt19ostreambuf_iteratorIcSt11char_traitsIcEEE6do_putES3_bRSt8ios_basece' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.tcc' line='569' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSt9money_putIcSt19ostreambuf_iteratorIcSt11char_traitsIcEEE6do_putES3_bRSt8ios_basece@@GLIBCXX_3.4'>
             <parameter type-id='type-id-2690' is-artificial='yes'/>
             <parameter type-id='type-id-2802'/>
-            <parameter type-id='type-id-42'/>
+            <parameter type-id='type-id-40'/>
             <parameter type-id='type-id-911'/>
             <parameter type-id='type-id-2691'/>
             <parameter type-id='type-id-378'/>
@@ -37051,7 +37014,7 @@
           <function-decl name='do_put' mangled-name='_ZNKSt9money_putIcSt19ostreambuf_iteratorIcSt11char_traitsIcEEE6do_putES3_bRSt8ios_basecRKSs' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.tcc' line='607' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSt9money_putIcSt19ostreambuf_iteratorIcSt11char_traitsIcEEE6do_putES3_bRSt8ios_basecRKSs@@GLIBCXX_3.4'>
             <parameter type-id='type-id-2690' is-artificial='yes'/>
             <parameter type-id='type-id-2802'/>
-            <parameter type-id='type-id-42'/>
+            <parameter type-id='type-id-40'/>
             <parameter type-id='type-id-911'/>
             <parameter type-id='type-id-2691'/>
             <parameter type-id='type-id-2695'/>
@@ -37074,7 +37037,7 @@
         <member-function access='private'>
           <function-decl name='time_get' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='390' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-2102' is-artificial='yes'/>
-            <parameter type-id='type-id-94'/>
+            <parameter type-id='type-id-93'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
@@ -37147,7 +37110,7 @@
             <parameter type-id='type-id-1046'/>
             <parameter type-id='type-id-6'/>
             <parameter type-id='type-id-6'/>
-            <parameter type-id='type-id-94'/>
+            <parameter type-id='type-id-93'/>
             <parameter type-id='type-id-911'/>
             <parameter type-id='type-id-2798'/>
             <return type-id='type-id-2573'/>
@@ -37160,7 +37123,7 @@
             <parameter type-id='type-id-2803'/>
             <parameter type-id='type-id-1046'/>
             <parameter type-id='type-id-677'/>
-            <parameter type-id='type-id-94'/>
+            <parameter type-id='type-id-93'/>
             <parameter type-id='type-id-911'/>
             <parameter type-id='type-id-2798'/>
             <return type-id='type-id-2573'/>
@@ -37173,7 +37136,7 @@
             <parameter type-id='type-id-2803'/>
             <parameter type-id='type-id-1046'/>
             <parameter type-id='type-id-677'/>
-            <parameter type-id='type-id-94'/>
+            <parameter type-id='type-id-93'/>
             <parameter type-id='type-id-911'/>
             <parameter type-id='type-id-2798'/>
             <return type-id='type-id-2573'/>
@@ -37194,7 +37157,7 @@
         <member-function access='private'>
           <function-decl name='time_get' mangled-name='_ZNSt8time_getIcSt19istreambuf_iteratorIcSt11char_traitsIcEEEC2Em' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='390' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt8time_getIcSt19istreambuf_iteratorIcSt11char_traitsIcEEEC2Em@@GLIBCXX_3.4'>
             <parameter type-id='type-id-2102' is-artificial='yes'/>
-            <parameter type-id='type-id-94'/>
+            <parameter type-id='type-id-93'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
@@ -37295,7 +37258,7 @@
         <member-function access='private'>
           <function-decl name='time_put' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='736' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-2103' is-artificial='yes'/>
-            <parameter type-id='type-id-94'/>
+            <parameter type-id='type-id-93'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
@@ -37326,7 +37289,7 @@
         <member-function access='private'>
           <function-decl name='time_put' mangled-name='_ZNSt8time_putIcSt19ostreambuf_iteratorIcSt11char_traitsIcEEEC2Em' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='736' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt8time_putIcSt19ostreambuf_iteratorIcSt11char_traitsIcEEEC2Em@@GLIBCXX_3.4'>
             <parameter type-id='type-id-2103' is-artificial='yes'/>
-            <parameter type-id='type-id-94'/>
+            <parameter type-id='type-id-93'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
@@ -37370,22 +37333,22 @@
           <var-decl name='_M_grouping' type-id='type-id-4' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='1572' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='192'>
-          <var-decl name='_M_grouping_size' type-id='type-id-94' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='1573' column='1'/>
+          <var-decl name='_M_grouping_size' type-id='type-id-93' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='1573' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='256'>
-          <var-decl name='_M_use_grouping' type-id='type-id-42' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='1574' column='1'/>
+          <var-decl name='_M_use_grouping' type-id='type-id-40' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='1574' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='320'>
           <var-decl name='_M_truename' type-id='type-id-354' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='1575' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='384'>
-          <var-decl name='_M_truename_size' type-id='type-id-94' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='1576' column='1'/>
+          <var-decl name='_M_truename_size' type-id='type-id-93' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='1576' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='448'>
           <var-decl name='_M_falsename' type-id='type-id-354' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='1577' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='512'>
-          <var-decl name='_M_falsename_size' type-id='type-id-94' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='1578' column='1'/>
+          <var-decl name='_M_falsename_size' type-id='type-id-93' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='1578' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='576'>
           <var-decl name='_M_decimal_point' type-id='type-id-375' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='1579' column='1'/>
@@ -37400,12 +37363,12 @@
           <var-decl name='_M_atoms_in' type-id='type-id-2807' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='1592' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='2624'>
-          <var-decl name='_M_allocated' type-id='type-id-42' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='1594' column='1'/>
+          <var-decl name='_M_allocated' type-id='type-id-40' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='1594' column='1'/>
         </data-member>
         <member-function access='public'>
           <function-decl name='__numpunct_cache' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='1596' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-2766' is-artificial='yes'/>
-            <parameter type-id='type-id-94'/>
+            <parameter type-id='type-id-93'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
@@ -37433,7 +37396,7 @@
         <member-function access='public'>
           <function-decl name='__numpunct_cache' mangled-name='_ZNSt16__numpunct_cacheIwEC2Em' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='1596' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt16__numpunct_cacheIwEC2Em@@GLIBCXX_3.4'>
             <parameter type-id='type-id-2766' is-artificial='yes'/>
-            <parameter type-id='type-id-94'/>
+            <parameter type-id='type-id-93'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
@@ -37473,7 +37436,7 @@
         <member-function access='private'>
           <function-decl name='num_get' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='1938' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-2107' is-artificial='yes'/>
-            <parameter type-id='type-id-94'/>
+            <parameter type-id='type-id-93'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
@@ -37602,7 +37565,7 @@
           <function-decl name='_M_find&lt;wchar_t&gt;' mangled-name='_ZNKSt7num_getIwSt19istreambuf_iteratorIwSt11char_traitsIwEEE7_M_findIwEEN9__gnu_cxx11__enable_ifIXsrSt9__is_charIT_E7__valueEiE6__typeEPKS9_mS9_' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2120' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-2582' is-artificial='yes'/>
             <parameter type-id='type-id-354'/>
-            <parameter type-id='type-id-94'/>
+            <parameter type-id='type-id-93'/>
             <parameter type-id='type-id-375'/>
             <return type-id='type-id-2623'/>
           </function-decl>
@@ -37687,7 +37650,7 @@
         <member-function access='private'>
           <function-decl name='num_get' mangled-name='_ZNSt7num_getIwSt19istreambuf_iteratorIwSt11char_traitsIwEEEC2Em' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='1938' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt7num_getIwSt19istreambuf_iteratorIwSt11char_traitsIwEEEC2Em@@GLIBCXX_3.4'>
             <parameter type-id='type-id-2107' is-artificial='yes'/>
-            <parameter type-id='type-id-94'/>
+            <parameter type-id='type-id-93'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
@@ -37848,7 +37811,7 @@
         <member-function access='private'>
           <function-decl name='num_put' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2274' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-2108' is-artificial='yes'/>
-            <parameter type-id='type-id-94'/>
+            <parameter type-id='type-id-93'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
@@ -37858,7 +37821,7 @@
             <parameter type-id='type-id-2812'/>
             <parameter type-id='type-id-911'/>
             <parameter type-id='type-id-2813'/>
-            <parameter type-id='type-id-36'/>
+            <parameter type-id='type-id-34'/>
             <return type-id='type-id-2812'/>
           </function-decl>
         </member-function>
@@ -37908,7 +37871,7 @@
             <parameter type-id='type-id-2812'/>
             <parameter type-id='type-id-911'/>
             <parameter type-id='type-id-2813'/>
-            <parameter type-id='type-id-42'/>
+            <parameter type-id='type-id-40'/>
             <return type-id='type-id-2812'/>
           </function-decl>
         </member-function>
@@ -37918,7 +37881,7 @@
             <parameter type-id='type-id-2812'/>
             <parameter type-id='type-id-911'/>
             <parameter type-id='type-id-2813'/>
-            <parameter type-id='type-id-51'/>
+            <parameter type-id='type-id-49'/>
             <return type-id='type-id-2812'/>
           </function-decl>
         </member-function>
@@ -37928,7 +37891,7 @@
             <parameter type-id='type-id-2812'/>
             <parameter type-id='type-id-911'/>
             <parameter type-id='type-id-2813'/>
-            <parameter type-id='type-id-22'/>
+            <parameter type-id='type-id-20'/>
             <return type-id='type-id-2812'/>
           </function-decl>
         </member-function>
@@ -37936,7 +37899,7 @@
           <function-decl name='_M_group_float' mangled-name='_ZNKSt7num_putIwSt19ostreambuf_iteratorIwSt11char_traitsIwEEE14_M_group_floatEPKcmwPKwPwS9_Ri' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='935' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSt7num_putIwSt19ostreambuf_iteratorIwSt11char_traitsIwEEE14_M_group_floatEPKcmwPKwPwS9_Ri@@GLIBCXX_3.4'>
             <parameter type-id='type-id-2814' is-artificial='yes'/>
             <parameter type-id='type-id-4'/>
-            <parameter type-id='type-id-94'/>
+            <parameter type-id='type-id-93'/>
             <parameter type-id='type-id-375'/>
             <parameter type-id='type-id-354'/>
             <parameter type-id='type-id-333'/>
@@ -37949,7 +37912,7 @@
           <function-decl name='_M_group_int' mangled-name='_ZNKSt7num_putIwSt19ostreambuf_iteratorIwSt11char_traitsIwEEE12_M_group_intEPKcmwRSt8ios_basePwS9_Ri' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='835' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSt7num_putIwSt19ostreambuf_iteratorIwSt11char_traitsIwEEE12_M_group_intEPKcmwRSt8ios_basePwS9_Ri@@GLIBCXX_3.4'>
             <parameter type-id='type-id-2814' is-artificial='yes'/>
             <parameter type-id='type-id-4'/>
-            <parameter type-id='type-id-94'/>
+            <parameter type-id='type-id-93'/>
             <parameter type-id='type-id-375'/>
             <parameter type-id='type-id-911'/>
             <parameter type-id='type-id-333'/>
@@ -38018,7 +37981,7 @@
             <parameter type-id='type-id-2324'/>
             <parameter type-id='type-id-911'/>
             <parameter type-id='type-id-375'/>
-            <parameter type-id='type-id-51'/>
+            <parameter type-id='type-id-49'/>
             <return type-id='type-id-2324'/>
           </function-decl>
         </member-function>
@@ -38028,14 +37991,14 @@
             <parameter type-id='type-id-2324'/>
             <parameter type-id='type-id-911'/>
             <parameter type-id='type-id-375'/>
-            <parameter type-id='type-id-22'/>
+            <parameter type-id='type-id-20'/>
             <return type-id='type-id-2324'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='num_put' mangled-name='_ZNSt7num_putIwSt19ostreambuf_iteratorIwSt11char_traitsIwEEEC2Em' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2274' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt7num_putIwSt19ostreambuf_iteratorIwSt11char_traitsIwEEEC2Em@@GLIBCXX_3.4'>
             <parameter type-id='type-id-2108' is-artificial='yes'/>
-            <parameter type-id='type-id-94'/>
+            <parameter type-id='type-id-93'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
@@ -38066,7 +38029,7 @@
             <parameter type-id='type-id-2812'/>
             <parameter type-id='type-id-911'/>
             <parameter type-id='type-id-2813'/>
-            <parameter type-id='type-id-42'/>
+            <parameter type-id='type-id-40'/>
             <return type-id='type-id-2324'/>
           </function-decl>
         </member-function>
@@ -38076,7 +38039,7 @@
             <parameter type-id='type-id-2812'/>
             <parameter type-id='type-id-911'/>
             <parameter type-id='type-id-2813'/>
-            <parameter type-id='type-id-22'/>
+            <parameter type-id='type-id-20'/>
             <return type-id='type-id-2812'/>
           </function-decl>
         </member-function>
@@ -38086,7 +38049,7 @@
             <parameter type-id='type-id-2812'/>
             <parameter type-id='type-id-911'/>
             <parameter type-id='type-id-2813'/>
-            <parameter type-id='type-id-51'/>
+            <parameter type-id='type-id-49'/>
             <return type-id='type-id-2812'/>
           </function-decl>
         </member-function>
@@ -38136,7 +38099,7 @@
             <parameter type-id='type-id-2812'/>
             <parameter type-id='type-id-911'/>
             <parameter type-id='type-id-2813'/>
-            <parameter type-id='type-id-36'/>
+            <parameter type-id='type-id-34'/>
             <return type-id='type-id-2324'/>
           </function-decl>
         </member-function>
@@ -38158,7 +38121,7 @@
         <member-function access='private'>
           <function-decl name='money_get' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='1392' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-2112' is-artificial='yes'/>
-            <parameter type-id='type-id-94'/>
+            <parameter type-id='type-id-93'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
@@ -38167,7 +38130,7 @@
             <parameter type-id='type-id-2818' is-artificial='yes'/>
             <parameter type-id='type-id-2816'/>
             <parameter type-id='type-id-2816'/>
-            <parameter type-id='type-id-42'/>
+            <parameter type-id='type-id-40'/>
             <parameter type-id='type-id-911'/>
             <parameter type-id='type-id-2798'/>
             <parameter type-id='type-id-1038'/>
@@ -38179,7 +38142,7 @@
             <parameter type-id='type-id-2818' is-artificial='yes'/>
             <parameter type-id='type-id-2816'/>
             <parameter type-id='type-id-2816'/>
-            <parameter type-id='type-id-42'/>
+            <parameter type-id='type-id-40'/>
             <parameter type-id='type-id-911'/>
             <parameter type-id='type-id-2798'/>
             <parameter type-id='type-id-2819'/>
@@ -38211,7 +38174,7 @@
         <member-function access='private'>
           <function-decl name='money_get' mangled-name='_ZNSt9money_getIwSt19istreambuf_iteratorIwSt11char_traitsIwEEEC2Em' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='1392' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt9money_getIwSt19istreambuf_iteratorIwSt11char_traitsIwEEEC1Em@@GLIBCXX_3.4'>
             <parameter type-id='type-id-2112' is-artificial='yes'/>
-            <parameter type-id='type-id-94'/>
+            <parameter type-id='type-id-93'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
@@ -38241,7 +38204,7 @@
             <parameter type-id='type-id-2818' is-artificial='yes'/>
             <parameter type-id='type-id-2816'/>
             <parameter type-id='type-id-2816'/>
-            <parameter type-id='type-id-42'/>
+            <parameter type-id='type-id-40'/>
             <parameter type-id='type-id-911'/>
             <parameter type-id='type-id-2798'/>
             <parameter type-id='type-id-1038'/>
@@ -38253,7 +38216,7 @@
             <parameter type-id='type-id-2818' is-artificial='yes'/>
             <parameter type-id='type-id-2816'/>
             <parameter type-id='type-id-2816'/>
-            <parameter type-id='type-id-42'/>
+            <parameter type-id='type-id-40'/>
             <parameter type-id='type-id-911'/>
             <parameter type-id='type-id-2798'/>
             <parameter type-id='type-id-2819'/>
@@ -38278,7 +38241,7 @@
         <member-function access='private'>
           <function-decl name='money_put' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='1542' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-2113' is-artificial='yes'/>
-            <parameter type-id='type-id-94'/>
+            <parameter type-id='type-id-93'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
@@ -38286,7 +38249,7 @@
           <function-decl name='put' mangled-name='_ZNKSt9money_putIwSt19ostreambuf_iteratorIwSt11char_traitsIwEEE3putES3_bRSt8ios_basewe' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='1562' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSt9money_putIwSt19ostreambuf_iteratorIwSt11char_traitsIwEEE3putES3_bRSt8ios_basewe@@GLIBCXX_3.4'>
             <parameter type-id='type-id-2823' is-artificial='yes'/>
             <parameter type-id='type-id-2821'/>
-            <parameter type-id='type-id-42'/>
+            <parameter type-id='type-id-40'/>
             <parameter type-id='type-id-911'/>
             <parameter type-id='type-id-2820'/>
             <parameter type-id='type-id-378'/>
@@ -38297,7 +38260,7 @@
           <function-decl name='put' mangled-name='_ZNKSt9money_putIwSt19ostreambuf_iteratorIwSt11char_traitsIwEEE3putES3_bRSt8ios_basewRKSbIwS2_SaIwEE' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='1585' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSt9money_putIwSt19ostreambuf_iteratorIwSt11char_traitsIwEEE3putES3_bRSt8ios_basewRKSbIwS2_SaIwEE@@GLIBCXX_3.4'>
             <parameter type-id='type-id-2823' is-artificial='yes'/>
             <parameter type-id='type-id-2821'/>
-            <parameter type-id='type-id-42'/>
+            <parameter type-id='type-id-40'/>
             <parameter type-id='type-id-911'/>
             <parameter type-id='type-id-2820'/>
             <parameter type-id='type-id-2824'/>
@@ -38327,7 +38290,7 @@
         <member-function access='private'>
           <function-decl name='money_put' mangled-name='_ZNSt9money_putIwSt19ostreambuf_iteratorIwSt11char_traitsIwEEEC2Em' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='1542' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt9money_putIwSt19ostreambuf_iteratorIwSt11char_traitsIwEEEC2Em@@GLIBCXX_3.4'>
             <parameter type-id='type-id-2113' is-artificial='yes'/>
-            <parameter type-id='type-id-94'/>
+            <parameter type-id='type-id-93'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
@@ -38356,7 +38319,7 @@
           <function-decl name='do_put' mangled-name='_ZNKSt9money_putIwSt19ostreambuf_iteratorIwSt11char_traitsIwEEE6do_putES3_bRSt8ios_basewe' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.tcc' line='569' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSt9money_putIwSt19ostreambuf_iteratorIwSt11char_traitsIwEEE6do_putES3_bRSt8ios_basewe@@GLIBCXX_3.4'>
             <parameter type-id='type-id-2823' is-artificial='yes'/>
             <parameter type-id='type-id-2821'/>
-            <parameter type-id='type-id-42'/>
+            <parameter type-id='type-id-40'/>
             <parameter type-id='type-id-911'/>
             <parameter type-id='type-id-2820'/>
             <parameter type-id='type-id-378'/>
@@ -38367,7 +38330,7 @@
           <function-decl name='do_put' mangled-name='_ZNKSt9money_putIwSt19ostreambuf_iteratorIwSt11char_traitsIwEEE6do_putES3_bRSt8ios_basewRKSbIwS2_SaIwEE' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.tcc' line='607' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSt9money_putIwSt19ostreambuf_iteratorIwSt11char_traitsIwEEE6do_putES3_bRSt8ios_basewRKSbIwS2_SaIwEE@@GLIBCXX_3.4'>
             <parameter type-id='type-id-2823' is-artificial='yes'/>
             <parameter type-id='type-id-2821'/>
-            <parameter type-id='type-id-42'/>
+            <parameter type-id='type-id-40'/>
             <parameter type-id='type-id-911'/>
             <parameter type-id='type-id-2820'/>
             <parameter type-id='type-id-2824'/>
@@ -38390,7 +38353,7 @@
         <member-function access='private'>
           <function-decl name='time_get' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='390' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-2115' is-artificial='yes'/>
-            <parameter type-id='type-id-94'/>
+            <parameter type-id='type-id-93'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
@@ -38463,7 +38426,7 @@
             <parameter type-id='type-id-1046'/>
             <parameter type-id='type-id-6'/>
             <parameter type-id='type-id-6'/>
-            <parameter type-id='type-id-94'/>
+            <parameter type-id='type-id-93'/>
             <parameter type-id='type-id-911'/>
             <parameter type-id='type-id-2798'/>
             <return type-id='type-id-2577'/>
@@ -38476,7 +38439,7 @@
             <parameter type-id='type-id-2826'/>
             <parameter type-id='type-id-1046'/>
             <parameter type-id='type-id-788'/>
-            <parameter type-id='type-id-94'/>
+            <parameter type-id='type-id-93'/>
             <parameter type-id='type-id-911'/>
             <parameter type-id='type-id-2798'/>
             <return type-id='type-id-2577'/>
@@ -38489,7 +38452,7 @@
             <parameter type-id='type-id-2826'/>
             <parameter type-id='type-id-1046'/>
             <parameter type-id='type-id-788'/>
-            <parameter type-id='type-id-94'/>
+            <parameter type-id='type-id-93'/>
             <parameter type-id='type-id-911'/>
             <parameter type-id='type-id-2798'/>
             <return type-id='type-id-2577'/>
@@ -38510,7 +38473,7 @@
         <member-function access='private'>
           <function-decl name='time_get' mangled-name='_ZNSt8time_getIwSt19istreambuf_iteratorIwSt11char_traitsIwEEEC2Em' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='390' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt8time_getIwSt19istreambuf_iteratorIwSt11char_traitsIwEEEC2Em@@GLIBCXX_3.4'>
             <parameter type-id='type-id-2115' is-artificial='yes'/>
-            <parameter type-id='type-id-94'/>
+            <parameter type-id='type-id-93'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
@@ -38611,7 +38574,7 @@
         <member-function access='private'>
           <function-decl name='time_put' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='736' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-2116' is-artificial='yes'/>
-            <parameter type-id='type-id-94'/>
+            <parameter type-id='type-id-93'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
@@ -38642,7 +38605,7 @@
         <member-function access='private'>
           <function-decl name='time_put' mangled-name='_ZNSt8time_putIwSt19ostreambuf_iteratorIwSt11char_traitsIwEEEC2Em' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='736' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt8time_putIwSt19ostreambuf_iteratorIwSt11char_traitsIwEEEC2Em@@GLIBCXX_3.4'>
             <parameter type-id='type-id-2116' is-artificial='yes'/>
-            <parameter type-id='type-id-94'/>
+            <parameter type-id='type-id-93'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
@@ -38701,7 +38664,7 @@
           <function-decl name='numpunct' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='1681' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-2093' is-artificial='yes'/>
             <parameter type-id='type-id-2787'/>
-            <parameter type-id='type-id-94'/>
+            <parameter type-id='type-id-93'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
@@ -38716,7 +38679,7 @@
           <function-decl name='numpunct' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='1695' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-2093' is-artificial='yes'/>
             <parameter type-id='type-id-2055'/>
-            <parameter type-id='type-id-94'/>
+            <parameter type-id='type-id-93'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
@@ -38753,14 +38716,14 @@
         <member-function access='private'>
           <function-decl name='numpunct' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='1667' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-2093' is-artificial='yes'/>
-            <parameter type-id='type-id-94'/>
+            <parameter type-id='type-id-93'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='numpunct' mangled-name='_ZNSt8numpunctIcEC2Em' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='1667' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt8numpunctIcEC1Em@@GLIBCXX_3.4'>
             <parameter type-id='type-id-2093' is-artificial='yes'/>
-            <parameter type-id='type-id-94'/>
+            <parameter type-id='type-id-93'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
@@ -38768,7 +38731,7 @@
           <function-decl name='numpunct' mangled-name='_ZNSt8numpunctIcEC2EPSt16__numpunct_cacheIcEm' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='1681' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt8numpunctIcEC1EPSt16__numpunct_cacheIcEm@@GLIBCXX_3.4'>
             <parameter type-id='type-id-2093' is-artificial='yes'/>
             <parameter type-id='type-id-2787'/>
-            <parameter type-id='type-id-94'/>
+            <parameter type-id='type-id-93'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
@@ -38776,7 +38739,7 @@
           <function-decl name='numpunct' mangled-name='_ZNSt8numpunctIcEC2EP15__locale_structm' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='1695' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt8numpunctIcEC2EP15__locale_structm@@GLIBCXX_3.4'>
             <parameter type-id='type-id-2093' is-artificial='yes'/>
             <parameter type-id='type-id-2055'/>
-            <parameter type-id='type-id-94'/>
+            <parameter type-id='type-id-93'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
@@ -38846,7 +38809,7 @@
         <member-function access='private'>
           <function-decl name='collate' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_classes.h' line='613' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-2096' is-artificial='yes'/>
-            <parameter type-id='type-id-94'/>
+            <parameter type-id='type-id-93'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
@@ -38854,7 +38817,7 @@
           <function-decl name='collate' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_classes.h' line='627' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-2096' is-artificial='yes'/>
             <parameter type-id='type-id-2055'/>
-            <parameter type-id='type-id-94'/>
+            <parameter type-id='type-id-93'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
@@ -38869,10 +38832,10 @@
         <member-function access='private' const='yes'>
           <function-decl name='_M_transform' mangled-name='_ZNKSt7collateIcE12_M_transformEPcPKcm' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/src/c++98/collate_members.cc' line='51' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSt7collateIcE12_M_transformEPcPKcm@@GLIBCXX_3.4'>
             <parameter type-id='type-id-2833' is-artificial='yes'/>
-            <parameter type-id='type-id-93'/>
+            <parameter type-id='type-id-92'/>
             <parameter type-id='type-id-4'/>
-            <parameter type-id='type-id-94'/>
-            <return type-id='type-id-94'/>
+            <parameter type-id='type-id-93'/>
+            <return type-id='type-id-93'/>
           </function-decl>
         </member-function>
         <member-function access='private' const='yes'>
@@ -38898,13 +38861,13 @@
             <parameter type-id='type-id-2833' is-artificial='yes'/>
             <parameter type-id='type-id-4'/>
             <parameter type-id='type-id-4'/>
-            <return type-id='type-id-22'/>
+            <return type-id='type-id-20'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='collate' mangled-name='_ZNSt7collateIcEC2Em' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_classes.h' line='613' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt7collateIcEC2Em@@GLIBCXX_3.4'>
             <parameter type-id='type-id-2096' is-artificial='yes'/>
-            <parameter type-id='type-id-94'/>
+            <parameter type-id='type-id-93'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
@@ -38912,7 +38875,7 @@
           <function-decl name='collate' mangled-name='_ZNSt7collateIcEC2EP15__locale_structm' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_classes.h' line='627' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt7collateIcEC2EP15__locale_structm@@GLIBCXX_3.4'>
             <parameter type-id='type-id-2096' is-artificial='yes'/>
             <parameter type-id='type-id-2055'/>
-            <parameter type-id='type-id-94'/>
+            <parameter type-id='type-id-93'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
@@ -38960,7 +38923,7 @@
             <parameter type-id='type-id-2833' is-artificial='yes'/>
             <parameter type-id='type-id-4'/>
             <parameter type-id='type-id-4'/>
-            <return type-id='type-id-22'/>
+            <return type-id='type-id-20'/>
           </function-decl>
         </member-function>
       </class-decl>
@@ -38989,7 +38952,7 @@
           <function-decl name='moneypunct' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='976' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-2097' is-artificial='yes'/>
             <parameter type-id='type-id-2777'/>
-            <parameter type-id='type-id-94'/>
+            <parameter type-id='type-id-93'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
@@ -39006,14 +38969,14 @@
             <parameter type-id='type-id-2097' is-artificial='yes'/>
             <parameter type-id='type-id-2055'/>
             <parameter type-id='type-id-4'/>
-            <parameter type-id='type-id-94'/>
+            <parameter type-id='type-id-93'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='moneypunct' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='963' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-2097' is-artificial='yes'/>
-            <parameter type-id='type-id-94'/>
+            <parameter type-id='type-id-93'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
@@ -39074,7 +39037,7 @@
         <member-function access='private'>
           <function-decl name='moneypunct' mangled-name='_ZNSt10moneypunctIcLb0EEC2Em' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='963' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt10moneypunctIcLb0EEC1Em@@GLIBCXX_3.4'>
             <parameter type-id='type-id-2097' is-artificial='yes'/>
-            <parameter type-id='type-id-94'/>
+            <parameter type-id='type-id-93'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
@@ -39082,7 +39045,7 @@
           <function-decl name='moneypunct' mangled-name='_ZNSt10moneypunctIcLb0EEC2EPSt18__moneypunct_cacheIcLb0EEm' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='976' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt10moneypunctIcLb0EEC2EPSt18__moneypunct_cacheIcLb0EEm@@GLIBCXX_3.4'>
             <parameter type-id='type-id-2097' is-artificial='yes'/>
             <parameter type-id='type-id-2777'/>
-            <parameter type-id='type-id-94'/>
+            <parameter type-id='type-id-93'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
@@ -39091,7 +39054,7 @@
             <parameter type-id='type-id-2097' is-artificial='yes'/>
             <parameter type-id='type-id-2055'/>
             <parameter type-id='type-id-4'/>
-            <parameter type-id='type-id-94'/>
+            <parameter type-id='type-id-93'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
@@ -39177,10 +39140,10 @@
           <var-decl name='_M_grouping' type-id='type-id-4' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='868' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='192'>
-          <var-decl name='_M_grouping_size' type-id='type-id-94' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='869' column='1'/>
+          <var-decl name='_M_grouping_size' type-id='type-id-93' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='869' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='256'>
-          <var-decl name='_M_use_grouping' type-id='type-id-42' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='870' column='1'/>
+          <var-decl name='_M_use_grouping' type-id='type-id-40' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='870' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='264'>
           <var-decl name='_M_decimal_point' type-id='type-id-186' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='871' column='1'/>
@@ -39192,19 +39155,19 @@
           <var-decl name='_M_curr_symbol' type-id='type-id-4' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='873' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='384'>
-          <var-decl name='_M_curr_symbol_size' type-id='type-id-94' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='874' column='1'/>
+          <var-decl name='_M_curr_symbol_size' type-id='type-id-93' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='874' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='448'>
           <var-decl name='_M_positive_sign' type-id='type-id-4' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='875' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='512'>
-          <var-decl name='_M_positive_sign_size' type-id='type-id-94' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='876' column='1'/>
+          <var-decl name='_M_positive_sign_size' type-id='type-id-93' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='876' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='576'>
           <var-decl name='_M_negative_sign' type-id='type-id-4' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='877' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='640'>
-          <var-decl name='_M_negative_sign_size' type-id='type-id-94' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='878' column='1'/>
+          <var-decl name='_M_negative_sign_size' type-id='type-id-93' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='878' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='704'>
           <var-decl name='_M_frac_digits' type-id='type-id-6' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='879' column='1'/>
@@ -39219,12 +39182,12 @@
           <var-decl name='_M_atoms' type-id='type-id-2630' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='886' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='888'>
-          <var-decl name='_M_allocated' type-id='type-id-42' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='888' column='1'/>
+          <var-decl name='_M_allocated' type-id='type-id-40' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='888' column='1'/>
         </data-member>
         <member-function access='public'>
           <function-decl name='__moneypunct_cache' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='890' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-2758' is-artificial='yes'/>
-            <parameter type-id='type-id-94'/>
+            <parameter type-id='type-id-93'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
@@ -39252,7 +39215,7 @@
         <member-function access='public'>
           <function-decl name='__moneypunct_cache' mangled-name='_ZNSt18__moneypunct_cacheIcLb0EEC2Em' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='890' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt18__moneypunct_cacheIcLb0EEC1Em@@GLIBCXX_3.4'>
             <parameter type-id='type-id-2758' is-artificial='yes'/>
-            <parameter type-id='type-id-94'/>
+            <parameter type-id='type-id-93'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
@@ -39303,7 +39266,7 @@
           <function-decl name='moneypunct' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='976' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-2098' is-artificial='yes'/>
             <parameter type-id='type-id-2779'/>
-            <parameter type-id='type-id-94'/>
+            <parameter type-id='type-id-93'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
@@ -39320,14 +39283,14 @@
             <parameter type-id='type-id-2098' is-artificial='yes'/>
             <parameter type-id='type-id-2055'/>
             <parameter type-id='type-id-4'/>
-            <parameter type-id='type-id-94'/>
+            <parameter type-id='type-id-93'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='moneypunct' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='963' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-2098' is-artificial='yes'/>
-            <parameter type-id='type-id-94'/>
+            <parameter type-id='type-id-93'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
@@ -39388,7 +39351,7 @@
         <member-function access='private'>
           <function-decl name='moneypunct' mangled-name='_ZNSt10moneypunctIcLb1EEC2Em' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='963' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt10moneypunctIcLb1EEC2Em@@GLIBCXX_3.4'>
             <parameter type-id='type-id-2098' is-artificial='yes'/>
-            <parameter type-id='type-id-94'/>
+            <parameter type-id='type-id-93'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
@@ -39396,7 +39359,7 @@
           <function-decl name='moneypunct' mangled-name='_ZNSt10moneypunctIcLb1EEC2EPSt18__moneypunct_cacheIcLb1EEm' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='976' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt10moneypunctIcLb1EEC2EPSt18__moneypunct_cacheIcLb1EEm@@GLIBCXX_3.4'>
             <parameter type-id='type-id-2098' is-artificial='yes'/>
             <parameter type-id='type-id-2779'/>
-            <parameter type-id='type-id-94'/>
+            <parameter type-id='type-id-93'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
@@ -39405,7 +39368,7 @@
             <parameter type-id='type-id-2098' is-artificial='yes'/>
             <parameter type-id='type-id-2055'/>
             <parameter type-id='type-id-4'/>
-            <parameter type-id='type-id-94'/>
+            <parameter type-id='type-id-93'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
@@ -39491,10 +39454,10 @@
           <var-decl name='_M_grouping' type-id='type-id-4' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='868' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='192'>
-          <var-decl name='_M_grouping_size' type-id='type-id-94' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='869' column='1'/>
+          <var-decl name='_M_grouping_size' type-id='type-id-93' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='869' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='256'>
-          <var-decl name='_M_use_grouping' type-id='type-id-42' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='870' column='1'/>
+          <var-decl name='_M_use_grouping' type-id='type-id-40' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='870' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='264'>
           <var-decl name='_M_decimal_point' type-id='type-id-186' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='871' column='1'/>
@@ -39506,19 +39469,19 @@
           <var-decl name='_M_curr_symbol' type-id='type-id-4' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='873' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='384'>
-          <var-decl name='_M_curr_symbol_size' type-id='type-id-94' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='874' column='1'/>
+          <var-decl name='_M_curr_symbol_size' type-id='type-id-93' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='874' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='448'>
           <var-decl name='_M_positive_sign' type-id='type-id-4' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='875' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='512'>
-          <var-decl name='_M_positive_sign_size' type-id='type-id-94' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='876' column='1'/>
+          <var-decl name='_M_positive_sign_size' type-id='type-id-93' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='876' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='576'>
           <var-decl name='_M_negative_sign' type-id='type-id-4' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='877' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='640'>
-          <var-decl name='_M_negative_sign_size' type-id='type-id-94' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='878' column='1'/>
+          <var-decl name='_M_negative_sign_size' type-id='type-id-93' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='878' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='704'>
           <var-decl name='_M_frac_digits' type-id='type-id-6' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='879' column='1'/>
@@ -39533,12 +39496,12 @@
           <var-decl name='_M_atoms' type-id='type-id-2630' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='886' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='888'>
-          <var-decl name='_M_allocated' type-id='type-id-42' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='888' column='1'/>
+          <var-decl name='_M_allocated' type-id='type-id-40' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='888' column='1'/>
         </data-member>
         <member-function access='public'>
           <function-decl name='__moneypunct_cache' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='890' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-2759' is-artificial='yes'/>
-            <parameter type-id='type-id-94'/>
+            <parameter type-id='type-id-93'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
@@ -39566,7 +39529,7 @@
         <member-function access='public'>
           <function-decl name='__moneypunct_cache' mangled-name='_ZNSt18__moneypunct_cacheIcLb1EEC2Em' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='890' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt18__moneypunct_cacheIcLb1EEC1Em@@GLIBCXX_3.4'>
             <parameter type-id='type-id-2759' is-artificial='yes'/>
-            <parameter type-id='type-id-94'/>
+            <parameter type-id='type-id-93'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
@@ -39612,8 +39575,8 @@
         <member-function access='private' const='yes'>
           <function-decl name='_M_put' mangled-name='_ZNKSt11__timepunctIcE6_M_putEPcmPKcPK2tm' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/src/c++98/time_members.cc' line='42' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSt11__timepunctIcE6_M_putEPcmPKcPK2tm@@GLIBCXX_3.4'>
             <parameter type-id='type-id-2838' is-artificial='yes'/>
+            <parameter type-id='type-id-92'/>
             <parameter type-id='type-id-93'/>
-            <parameter type-id='type-id-94'/>
             <parameter type-id='type-id-4'/>
             <parameter type-id='type-id-253'/>
             <return type-id='type-id-5'/>
@@ -39629,7 +39592,7 @@
         <member-function access='private'>
           <function-decl name='__timepunct' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='195' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-2101' is-artificial='yes'/>
-            <parameter type-id='type-id-94'/>
+            <parameter type-id='type-id-93'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
@@ -39637,7 +39600,7 @@
           <function-decl name='__timepunct' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='198' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-2101' is-artificial='yes'/>
             <parameter type-id='type-id-2724'/>
-            <parameter type-id='type-id-94'/>
+            <parameter type-id='type-id-93'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
@@ -39646,7 +39609,7 @@
             <parameter type-id='type-id-2101' is-artificial='yes'/>
             <parameter type-id='type-id-2055'/>
             <parameter type-id='type-id-4'/>
-            <parameter type-id='type-id-94'/>
+            <parameter type-id='type-id-93'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
@@ -39716,7 +39679,7 @@
         <member-function access='private'>
           <function-decl name='__timepunct' mangled-name='_ZNSt11__timepunctIcEC2Em' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='195' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt11__timepunctIcEC2Em@@GLIBCXX_3.4'>
             <parameter type-id='type-id-2101' is-artificial='yes'/>
-            <parameter type-id='type-id-94'/>
+            <parameter type-id='type-id-93'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
@@ -39724,7 +39687,7 @@
           <function-decl name='__timepunct' mangled-name='_ZNSt11__timepunctIcEC2EPSt17__timepunct_cacheIcEm' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='198' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt11__timepunctIcEC1EPSt17__timepunct_cacheIcEm@@GLIBCXX_3.4'>
             <parameter type-id='type-id-2101' is-artificial='yes'/>
             <parameter type-id='type-id-2724'/>
-            <parameter type-id='type-id-94'/>
+            <parameter type-id='type-id-93'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
@@ -39733,7 +39696,7 @@
             <parameter type-id='type-id-2101' is-artificial='yes'/>
             <parameter type-id='type-id-2055'/>
             <parameter type-id='type-id-4'/>
-            <parameter type-id='type-id-94'/>
+            <parameter type-id='type-id-93'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
@@ -39777,7 +39740,7 @@
         <member-function access='private'>
           <function-decl name='messages' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='1723' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-2104' is-artificial='yes'/>
-            <parameter type-id='type-id-94'/>
+            <parameter type-id='type-id-93'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
@@ -39786,7 +39749,7 @@
             <parameter type-id='type-id-2104' is-artificial='yes'/>
             <parameter type-id='type-id-2055'/>
             <parameter type-id='type-id-4'/>
-            <parameter type-id='type-id-94'/>
+            <parameter type-id='type-id-93'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
@@ -39828,20 +39791,20 @@
           <function-decl name='_M_convert_to_char' mangled-name='_ZNKSt8messagesIcE18_M_convert_to_charERKSs' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='1848' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSt8messagesIcE18_M_convert_to_charERKSs@@GLIBCXX_3.4'>
             <parameter type-id='type-id-2840' is-artificial='yes'/>
             <parameter type-id='type-id-2680'/>
-            <return type-id='type-id-93'/>
+            <return type-id='type-id-92'/>
           </function-decl>
         </member-function>
         <member-function access='protected' const='yes'>
           <function-decl name='_M_convert_from_char' mangled-name='_ZNKSt8messagesIcE20_M_convert_from_charEPc' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='1856' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSt8messagesIcE20_M_convert_from_charEPc@@GLIBCXX_3.4'>
             <parameter type-id='type-id-2840' is-artificial='yes'/>
-            <parameter type-id='type-id-93'/>
+            <parameter type-id='type-id-92'/>
             <return type-id='type-id-2678'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='messages' mangled-name='_ZNSt8messagesIcEC2Em' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='1723' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt8messagesIcEC2Em@@GLIBCXX_3.4'>
             <parameter type-id='type-id-2104' is-artificial='yes'/>
-            <parameter type-id='type-id-94'/>
+            <parameter type-id='type-id-93'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
@@ -39850,7 +39813,7 @@
             <parameter type-id='type-id-2104' is-artificial='yes'/>
             <parameter type-id='type-id-2055'/>
             <parameter type-id='type-id-4'/>
-            <parameter type-id='type-id-94'/>
+            <parameter type-id='type-id-93'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
@@ -39922,7 +39885,7 @@
           <function-decl name='numpunct' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='1681' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-2106' is-artificial='yes'/>
             <parameter type-id='type-id-2789'/>
-            <parameter type-id='type-id-94'/>
+            <parameter type-id='type-id-93'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
@@ -39937,7 +39900,7 @@
           <function-decl name='numpunct' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='1695' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-2106' is-artificial='yes'/>
             <parameter type-id='type-id-2055'/>
-            <parameter type-id='type-id-94'/>
+            <parameter type-id='type-id-93'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
@@ -39974,14 +39937,14 @@
         <member-function access='private'>
           <function-decl name='numpunct' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='1667' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-2106' is-artificial='yes'/>
-            <parameter type-id='type-id-94'/>
+            <parameter type-id='type-id-93'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='numpunct' mangled-name='_ZNSt8numpunctIwEC2Em' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='1667' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt8numpunctIwEC1Em@@GLIBCXX_3.4'>
             <parameter type-id='type-id-2106' is-artificial='yes'/>
-            <parameter type-id='type-id-94'/>
+            <parameter type-id='type-id-93'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
@@ -39989,7 +39952,7 @@
           <function-decl name='numpunct' mangled-name='_ZNSt8numpunctIwEC2EPSt16__numpunct_cacheIwEm' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='1681' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt8numpunctIwEC1EPSt16__numpunct_cacheIwEm@@GLIBCXX_3.4'>
             <parameter type-id='type-id-2106' is-artificial='yes'/>
             <parameter type-id='type-id-2789'/>
-            <parameter type-id='type-id-94'/>
+            <parameter type-id='type-id-93'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
@@ -39997,7 +39960,7 @@
           <function-decl name='numpunct' mangled-name='_ZNSt8numpunctIwEC2EP15__locale_structm' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='1695' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt8numpunctIwEC1EP15__locale_structm@@GLIBCXX_3.4'>
             <parameter type-id='type-id-2106' is-artificial='yes'/>
             <parameter type-id='type-id-2055'/>
-            <parameter type-id='type-id-94'/>
+            <parameter type-id='type-id-93'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
@@ -40067,7 +40030,7 @@
         <member-function access='private'>
           <function-decl name='collate' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_classes.h' line='613' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-2109' is-artificial='yes'/>
-            <parameter type-id='type-id-94'/>
+            <parameter type-id='type-id-93'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
@@ -40075,7 +40038,7 @@
           <function-decl name='collate' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_classes.h' line='627' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-2109' is-artificial='yes'/>
             <parameter type-id='type-id-2055'/>
-            <parameter type-id='type-id-94'/>
+            <parameter type-id='type-id-93'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
@@ -40092,8 +40055,8 @@
             <parameter type-id='type-id-2845' is-artificial='yes'/>
             <parameter type-id='type-id-333'/>
             <parameter type-id='type-id-354'/>
-            <parameter type-id='type-id-94'/>
-            <return type-id='type-id-94'/>
+            <parameter type-id='type-id-93'/>
+            <return type-id='type-id-93'/>
           </function-decl>
         </member-function>
         <member-function access='private' const='yes'>
@@ -40119,13 +40082,13 @@
             <parameter type-id='type-id-2845' is-artificial='yes'/>
             <parameter type-id='type-id-354'/>
             <parameter type-id='type-id-354'/>
-            <return type-id='type-id-22'/>
+            <return type-id='type-id-20'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='collate' mangled-name='_ZNSt7collateIwEC2Em' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_classes.h' line='613' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt7collateIwEC1Em@@GLIBCXX_3.4'>
             <parameter type-id='type-id-2109' is-artificial='yes'/>
-            <parameter type-id='type-id-94'/>
+            <parameter type-id='type-id-93'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
@@ -40133,7 +40096,7 @@
           <function-decl name='collate' mangled-name='_ZNSt7collateIwEC2EP15__locale_structm' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_classes.h' line='627' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt7collateIwEC2EP15__locale_structm@@GLIBCXX_3.4'>
             <parameter type-id='type-id-2109' is-artificial='yes'/>
             <parameter type-id='type-id-2055'/>
-            <parameter type-id='type-id-94'/>
+            <parameter type-id='type-id-93'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
@@ -40181,7 +40144,7 @@
             <parameter type-id='type-id-2845' is-artificial='yes'/>
             <parameter type-id='type-id-354'/>
             <parameter type-id='type-id-354'/>
-            <return type-id='type-id-22'/>
+            <return type-id='type-id-20'/>
           </function-decl>
         </member-function>
       </class-decl>
@@ -40210,7 +40173,7 @@
           <function-decl name='moneypunct' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='976' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-2110' is-artificial='yes'/>
             <parameter type-id='type-id-2782'/>
-            <parameter type-id='type-id-94'/>
+            <parameter type-id='type-id-93'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
@@ -40227,14 +40190,14 @@
             <parameter type-id='type-id-2110' is-artificial='yes'/>
             <parameter type-id='type-id-2055'/>
             <parameter type-id='type-id-4'/>
-            <parameter type-id='type-id-94'/>
+            <parameter type-id='type-id-93'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='moneypunct' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='963' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-2110' is-artificial='yes'/>
-            <parameter type-id='type-id-94'/>
+            <parameter type-id='type-id-93'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
@@ -40295,7 +40258,7 @@
         <member-function access='private'>
           <function-decl name='moneypunct' mangled-name='_ZNSt10moneypunctIwLb0EEC2Em' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='963' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt10moneypunctIwLb0EEC1Em@@GLIBCXX_3.4'>
             <parameter type-id='type-id-2110' is-artificial='yes'/>
-            <parameter type-id='type-id-94'/>
+            <parameter type-id='type-id-93'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
@@ -40303,7 +40266,7 @@
           <function-decl name='moneypunct' mangled-name='_ZNSt10moneypunctIwLb0EEC2EPSt18__moneypunct_cacheIwLb0EEm' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='976' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt10moneypunctIwLb0EEC2EPSt18__moneypunct_cacheIwLb0EEm@@GLIBCXX_3.4'>
             <parameter type-id='type-id-2110' is-artificial='yes'/>
             <parameter type-id='type-id-2782'/>
-            <parameter type-id='type-id-94'/>
+            <parameter type-id='type-id-93'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
@@ -40312,7 +40275,7 @@
             <parameter type-id='type-id-2110' is-artificial='yes'/>
             <parameter type-id='type-id-2055'/>
             <parameter type-id='type-id-4'/>
-            <parameter type-id='type-id-94'/>
+            <parameter type-id='type-id-93'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
@@ -40398,10 +40361,10 @@
           <var-decl name='_M_grouping' type-id='type-id-4' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='868' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='192'>
-          <var-decl name='_M_grouping_size' type-id='type-id-94' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='869' column='1'/>
+          <var-decl name='_M_grouping_size' type-id='type-id-93' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='869' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='256'>
-          <var-decl name='_M_use_grouping' type-id='type-id-42' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='870' column='1'/>
+          <var-decl name='_M_use_grouping' type-id='type-id-40' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='870' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='288'>
           <var-decl name='_M_decimal_point' type-id='type-id-375' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='871' column='1'/>
@@ -40413,19 +40376,19 @@
           <var-decl name='_M_curr_symbol' type-id='type-id-354' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='873' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='448'>
-          <var-decl name='_M_curr_symbol_size' type-id='type-id-94' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='874' column='1'/>
+          <var-decl name='_M_curr_symbol_size' type-id='type-id-93' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='874' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='512'>
           <var-decl name='_M_positive_sign' type-id='type-id-354' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='875' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='576'>
-          <var-decl name='_M_positive_sign_size' type-id='type-id-94' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='876' column='1'/>
+          <var-decl name='_M_positive_sign_size' type-id='type-id-93' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='876' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='640'>
           <var-decl name='_M_negative_sign' type-id='type-id-354' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='877' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='704'>
-          <var-decl name='_M_negative_sign_size' type-id='type-id-94' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='878' column='1'/>
+          <var-decl name='_M_negative_sign_size' type-id='type-id-93' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='878' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='768'>
           <var-decl name='_M_frac_digits' type-id='type-id-6' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='879' column='1'/>
@@ -40440,12 +40403,12 @@
           <var-decl name='_M_atoms' type-id='type-id-2849' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='886' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='1216'>
-          <var-decl name='_M_allocated' type-id='type-id-42' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='888' column='1'/>
+          <var-decl name='_M_allocated' type-id='type-id-40' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='888' column='1'/>
         </data-member>
         <member-function access='public'>
           <function-decl name='__moneypunct_cache' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='890' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-2761' is-artificial='yes'/>
-            <parameter type-id='type-id-94'/>
+            <parameter type-id='type-id-93'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
@@ -40473,7 +40436,7 @@
         <member-function access='public'>
           <function-decl name='__moneypunct_cache' mangled-name='_ZNSt18__moneypunct_cacheIwLb0EEC2Em' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='890' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt18__moneypunct_cacheIwLb0EEC2Em@@GLIBCXX_3.4'>
             <parameter type-id='type-id-2761' is-artificial='yes'/>
-            <parameter type-id='type-id-94'/>
+            <parameter type-id='type-id-93'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
@@ -40524,7 +40487,7 @@
           <function-decl name='moneypunct' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='976' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-2111' is-artificial='yes'/>
             <parameter type-id='type-id-2785'/>
-            <parameter type-id='type-id-94'/>
+            <parameter type-id='type-id-93'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
@@ -40541,14 +40504,14 @@
             <parameter type-id='type-id-2111' is-artificial='yes'/>
             <parameter type-id='type-id-2055'/>
             <parameter type-id='type-id-4'/>
-            <parameter type-id='type-id-94'/>
+            <parameter type-id='type-id-93'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='moneypunct' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='963' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-2111' is-artificial='yes'/>
-            <parameter type-id='type-id-94'/>
+            <parameter type-id='type-id-93'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
@@ -40609,7 +40572,7 @@
         <member-function access='private'>
           <function-decl name='moneypunct' mangled-name='_ZNSt10moneypunctIwLb1EEC2Em' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='963' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt10moneypunctIwLb1EEC1Em@@GLIBCXX_3.4'>
             <parameter type-id='type-id-2111' is-artificial='yes'/>
-            <parameter type-id='type-id-94'/>
+            <parameter type-id='type-id-93'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
@@ -40617,7 +40580,7 @@
           <function-decl name='moneypunct' mangled-name='_ZNSt10moneypunctIwLb1EEC2EPSt18__moneypunct_cacheIwLb1EEm' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='976' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt10moneypunctIwLb1EEC1EPSt18__moneypunct_cacheIwLb1EEm@@GLIBCXX_3.4'>
             <parameter type-id='type-id-2111' is-artificial='yes'/>
             <parameter type-id='type-id-2785'/>
-            <parameter type-id='type-id-94'/>
+            <parameter type-id='type-id-93'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
@@ -40626,7 +40589,7 @@
             <parameter type-id='type-id-2111' is-artificial='yes'/>
             <parameter type-id='type-id-2055'/>
             <parameter type-id='type-id-4'/>
-            <parameter type-id='type-id-94'/>
+            <parameter type-id='type-id-93'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
@@ -40712,10 +40675,10 @@
           <var-decl name='_M_grouping' type-id='type-id-4' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='868' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='192'>
-          <var-decl name='_M_grouping_size' type-id='type-id-94' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='869' column='1'/>
+          <var-decl name='_M_grouping_size' type-id='type-id-93' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='869' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='256'>
-          <var-decl name='_M_use_grouping' type-id='type-id-42' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='870' column='1'/>
+          <var-decl name='_M_use_grouping' type-id='type-id-40' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='870' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='288'>
           <var-decl name='_M_decimal_point' type-id='type-id-375' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='871' column='1'/>
@@ -40727,19 +40690,19 @@
           <var-decl name='_M_curr_symbol' type-id='type-id-354' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='873' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='448'>
-          <var-decl name='_M_curr_symbol_size' type-id='type-id-94' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='874' column='1'/>
+          <var-decl name='_M_curr_symbol_size' type-id='type-id-93' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='874' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='512'>
           <var-decl name='_M_positive_sign' type-id='type-id-354' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='875' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='576'>
-          <var-decl name='_M_positive_sign_size' type-id='type-id-94' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='876' column='1'/>
+          <var-decl name='_M_positive_sign_size' type-id='type-id-93' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='876' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='640'>
           <var-decl name='_M_negative_sign' type-id='type-id-354' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='877' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='704'>
-          <var-decl name='_M_negative_sign_size' type-id='type-id-94' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='878' column='1'/>
+          <var-decl name='_M_negative_sign_size' type-id='type-id-93' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='878' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='768'>
           <var-decl name='_M_frac_digits' type-id='type-id-6' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='879' column='1'/>
@@ -40754,12 +40717,12 @@
           <var-decl name='_M_atoms' type-id='type-id-2849' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='886' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='1216'>
-          <var-decl name='_M_allocated' type-id='type-id-42' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='888' column='1'/>
+          <var-decl name='_M_allocated' type-id='type-id-40' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='888' column='1'/>
         </data-member>
         <member-function access='public'>
           <function-decl name='__moneypunct_cache' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='890' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-2763' is-artificial='yes'/>
-            <parameter type-id='type-id-94'/>
+            <parameter type-id='type-id-93'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
@@ -40787,7 +40750,7 @@
         <member-function access='public'>
           <function-decl name='__moneypunct_cache' mangled-name='_ZNSt18__moneypunct_cacheIwLb1EEC2Em' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='890' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt18__moneypunct_cacheIwLb1EEC2Em@@GLIBCXX_3.4'>
             <parameter type-id='type-id-2763' is-artificial='yes'/>
-            <parameter type-id='type-id-94'/>
+            <parameter type-id='type-id-93'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
@@ -40834,7 +40797,7 @@
           <function-decl name='_M_put' mangled-name='_ZNKSt11__timepunctIwE6_M_putEPwmPKwPK2tm' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/src/c++98/time_members.cc' line='198' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSt11__timepunctIwE6_M_putEPwmPKwPK2tm@@GLIBCXX_3.4'>
             <parameter type-id='type-id-2859' is-artificial='yes'/>
             <parameter type-id='type-id-333'/>
-            <parameter type-id='type-id-94'/>
+            <parameter type-id='type-id-93'/>
             <parameter type-id='type-id-354'/>
             <parameter type-id='type-id-253'/>
             <return type-id='type-id-5'/>
@@ -40850,7 +40813,7 @@
         <member-function access='private'>
           <function-decl name='__timepunct' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='195' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-2114' is-artificial='yes'/>
-            <parameter type-id='type-id-94'/>
+            <parameter type-id='type-id-93'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
@@ -40858,7 +40821,7 @@
           <function-decl name='__timepunct' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='198' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-2114' is-artificial='yes'/>
             <parameter type-id='type-id-2858'/>
-            <parameter type-id='type-id-94'/>
+            <parameter type-id='type-id-93'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
@@ -40867,7 +40830,7 @@
             <parameter type-id='type-id-2114' is-artificial='yes'/>
             <parameter type-id='type-id-2055'/>
             <parameter type-id='type-id-4'/>
-            <parameter type-id='type-id-94'/>
+            <parameter type-id='type-id-93'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
@@ -40937,7 +40900,7 @@
         <member-function access='private'>
           <function-decl name='__timepunct' mangled-name='_ZNSt11__timepunctIwEC2Em' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='195' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt11__timepunctIwEC1Em@@GLIBCXX_3.4'>
             <parameter type-id='type-id-2114' is-artificial='yes'/>
-            <parameter type-id='type-id-94'/>
+            <parameter type-id='type-id-93'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
@@ -40945,7 +40908,7 @@
           <function-decl name='__timepunct' mangled-name='_ZNSt11__timepunctIwEC2EPSt17__timepunct_cacheIwEm' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='198' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt11__timepunctIwEC1EPSt17__timepunct_cacheIwEm@@GLIBCXX_3.4'>
             <parameter type-id='type-id-2114' is-artificial='yes'/>
             <parameter type-id='type-id-2858'/>
-            <parameter type-id='type-id-94'/>
+            <parameter type-id='type-id-93'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
@@ -40954,7 +40917,7 @@
             <parameter type-id='type-id-2114' is-artificial='yes'/>
             <parameter type-id='type-id-2055'/>
             <parameter type-id='type-id-4'/>
-            <parameter type-id='type-id-94'/>
+            <parameter type-id='type-id-93'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
@@ -40999,20 +40962,20 @@
           <function-decl name='_M_convert_to_char' mangled-name='_ZNKSt8messagesIwE18_M_convert_to_charERKSbIwSt11char_traitsIwESaIwEE' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='1848' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSt8messagesIwE18_M_convert_to_charERKSbIwSt11char_traitsIwESaIwEE@@GLIBCXX_3.4'>
             <parameter type-id='type-id-2861' is-artificial='yes'/>
             <parameter type-id='type-id-2862'/>
-            <return type-id='type-id-93'/>
+            <return type-id='type-id-92'/>
           </function-decl>
         </member-function>
         <member-function access='protected' const='yes'>
           <function-decl name='_M_convert_from_char' mangled-name='_ZNKSt8messagesIwE20_M_convert_from_charEPc' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='1856' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSt8messagesIwE20_M_convert_from_charEPc@@GLIBCXX_3.4'>
             <parameter type-id='type-id-2861' is-artificial='yes'/>
-            <parameter type-id='type-id-93'/>
+            <parameter type-id='type-id-92'/>
             <return type-id='type-id-2860'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='messages' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='1723' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-2117' is-artificial='yes'/>
-            <parameter type-id='type-id-94'/>
+            <parameter type-id='type-id-93'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
@@ -41021,7 +40984,7 @@
             <parameter type-id='type-id-2117' is-artificial='yes'/>
             <parameter type-id='type-id-2055'/>
             <parameter type-id='type-id-4'/>
-            <parameter type-id='type-id-94'/>
+            <parameter type-id='type-id-93'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
@@ -41062,7 +41025,7 @@
         <member-function access='private'>
           <function-decl name='messages' mangled-name='_ZNSt8messagesIwEC2Em' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='1723' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt8messagesIwEC1Em@@GLIBCXX_3.4'>
             <parameter type-id='type-id-2117' is-artificial='yes'/>
-            <parameter type-id='type-id-94'/>
+            <parameter type-id='type-id-93'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
@@ -41071,7 +41034,7 @@
             <parameter type-id='type-id-2117' is-artificial='yes'/>
             <parameter type-id='type-id-2055'/>
             <parameter type-id='type-id-4'/>
-            <parameter type-id='type-id-94'/>
+            <parameter type-id='type-id-93'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
@@ -41269,12 +41232,12 @@
           <var-decl name='_M_amonth12' type-id='type-id-4' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='118' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='3136'>
-          <var-decl name='_M_allocated' type-id='type-id-42' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='120' column='1'/>
+          <var-decl name='_M_allocated' type-id='type-id-40' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='120' column='1'/>
         </data-member>
         <member-function access='public'>
           <function-decl name='__timepunct_cache' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='122' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-2769' is-artificial='yes'/>
-            <parameter type-id='type-id-94'/>
+            <parameter type-id='type-id-93'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
@@ -41302,7 +41265,7 @@
         <member-function access='public'>
           <function-decl name='__timepunct_cache' mangled-name='_ZNSt17__timepunct_cacheIcEC2Em' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='122' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt17__timepunct_cacheIcEC1Em@@GLIBCXX_3.4'>
             <parameter type-id='type-id-2769' is-artificial='yes'/>
-            <parameter type-id='type-id-94'/>
+            <parameter type-id='type-id-93'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
@@ -41475,12 +41438,12 @@
           <var-decl name='_M_amonth12' type-id='type-id-354' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='118' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='3136'>
-          <var-decl name='_M_allocated' type-id='type-id-42' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='120' column='1'/>
+          <var-decl name='_M_allocated' type-id='type-id-40' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='120' column='1'/>
         </data-member>
         <member-function access='public'>
           <function-decl name='__timepunct_cache' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='122' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-2771' is-artificial='yes'/>
-            <parameter type-id='type-id-94'/>
+            <parameter type-id='type-id-93'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
@@ -41508,7 +41471,7 @@
         <member-function access='public'>
           <function-decl name='__timepunct_cache' mangled-name='_ZNSt17__timepunct_cacheIwEC2Em' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='122' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt17__timepunct_cacheIwEC1Em@@GLIBCXX_3.4'>
             <parameter type-id='type-id-2771' is-artificial='yes'/>
-            <parameter type-id='type-id-94'/>
+            <parameter type-id='type-id-93'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
@@ -41582,11 +41545,11 @@
       <return type-id='type-id-643'/>
     </function-decl>
     <function-decl name='fwrite' filepath='/usr/include/stdio.h' line='710' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-36'/>
-      <parameter type-id='type-id-92'/>
-      <parameter type-id='type-id-92'/>
+      <parameter type-id='type-id-34'/>
+      <parameter type-id='type-id-91'/>
+      <parameter type-id='type-id-91'/>
       <parameter type-id='type-id-185'/>
-      <return type-id='type-id-92'/>
+      <return type-id='type-id-91'/>
     </function-decl>
     <function-decl name='putc' filepath='/usr/include/stdio.h' line='578' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-6'/>
@@ -41636,25 +41599,25 @@
         <member-type access='public'>
           <class-decl name='_Tune' size-in-bits='448' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ext/mt_allocator.h' line='57' column='1' id='type-id-2900'>
             <data-member access='public' layout-offset-in-bits='0'>
-              <var-decl name='_M_align' type-id='type-id-94' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ext/mt_allocator.h' line='70' column='1'/>
+              <var-decl name='_M_align' type-id='type-id-93' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ext/mt_allocator.h' line='70' column='1'/>
             </data-member>
             <data-member access='public' layout-offset-in-bits='64'>
-              <var-decl name='_M_max_bytes' type-id='type-id-94' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ext/mt_allocator.h' line='77' column='1'/>
+              <var-decl name='_M_max_bytes' type-id='type-id-93' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ext/mt_allocator.h' line='77' column='1'/>
             </data-member>
             <data-member access='public' layout-offset-in-bits='128'>
-              <var-decl name='_M_min_bin' type-id='type-id-94' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ext/mt_allocator.h' line='82' column='1'/>
+              <var-decl name='_M_min_bin' type-id='type-id-93' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ext/mt_allocator.h' line='82' column='1'/>
             </data-member>
             <data-member access='public' layout-offset-in-bits='192'>
-              <var-decl name='_M_chunk_size' type-id='type-id-94' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ext/mt_allocator.h' line='90' column='1'/>
+              <var-decl name='_M_chunk_size' type-id='type-id-93' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ext/mt_allocator.h' line='90' column='1'/>
             </data-member>
             <data-member access='public' layout-offset-in-bits='256'>
-              <var-decl name='_M_max_threads' type-id='type-id-94' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ext/mt_allocator.h' line='98' column='1'/>
+              <var-decl name='_M_max_threads' type-id='type-id-93' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ext/mt_allocator.h' line='98' column='1'/>
             </data-member>
             <data-member access='public' layout-offset-in-bits='320'>
-              <var-decl name='_M_freelist_headroom' type-id='type-id-94' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ext/mt_allocator.h' line='106' column='1'/>
+              <var-decl name='_M_freelist_headroom' type-id='type-id-93' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ext/mt_allocator.h' line='106' column='1'/>
             </data-member>
             <data-member access='public' layout-offset-in-bits='384'>
-              <var-decl name='_M_force_new' type-id='type-id-42' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ext/mt_allocator.h' line='109' column='1'/>
+              <var-decl name='_M_force_new' type-id='type-id-40' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ext/mt_allocator.h' line='109' column='1'/>
             </data-member>
             <member-function access='public' constructor='yes'>
               <function-decl name='_Tune' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ext/mt_allocator.h' line='112' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -41665,13 +41628,13 @@
             <member-function access='public' constructor='yes'>
               <function-decl name='_Tune' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ext/mt_allocator.h' line='120' column='1' visibility='default' binding='global' size-in-bits='64'>
                 <parameter type-id='type-id-2901' is-artificial='yes'/>
-                <parameter type-id='type-id-94'/>
-                <parameter type-id='type-id-94'/>
-                <parameter type-id='type-id-94'/>
-                <parameter type-id='type-id-94'/>
-                <parameter type-id='type-id-94'/>
-                <parameter type-id='type-id-94'/>
-                <parameter type-id='type-id-42'/>
+                <parameter type-id='type-id-93'/>
+                <parameter type-id='type-id-93'/>
+                <parameter type-id='type-id-93'/>
+                <parameter type-id='type-id-93'/>
+                <parameter type-id='type-id-93'/>
+                <parameter type-id='type-id-93'/>
+                <parameter type-id='type-id-40'/>
                 <return type-id='type-id-5'/>
               </function-decl>
             </member-function>
@@ -41680,7 +41643,7 @@
         <member-type access='public'>
           <class-decl name='_Block_address' size-in-bits='128' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ext/mt_allocator.h' line='128' column='1' id='type-id-2898'>
             <data-member access='public' layout-offset-in-bits='0'>
-              <var-decl name='_M_initial' type-id='type-id-36' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ext/mt_allocator.h' line='130' column='1'/>
+              <var-decl name='_M_initial' type-id='type-id-34' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ext/mt_allocator.h' line='130' column='1'/>
             </data-member>
             <data-member access='public' layout-offset-in-bits='64'>
               <var-decl name='_M_next' type-id='type-id-2899' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ext/mt_allocator.h' line='131' column='1'/>
@@ -41697,7 +41660,7 @@
           <var-decl name='_M_binmap' type-id='type-id-2897' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ext/mt_allocator.h' line='176' column='1'/>
         </data-member>
         <data-member access='protected' layout-offset-in-bits='512'>
-          <var-decl name='_M_init' type-id='type-id-42' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ext/mt_allocator.h' line='181' column='1'/>
+          <var-decl name='_M_init' type-id='type-id-40' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ext/mt_allocator.h' line='181' column='1'/>
         </data-member>
         <member-function access='public' const='yes'>
           <function-decl name='_M_get_options' mangled-name='_ZNK9__gnu_cxx11__pool_base14_M_get_optionsEv' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ext/mt_allocator.h' line='135' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -41715,21 +41678,21 @@
         <member-function access='public'>
           <function-decl name='_M_check_threshold' mangled-name='_ZN9__gnu_cxx11__pool_base18_M_check_thresholdEm' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ext/mt_allocator.h' line='146' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-2895' is-artificial='yes'/>
-            <parameter type-id='type-id-94'/>
-            <return type-id='type-id-42'/>
+            <parameter type-id='type-id-93'/>
+            <return type-id='type-id-40'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_M_get_binmap' mangled-name='_ZN9__gnu_cxx11__pool_base13_M_get_binmapEm' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ext/mt_allocator.h' line='150' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-2895' is-artificial='yes'/>
-            <parameter type-id='type-id-94'/>
-            <return type-id='type-id-94'/>
+            <parameter type-id='type-id-93'/>
+            <return type-id='type-id-93'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_M_get_align' mangled-name='_ZN9__gnu_cxx11__pool_base12_M_get_alignEv' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ext/mt_allocator.h' line='154' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-2895' is-artificial='yes'/>
-            <return type-id='type-id-94'/>
+            <return type-id='type-id-93'/>
           </function-decl>
         </member-function>
         <member-function access='public' constructor='yes'>
@@ -41768,7 +41731,7 @@
               <var-decl name='_M_next' type-id='type-id-2892' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ext/mt_allocator.h' line='276' column='1'/>
             </data-member>
             <data-member access='public' layout-offset-in-bits='64'>
-              <var-decl name='_M_id' type-id='type-id-94' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ext/mt_allocator.h' line='279' column='1'/>
+              <var-decl name='_M_id' type-id='type-id-93' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ext/mt_allocator.h' line='279' column='1'/>
             </data-member>
           </class-decl>
         </member-type>
@@ -41778,7 +41741,7 @@
               <var-decl name='_M_next' type-id='type-id-2889' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ext/mt_allocator.h' line='285' column='1'/>
             </data-member>
             <data-member access='private'>
-              <var-decl name='_M_thread_id' type-id='type-id-94' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ext/mt_allocator.h' line='288' column='1'/>
+              <var-decl name='_M_thread_id' type-id='type-id-93' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ext/mt_allocator.h' line='288' column='1'/>
             </data-member>
           </union-decl>
         </member-type>
@@ -41797,7 +41760,7 @@
               <var-decl name='_M_used' type-id='type-id-1967' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ext/mt_allocator.h' line='311' column='1'/>
             </data-member>
             <data-member access='public' layout-offset-in-bits='256'>
-              <var-decl name='_M_mutex' type-id='type-id-71' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ext/mt_allocator.h' line='316' column='1'/>
+              <var-decl name='_M_mutex' type-id='type-id-69' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ext/mt_allocator.h' line='316' column='1'/>
             </data-member>
           </class-decl>
         </member-type>
@@ -41805,13 +41768,13 @@
           <var-decl name='_M_bin' type-id='type-id-2887' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ext/mt_allocator.h' line='375' column='1'/>
         </data-member>
         <data-member access='private' layout-offset-in-bits='640'>
-          <var-decl name='_M_bin_size' type-id='type-id-94' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ext/mt_allocator.h' line='378' column='1'/>
+          <var-decl name='_M_bin_size' type-id='type-id-93' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ext/mt_allocator.h' line='378' column='1'/>
         </data-member>
         <data-member access='private' layout-offset-in-bits='704'>
           <var-decl name='_M_thread_freelist' type-id='type-id-2892' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ext/mt_allocator.h' line='380' column='1'/>
         </data-member>
         <data-member access='private' layout-offset-in-bits='768'>
-          <var-decl name='_M_thread_freelist_initial' type-id='type-id-36' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ext/mt_allocator.h' line='381' column='1'/>
+          <var-decl name='_M_thread_freelist_initial' type-id='type-id-34' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ext/mt_allocator.h' line='381' column='1'/>
         </data-member>
         <member-function access='private'>
           <function-decl name='_M_initialize' mangled-name='_ZN9__gnu_cxx6__poolILb1EE13_M_initializeEPFvPvE' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ext/mt_allocator.h' line='321' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN9__gnu_cxx6__poolILb1EE13_M_initializeEPFvPvE@@GLIBCXX_3.4.4'>
@@ -41835,23 +41798,23 @@
         <member-function access='private'>
           <function-decl name='_M_reserve_block' mangled-name='_ZN9__gnu_cxx6__poolILb1EE16_M_reserve_blockEmm' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ext/mt_allocator.h' line='334' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN9__gnu_cxx6__poolILb1EE16_M_reserve_blockEmm@@GLIBCXX_3.4.4'>
             <parameter type-id='type-id-2885' is-artificial='yes'/>
-            <parameter type-id='type-id-94'/>
-            <parameter type-id='type-id-94'/>
-            <return type-id='type-id-93'/>
+            <parameter type-id='type-id-93'/>
+            <parameter type-id='type-id-93'/>
+            <return type-id='type-id-92'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='_M_reclaim_block' mangled-name='_ZN9__gnu_cxx6__poolILb1EE16_M_reclaim_blockEPcm' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ext/mt_allocator.h' line='337' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN9__gnu_cxx6__poolILb1EE16_M_reclaim_blockEPcm@@GLIBCXX_3.4.4'>
             <parameter type-id='type-id-2885' is-artificial='yes'/>
+            <parameter type-id='type-id-92'/>
             <parameter type-id='type-id-93'/>
-            <parameter type-id='type-id-94'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='_M_get_bin' mangled-name='_ZN9__gnu_cxx6__poolILb1EE10_M_get_binEm' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ext/mt_allocator.h' line='340' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-2885' is-artificial='yes'/>
-            <parameter type-id='type-id-94'/>
+            <parameter type-id='type-id-93'/>
             <return type-id='type-id-2913'/>
           </function-decl>
         </member-function>
@@ -41860,21 +41823,21 @@
             <parameter type-id='type-id-2885' is-artificial='yes'/>
             <parameter type-id='type-id-2913'/>
             <parameter type-id='type-id-2889'/>
-            <parameter type-id='type-id-94'/>
+            <parameter type-id='type-id-93'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='_M_destroy_thread_key' mangled-name='_ZN9__gnu_cxx6__poolILb1EE21_M_destroy_thread_keyEPv' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ext/mt_allocator.h' line='357' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN9__gnu_cxx6__poolILb1EE21_M_destroy_thread_keyEPv@@GLIBCXX_3.4.4'>
             <parameter type-id='type-id-2885' is-artificial='yes'/>
-            <parameter type-id='type-id-36'/>
+            <parameter type-id='type-id-34'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='_M_get_thread_id' mangled-name='_ZN9__gnu_cxx6__poolILb1EE16_M_get_thread_idEv' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ext/mt_allocator.h' line='360' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN9__gnu_cxx6__poolILb1EE16_M_get_thread_idEv@@GLIBCXX_3.4.4'>
             <parameter type-id='type-id-2885' is-artificial='yes'/>
-            <return type-id='type-id-94'/>
+            <return type-id='type-id-93'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
@@ -41897,13 +41860,13 @@
           </function-decl>
         </member-function>
       </class-decl>
-      <typedef-decl name='__destroy_handler' type-id='type-id-88' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ext/mt_allocator.h' line='46' column='1' id='type-id-2919'/>
+      <typedef-decl name='__destroy_handler' type-id='type-id-87' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ext/mt_allocator.h' line='46' column='1' id='type-id-2919'/>
       <class-decl name='__mt_alloc_base&lt;char&gt;' size-in-bits='8' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ext/mt_allocator.h' line='568' column='1' id='type-id-2873'>
         <member-type access='private'>
-          <typedef-decl name='size_type' type-id='type-id-94' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ext/mt_allocator.h' line='571' column='1' id='type-id-2920'/>
+          <typedef-decl name='size_type' type-id='type-id-93' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ext/mt_allocator.h' line='571' column='1' id='type-id-2920'/>
         </member-type>
         <member-type access='private'>
-          <typedef-decl name='pointer' type-id='type-id-93' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ext/mt_allocator.h' line='573' column='1' id='type-id-2921'/>
+          <typedef-decl name='pointer' type-id='type-id-92' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ext/mt_allocator.h' line='573' column='1' id='type-id-2921'/>
         </member-type>
         <member-type access='private'>
           <typedef-decl name='const_pointer' type-id='type-id-4' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ext/mt_allocator.h' line='574' column='1' id='type-id-2922'/>
@@ -41952,7 +41915,7 @@
       </class-decl>
       <class-decl name='__mt_alloc_base&lt;wchar_t&gt;' size-in-bits='8' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ext/mt_allocator.h' line='568' column='1' id='type-id-2875'>
         <member-type access='private'>
-          <typedef-decl name='size_type' type-id='type-id-94' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ext/mt_allocator.h' line='571' column='1' id='type-id-2925'/>
+          <typedef-decl name='size_type' type-id='type-id-93' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ext/mt_allocator.h' line='571' column='1' id='type-id-2925'/>
         </member-type>
         <member-type access='private'>
           <typedef-decl name='pointer' type-id='type-id-333' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ext/mt_allocator.h' line='573' column='1' id='type-id-2926'/>
@@ -42048,7 +42011,7 @@
           <var-decl name='_M_bin' type-id='type-id-2880' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ext/mt_allocator.h' line='249' column='1'/>
         </data-member>
         <data-member access='private' layout-offset-in-bits='640'>
-          <var-decl name='_M_bin_size' type-id='type-id-94' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ext/mt_allocator.h' line='252' column='1'/>
+          <var-decl name='_M_bin_size' type-id='type-id-93' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ext/mt_allocator.h' line='252' column='1'/>
         </data-member>
         <member-function access='private'>
           <function-decl name='_M_initialize_once' mangled-name='_ZN9__gnu_cxx6__poolILb0EE18_M_initialize_onceEv' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ext/mt_allocator.h' line='213' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -42065,29 +42028,29 @@
         <member-function access='private'>
           <function-decl name='_M_reserve_block' mangled-name='_ZN9__gnu_cxx6__poolILb0EE16_M_reserve_blockEmm' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ext/mt_allocator.h' line='223' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN9__gnu_cxx6__poolILb0EE16_M_reserve_blockEmm@@GLIBCXX_3.4.4'>
             <parameter type-id='type-id-2878' is-artificial='yes'/>
-            <parameter type-id='type-id-94'/>
-            <parameter type-id='type-id-94'/>
-            <return type-id='type-id-93'/>
+            <parameter type-id='type-id-93'/>
+            <parameter type-id='type-id-93'/>
+            <return type-id='type-id-92'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='_M_reclaim_block' mangled-name='_ZN9__gnu_cxx6__poolILb0EE16_M_reclaim_blockEPcm' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ext/mt_allocator.h' line='226' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN9__gnu_cxx6__poolILb0EE16_M_reclaim_blockEPcm@@GLIBCXX_3.4.4'>
             <parameter type-id='type-id-2878' is-artificial='yes'/>
+            <parameter type-id='type-id-92'/>
             <parameter type-id='type-id-93'/>
-            <parameter type-id='type-id-94'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='_M_get_thread_id' mangled-name='_ZN9__gnu_cxx6__poolILb0EE16_M_get_thread_idEv' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ext/mt_allocator.h' line='229' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-2878' is-artificial='yes'/>
-            <return type-id='type-id-94'/>
+            <return type-id='type-id-93'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='_M_get_bin' mangled-name='_ZN9__gnu_cxx6__poolILb0EE10_M_get_binEm' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ext/mt_allocator.h' line='232' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-2878' is-artificial='yes'/>
-            <parameter type-id='type-id-94'/>
+            <parameter type-id='type-id-93'/>
             <return type-id='type-id-2911'/>
           </function-decl>
         </member-function>
@@ -42096,7 +42059,7 @@
             <parameter type-id='type-id-2878' is-artificial='yes'/>
             <parameter type-id='type-id-2911'/>
             <parameter type-id='type-id-2882'/>
-            <parameter type-id='type-id-94'/>
+            <parameter type-id='type-id-93'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
@@ -42123,10 +42086,10 @@
       <class-decl name='__mt_alloc&lt;char, __gnu_cxx::__common_pool_policy&lt;__gnu_cxx::__pool, true&gt; &gt;' size-in-bits='8' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ext/mt_allocator.h' line='631' column='1' id='type-id-2869'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-2873'/>
         <member-type access='private'>
-          <typedef-decl name='size_type' type-id='type-id-94' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ext/mt_allocator.h' line='634' column='1' id='type-id-2932'/>
+          <typedef-decl name='size_type' type-id='type-id-93' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ext/mt_allocator.h' line='634' column='1' id='type-id-2932'/>
         </member-type>
         <member-type access='private'>
-          <typedef-decl name='pointer' type-id='type-id-93' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ext/mt_allocator.h' line='636' column='1' id='type-id-2933'/>
+          <typedef-decl name='pointer' type-id='type-id-92' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ext/mt_allocator.h' line='636' column='1' id='type-id-2933'/>
         </member-type>
         <member-type access='private'>
           <typedef-decl name='__pool_type' type-id='type-id-2867' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ext/mt_allocator.h' line='642' column='1' id='type-id-2934'/>
@@ -42155,7 +42118,7 @@
           <function-decl name='allocate' mangled-name='_ZN9__gnu_cxx10__mt_allocIcNS_20__common_pool_policyINS_6__poolELb1EEEE8allocateEmPKv' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ext/mt_allocator.h' line='680' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-2870' is-artificial='yes'/>
             <parameter type-id='type-id-2932'/>
-            <parameter type-id='type-id-36'/>
+            <parameter type-id='type-id-34'/>
             <return type-id='type-id-2933'/>
           </function-decl>
         </member-function>
@@ -42204,7 +42167,7 @@
       <class-decl name='__mt_alloc&lt;wchar_t, __gnu_cxx::__common_pool_policy&lt;__gnu_cxx::__pool, true&gt; &gt;' size-in-bits='8' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ext/mt_allocator.h' line='631' column='1' id='type-id-2871'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-2875'/>
         <member-type access='private'>
-          <typedef-decl name='size_type' type-id='type-id-94' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ext/mt_allocator.h' line='634' column='1' id='type-id-2935'/>
+          <typedef-decl name='size_type' type-id='type-id-93' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ext/mt_allocator.h' line='634' column='1' id='type-id-2935'/>
         </member-type>
         <member-type access='private'>
           <typedef-decl name='pointer' type-id='type-id-333' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ext/mt_allocator.h' line='636' column='1' id='type-id-2936'/>
@@ -42236,7 +42199,7 @@
           <function-decl name='allocate' mangled-name='_ZN9__gnu_cxx10__mt_allocIwNS_20__common_pool_policyINS_6__poolELb1EEEE8allocateEmPKv' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ext/mt_allocator.h' line='680' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-2872' is-artificial='yes'/>
             <parameter type-id='type-id-2935'/>
-            <parameter type-id='type-id-36'/>
+            <parameter type-id='type-id-34'/>
             <return type-id='type-id-2936'/>
           </function-decl>
         </member-function>
@@ -42404,7 +42367,7 @@
       </function-decl>
       <function-decl name='operator&lt;&lt; &lt;std::char_traits&lt;char&gt; &gt;' mangled-name='_ZStlsISt11char_traitsIcEERSt13basic_ostreamIcT_ES5_h' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ostream' line='491' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZStlsISt11char_traitsIcEERSt13basic_ostreamIcT_ES5_h@@GLIBCXX_3.4'>
         <parameter type-id='type-id-2203'/>
-        <parameter type-id='type-id-82'/>
+        <parameter type-id='type-id-80'/>
         <return type-id='type-id-2203'/>
       </function-decl>
       <function-decl name='operator&lt;&lt; &lt;std::char_traits&lt;char&gt; &gt;' mangled-name='_ZStlsISt11char_traitsIcEERSt13basic_ostreamIcT_ES5_PKa' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ostream' line='541' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZStlsISt11char_traitsIcEERSt13basic_ostreamIcT_ES5_PKa@@GLIBCXX_3.4'>
@@ -42414,7 +42377,7 @@
       </function-decl>
       <function-decl name='operator&lt;&lt; &lt;std::char_traits&lt;char&gt; &gt;' mangled-name='_ZStlsISt11char_traitsIcEERSt13basic_ostreamIcT_ES5_PKh' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ostream' line='546' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZStlsISt11char_traitsIcEERSt13basic_ostreamIcT_ES5_PKh@@GLIBCXX_3.4'>
         <parameter type-id='type-id-2203'/>
-        <parameter type-id='type-id-84'/>
+        <parameter type-id='type-id-82'/>
         <return type-id='type-id-2203'/>
       </function-decl>
       <function-decl name='__copy_streambufs&lt;wchar_t, std::char_traits&lt;wchar_t&gt; &gt;' mangled-name='_ZSt17__copy_streambufsIwSt11char_traitsIwEElPSt15basic_streambufIT_T0_ES6_' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/streambuf.tcc' line='140' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt17__copy_streambufsIwSt11char_traitsIwEElPSt15basic_streambufIT_T0_ES6_@@GLIBCXX_3.4.8'>
@@ -42512,7 +42475,7 @@
     </function-type>
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='../../../.././libstdc++-v3/src/c++98/parallel_settings.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/src/c++98' language='LANG_C_plus_plus'>
-    <typedef-decl name='uint64_t' type-id='type-id-51' filepath='/usr/include/stdint.h' line='56' column='1' id='type-id-2955'/>
+    <typedef-decl name='uint64_t' type-id='type-id-49' filepath='/usr/include/stdint.h' line='56' column='1' id='type-id-2955'/>
     <reference-type-def kind='lvalue' type-id='type-id-2956' size-in-bits='64' id='type-id-2957'/>
     <pointer-type-def type-id='type-id-2956' size-in-bits='64' id='type-id-2958'/>
     <qualified-type-def type-id='type-id-2956' const='yes' id='type-id-2959'/>
@@ -42547,7 +42510,7 @@
           <var-decl name='accumulate_minimal_n' type-id='type-id-2967' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/parallel/settings.h' line='139' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='320'>
-          <var-decl name='adjacent_difference_minimal_n' type-id='type-id-41' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/parallel/settings.h' line='142' column='1'/>
+          <var-decl name='adjacent_difference_minimal_n' type-id='type-id-39' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/parallel/settings.h' line='142' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='384'>
           <var-decl name='count_minimal_n' type-id='type-id-2967' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/parallel/settings.h' line='145' column='1'/>
@@ -42580,7 +42543,7 @@
           <var-decl name='merge_minimal_n' type-id='type-id-2967' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/parallel/settings.h' line='172' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='1024'>
-          <var-decl name='merge_oversampling' type-id='type-id-41' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/parallel/settings.h' line='175' column='1'/>
+          <var-decl name='merge_oversampling' type-id='type-id-39' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/parallel/settings.h' line='175' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='1088'>
           <var-decl name='min_element_minimal_n' type-id='type-id-2967' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/parallel/settings.h' line='178' column='1'/>
@@ -42592,7 +42555,7 @@
           <var-decl name='multiway_merge_minimal_k' type-id='type-id-6' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/parallel/settings.h' line='184' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='1248'>
-          <var-decl name='multiway_merge_oversampling' type-id='type-id-41' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/parallel/settings.h' line='187' column='1'/>
+          <var-decl name='multiway_merge_oversampling' type-id='type-id-39' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/parallel/settings.h' line='187' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='1280'>
           <var-decl name='nth_element_minimal_n' type-id='type-id-2967' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/parallel/settings.h' line='190' column='1'/>
@@ -42613,10 +42576,10 @@
           <var-decl name='partial_sum_dilation' type-id='type-id-377' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/parallel/settings.h' line='207' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='1632'>
-          <var-decl name='partial_sum_minimal_n' type-id='type-id-41' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/parallel/settings.h' line='210' column='1'/>
+          <var-decl name='partial_sum_minimal_n' type-id='type-id-39' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/parallel/settings.h' line='210' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='1664'>
-          <var-decl name='random_shuffle_minimal_n' type-id='type-id-41' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/parallel/settings.h' line='213' column='1'/>
+          <var-decl name='random_shuffle_minimal_n' type-id='type-id-39' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/parallel/settings.h' line='213' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='1728'>
           <var-decl name='replace_minimal_n' type-id='type-id-2967' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/parallel/settings.h' line='216' column='1'/>
@@ -42637,10 +42600,10 @@
           <var-decl name='sort_minimal_n' type-id='type-id-2967' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/parallel/settings.h' line='231' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='2112'>
-          <var-decl name='sort_mwms_oversampling' type-id='type-id-41' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/parallel/settings.h' line='234' column='1'/>
+          <var-decl name='sort_mwms_oversampling' type-id='type-id-39' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/parallel/settings.h' line='234' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='2144'>
-          <var-decl name='sort_qs_num_samples_preset' type-id='type-id-41' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/parallel/settings.h' line='237' column='1'/>
+          <var-decl name='sort_qs_num_samples_preset' type-id='type-id-39' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/parallel/settings.h' line='237' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='2176'>
           <var-decl name='sort_qsb_base_case_maximal_n' type-id='type-id-2967' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/parallel/settings.h' line='241' column='1'/>
@@ -42661,10 +42624,10 @@
           <var-decl name='L2_cache_size' type-id='type-id-376' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/parallel/settings.h' line='257' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='2560'>
-          <var-decl name='TLB_size' type-id='type-id-41' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/parallel/settings.h' line='260' column='1'/>
+          <var-decl name='TLB_size' type-id='type-id-39' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/parallel/settings.h' line='260' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='2592'>
-          <var-decl name='cache_line_size' type-id='type-id-41' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/parallel/settings.h' line='265' column='1'/>
+          <var-decl name='cache_line_size' type-id='type-id-39' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/parallel/settings.h' line='265' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='2624'>
           <var-decl name='qsb_steals' type-id='type-id-2967' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/parallel/settings.h' line='270' column='1'/>
@@ -42694,34 +42657,34 @@
         </member-function>
       </class-decl>
       <enum-decl name='_AlgorithmStrategy' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/parallel/types.h' line='67' column='1' id='type-id-2961'>
-        <underlying-type type-id='type-id-39'/>
+        <underlying-type type-id='type-id-37'/>
         <enumerator name='heuristic' value='0'/>
         <enumerator name='force_sequential' value='1'/>
         <enumerator name='force_parallel' value='2'/>
       </enum-decl>
       <enum-decl name='_SortAlgorithm' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/parallel/types.h' line='76' column='1' id='type-id-2962'>
-        <underlying-type type-id='type-id-39'/>
+        <underlying-type type-id='type-id-37'/>
         <enumerator name='MWMS' value='0'/>
         <enumerator name='QS' value='1'/>
         <enumerator name='QS_BALANCED' value='2'/>
       </enum-decl>
       <enum-decl name='_PartialSumAlgorithm' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/parallel/types.h' line='91' column='1' id='type-id-2963'>
-        <underlying-type type-id='type-id-39'/>
+        <underlying-type type-id='type-id-37'/>
         <enumerator name='RECURSIVE' value='0'/>
         <enumerator name='LINEAR' value='1'/>
       </enum-decl>
       <enum-decl name='_MultiwayMergeAlgorithm' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/parallel/types.h' line='85' column='1' id='type-id-2964'>
-        <underlying-type type-id='type-id-39'/>
+        <underlying-type type-id='type-id-37'/>
         <enumerator name='LOSER_TREE' value='0'/>
       </enum-decl>
       <enum-decl name='_FindAlgorithm' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/parallel/types.h' line='106' column='1' id='type-id-2965'>
-        <underlying-type type-id='type-id-39'/>
+        <underlying-type type-id='type-id-37'/>
         <enumerator name='GROWING_BLOCKS' value='0'/>
         <enumerator name='CONSTANT_SIZE_BLOCKS' value='1'/>
         <enumerator name='EQUAL_SPLIT' value='2'/>
       </enum-decl>
       <enum-decl name='_SplittingAlgorithm' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/parallel/types.h' line='98' column='1' id='type-id-2966'>
-        <underlying-type type-id='type-id-39'/>
+        <underlying-type type-id='type-id-37'/>
         <enumerator name='SAMPLING' value='0'/>
         <enumerator name='EXACT' value='1'/>
       </enum-decl>
@@ -42753,19 +42716,19 @@
       <class-decl name='__pool_alloc_base' size-in-bits='8' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ext/pool_allocator.h' line='77' column='1' id='type-id-2974'>
         <member-type access='protected'>
           <enum-decl name='__anonymous_enum__' is-anonymous='yes' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ext/pool_allocator.h' line='81' column='1' id='type-id-2993'>
-            <underlying-type type-id='type-id-39'/>
+            <underlying-type type-id='type-id-37'/>
             <enumerator name='_S_align' value='8'/>
           </enum-decl>
         </member-type>
         <member-type access='protected'>
           <enum-decl name='__anonymous_enum__1' is-anonymous='yes' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ext/pool_allocator.h' line='82' column='1' id='type-id-2994'>
-            <underlying-type type-id='type-id-39'/>
+            <underlying-type type-id='type-id-37'/>
             <enumerator name='_S_max_bytes' value='128'/>
           </enum-decl>
         </member-type>
         <member-type access='protected'>
           <enum-decl name='__anonymous_enum__2' is-anonymous='yes' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ext/pool_allocator.h' line='83' column='1' id='type-id-2995'>
-            <underlying-type type-id='type-id-39'/>
+            <underlying-type type-id='type-id-37'/>
             <enumerator name='_S_free_list_size' value='16'/>
           </enum-decl>
         </member-type>
@@ -42783,57 +42746,57 @@
           <var-decl name='_S_free_list' type-id='type-id-2969' mangled-name='_ZN9__gnu_cxx17__pool_alloc_base12_S_free_listE' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ext/pool_allocator.h' line='91' column='1'/>
         </data-member>
         <data-member access='protected' static='yes'>
-          <var-decl name='_S_start_free' type-id='type-id-93' mangled-name='_ZN9__gnu_cxx17__pool_alloc_base13_S_start_freeE' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ext/pool_allocator.h' line='94' column='1'/>
+          <var-decl name='_S_start_free' type-id='type-id-92' mangled-name='_ZN9__gnu_cxx17__pool_alloc_base13_S_start_freeE' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ext/pool_allocator.h' line='94' column='1'/>
         </data-member>
         <data-member access='protected' static='yes'>
-          <var-decl name='_S_end_free' type-id='type-id-93' mangled-name='_ZN9__gnu_cxx17__pool_alloc_base11_S_end_freeE' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ext/pool_allocator.h' line='95' column='1'/>
+          <var-decl name='_S_end_free' type-id='type-id-92' mangled-name='_ZN9__gnu_cxx17__pool_alloc_base11_S_end_freeE' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ext/pool_allocator.h' line='95' column='1'/>
         </data-member>
         <data-member access='protected' static='yes'>
-          <var-decl name='_S_heap_size' type-id='type-id-94' mangled-name='_ZN9__gnu_cxx17__pool_alloc_base12_S_heap_sizeE' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ext/pool_allocator.h' line='96' column='1'/>
+          <var-decl name='_S_heap_size' type-id='type-id-93' mangled-name='_ZN9__gnu_cxx17__pool_alloc_base12_S_heap_sizeE' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ext/pool_allocator.h' line='96' column='1'/>
         </data-member>
         <member-function access='protected'>
           <function-decl name='_M_round_up' mangled-name='_ZN9__gnu_cxx17__pool_alloc_base11_M_round_upEm' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ext/pool_allocator.h' line='99' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-2975' is-artificial='yes'/>
-            <parameter type-id='type-id-94'/>
-            <return type-id='type-id-94'/>
+            <parameter type-id='type-id-93'/>
+            <return type-id='type-id-93'/>
           </function-decl>
         </member-function>
         <member-function access='protected'>
           <function-decl name='_M_get_free_list' mangled-name='_ZN9__gnu_cxx17__pool_alloc_base16_M_get_free_listEm' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ext/pool_allocator.h' line='103' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN9__gnu_cxx17__pool_alloc_base16_M_get_free_listEm@@GLIBCXX_3.4.2'>
             <parameter type-id='type-id-2975' is-artificial='yes'/>
-            <parameter type-id='type-id-94'/>
+            <parameter type-id='type-id-93'/>
             <return type-id='type-id-2978'/>
           </function-decl>
         </member-function>
         <member-function access='protected'>
           <function-decl name='_M_get_mutex' mangled-name='_ZN9__gnu_cxx17__pool_alloc_base12_M_get_mutexEv' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ext/pool_allocator.h' line='106' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN9__gnu_cxx17__pool_alloc_base12_M_get_mutexEv@@GLIBCXX_3.4.2'>
             <parameter type-id='type-id-2975' is-artificial='yes'/>
-            <return type-id='type-id-62'/>
+            <return type-id='type-id-60'/>
           </function-decl>
         </member-function>
         <member-function access='protected'>
           <function-decl name='_M_refill' mangled-name='_ZN9__gnu_cxx17__pool_alloc_base9_M_refillEm' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ext/pool_allocator.h' line='111' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN9__gnu_cxx17__pool_alloc_base9_M_refillEm@@GLIBCXX_3.4.2'>
             <parameter type-id='type-id-2975' is-artificial='yes'/>
-            <parameter type-id='type-id-94'/>
-            <return type-id='type-id-36'/>
+            <parameter type-id='type-id-93'/>
+            <return type-id='type-id-34'/>
           </function-decl>
         </member-function>
         <member-function access='protected'>
           <function-decl name='_M_allocate_chunk' mangled-name='_ZN9__gnu_cxx17__pool_alloc_base17_M_allocate_chunkEmRi' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ext/pool_allocator.h' line='116' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-2975' is-artificial='yes'/>
-            <parameter type-id='type-id-94'/>
+            <parameter type-id='type-id-93'/>
             <parameter type-id='type-id-1046'/>
-            <return type-id='type-id-93'/>
+            <return type-id='type-id-92'/>
           </function-decl>
         </member-function>
       </class-decl>
       <class-decl name='__pool_alloc&lt;char&gt;' size-in-bits='8' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ext/pool_allocator.h' line='125' column='1' id='type-id-2970'>
         <base-class access='private' layout-offset-in-bits='0' type-id='type-id-2974'/>
         <member-type access='private'>
-          <typedef-decl name='size_type' type-id='type-id-94' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ext/pool_allocator.h' line='131' column='1' id='type-id-2996'/>
+          <typedef-decl name='size_type' type-id='type-id-93' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ext/pool_allocator.h' line='131' column='1' id='type-id-2996'/>
         </member-type>
         <member-type access='private'>
-          <typedef-decl name='pointer' type-id='type-id-93' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ext/pool_allocator.h' line='133' column='1' id='type-id-2997'/>
+          <typedef-decl name='pointer' type-id='type-id-92' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ext/pool_allocator.h' line='133' column='1' id='type-id-2997'/>
         </member-type>
         <member-type access='private'>
           <typedef-decl name='const_pointer' type-id='type-id-4' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ext/pool_allocator.h' line='134' column='1' id='type-id-2998'/>
@@ -42906,8 +42869,8 @@
           <function-decl name='allocate' mangled-name='_ZN9__gnu_cxx12__pool_allocIcE8allocateEmPKv' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ext/pool_allocator.h' line='207' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-2971' is-artificial='yes'/>
             <parameter type-id='type-id-2996'/>
-            <parameter type-id='type-id-36'/>
-            <return type-id='type-id-93'/>
+            <parameter type-id='type-id-34'/>
+            <return type-id='type-id-92'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
@@ -42942,7 +42905,7 @@
       <class-decl name='__pool_alloc&lt;wchar_t&gt;' size-in-bits='8' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ext/pool_allocator.h' line='125' column='1' id='type-id-2972'>
         <base-class access='private' layout-offset-in-bits='0' type-id='type-id-2974'/>
         <member-type access='private'>
-          <typedef-decl name='size_type' type-id='type-id-94' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ext/pool_allocator.h' line='131' column='1' id='type-id-2999'/>
+          <typedef-decl name='size_type' type-id='type-id-93' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ext/pool_allocator.h' line='131' column='1' id='type-id-2999'/>
         </member-type>
         <member-type access='private'>
           <typedef-decl name='pointer' type-id='type-id-333' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ext/pool_allocator.h' line='133' column='1' id='type-id-3000'/>
@@ -43018,7 +42981,7 @@
           <function-decl name='allocate' mangled-name='_ZN9__gnu_cxx12__pool_allocIwE8allocateEmPKv' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ext/pool_allocator.h' line='207' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-2973' is-artificial='yes'/>
             <parameter type-id='type-id-2999'/>
-            <parameter type-id='type-id-36'/>
+            <parameter type-id='type-id-34'/>
             <return type-id='type-id-333'/>
           </function-decl>
         </member-function>
@@ -43119,7 +43082,7 @@
           <function-decl name='basic_stringstream' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/sstream' line='518' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-3042' is-artificial='yes'/>
             <parameter type-id='type-id-6' is-artificial='yes'/>
-            <parameter type-id='type-id-37' is-artificial='yes'/>
+            <parameter type-id='type-id-35' is-artificial='yes'/>
             <parameter type-id='type-id-875'/>
             <return type-id='type-id-5'/>
           </function-decl>
@@ -43128,7 +43091,7 @@
           <function-decl name='basic_stringstream' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/sstream' line='534' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-3042' is-artificial='yes'/>
             <parameter type-id='type-id-6' is-artificial='yes'/>
-            <parameter type-id='type-id-37' is-artificial='yes'/>
+            <parameter type-id='type-id-35' is-artificial='yes'/>
             <parameter type-id='type-id-3029'/>
             <parameter type-id='type-id-875'/>
             <return type-id='type-id-5'/>
@@ -43157,7 +43120,7 @@
           <function-decl name='basic_stringstream' mangled-name='_ZNSt18basic_stringstreamIcSt11char_traitsIcESaIcEEC2ESt13_Ios_Openmode' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/sstream' line='518' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt18basic_stringstreamIcSt11char_traitsIcESaIcEEC2ESt13_Ios_Openmode@@GLIBCXX_3.4'>
             <parameter type-id='type-id-3042' is-artificial='yes'/>
             <parameter type-id='type-id-6' is-artificial='yes'/>
-            <parameter type-id='type-id-37' is-artificial='yes'/>
+            <parameter type-id='type-id-35' is-artificial='yes'/>
             <parameter type-id='type-id-875'/>
             <return type-id='type-id-5'/>
           </function-decl>
@@ -43166,7 +43129,7 @@
           <function-decl name='basic_stringstream' mangled-name='_ZNSt18basic_stringstreamIcSt11char_traitsIcESaIcEEC1ESt13_Ios_Openmode' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/sstream' line='518' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt18basic_stringstreamIcSt11char_traitsIcESaIcEEC1ESt13_Ios_Openmode@@GLIBCXX_3.4'>
             <parameter type-id='type-id-3042' is-artificial='yes'/>
             <parameter type-id='type-id-6' is-artificial='yes'/>
-            <parameter type-id='type-id-37' is-artificial='yes'/>
+            <parameter type-id='type-id-35' is-artificial='yes'/>
             <parameter type-id='type-id-875'/>
             <return type-id='type-id-5'/>
           </function-decl>
@@ -43175,7 +43138,7 @@
           <function-decl name='basic_stringstream' mangled-name='_ZNSt18basic_stringstreamIcSt11char_traitsIcESaIcEEC2ERKSsSt13_Ios_Openmode' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/sstream' line='534' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt18basic_stringstreamIcSt11char_traitsIcESaIcEEC2ERKSsSt13_Ios_Openmode@@GLIBCXX_3.4'>
             <parameter type-id='type-id-3042' is-artificial='yes'/>
             <parameter type-id='type-id-6' is-artificial='yes'/>
-            <parameter type-id='type-id-37' is-artificial='yes'/>
+            <parameter type-id='type-id-35' is-artificial='yes'/>
             <parameter type-id='type-id-3029'/>
             <parameter type-id='type-id-875'/>
             <return type-id='type-id-5'/>
@@ -43185,7 +43148,7 @@
           <function-decl name='basic_stringstream' mangled-name='_ZNSt18basic_stringstreamIcSt11char_traitsIcESaIcEEC1ERKSsSt13_Ios_Openmode' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/sstream' line='534' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt18basic_stringstreamIcSt11char_traitsIcESaIcEEC1ERKSsSt13_Ios_Openmode@@GLIBCXX_3.4'>
             <parameter type-id='type-id-3042' is-artificial='yes'/>
             <parameter type-id='type-id-6' is-artificial='yes'/>
-            <parameter type-id='type-id-37' is-artificial='yes'/>
+            <parameter type-id='type-id-35' is-artificial='yes'/>
             <parameter type-id='type-id-3029'/>
             <parameter type-id='type-id-875'/>
             <return type-id='type-id-5'/>
@@ -43195,7 +43158,7 @@
           <function-decl name='~basic_stringstream' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/sstream' line='545' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-3042' is-artificial='yes'/>
             <parameter type-id='type-id-6' is-artificial='yes'/>
-            <parameter type-id='type-id-37' is-artificial='yes'/>
+            <parameter type-id='type-id-35' is-artificial='yes'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
@@ -43203,7 +43166,7 @@
           <function-decl name='~basic_stringstream' mangled-name='_ZNSt18basic_stringstreamIcSt11char_traitsIcESaIcEED0Ev' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/sstream' line='545' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt18basic_stringstreamIcSt11char_traitsIcESaIcEED0Ev@@GLIBCXX_3.4'>
             <parameter type-id='type-id-3042' is-artificial='yes'/>
             <parameter type-id='type-id-6' is-artificial='yes'/>
-            <parameter type-id='type-id-37' is-artificial='yes'/>
+            <parameter type-id='type-id-35' is-artificial='yes'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
@@ -43211,7 +43174,7 @@
           <function-decl name='~basic_stringstream' mangled-name='_ZNSt18basic_stringstreamIcSt11char_traitsIcESaIcEED1Ev' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/sstream' line='545' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt18basic_stringstreamIcSt11char_traitsIcESaIcEED1Ev@@GLIBCXX_3.4'>
             <parameter type-id='type-id-3042' is-artificial='yes'/>
             <parameter type-id='type-id-6' is-artificial='yes'/>
-            <parameter type-id='type-id-37' is-artificial='yes'/>
+            <parameter type-id='type-id-35' is-artificial='yes'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
@@ -43219,7 +43182,7 @@
           <function-decl name='~basic_stringstream' mangled-name='_ZNSt18basic_stringstreamIcSt11char_traitsIcESaIcEED2Ev' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/sstream' line='545' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt18basic_stringstreamIcSt11char_traitsIcESaIcEED2Ev@@GLIBCXX_3.4'>
             <parameter type-id='type-id-3042' is-artificial='yes'/>
             <parameter type-id='type-id-6' is-artificial='yes'/>
-            <parameter type-id='type-id-37' is-artificial='yes'/>
+            <parameter type-id='type-id-35' is-artificial='yes'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
@@ -43239,7 +43202,7 @@
           <function-decl name='basic_istringstream' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/sstream' line='299' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-3039' is-artificial='yes'/>
             <parameter type-id='type-id-6' is-artificial='yes'/>
-            <parameter type-id='type-id-37' is-artificial='yes'/>
+            <parameter type-id='type-id-35' is-artificial='yes'/>
             <parameter type-id='type-id-875'/>
             <return type-id='type-id-5'/>
           </function-decl>
@@ -43248,7 +43211,7 @@
           <function-decl name='basic_istringstream' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/sstream' line='317' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-3039' is-artificial='yes'/>
             <parameter type-id='type-id-6' is-artificial='yes'/>
-            <parameter type-id='type-id-37' is-artificial='yes'/>
+            <parameter type-id='type-id-35' is-artificial='yes'/>
             <parameter type-id='type-id-3013'/>
             <parameter type-id='type-id-875'/>
             <return type-id='type-id-5'/>
@@ -43277,7 +43240,7 @@
           <function-decl name='basic_istringstream' mangled-name='_ZNSt19basic_istringstreamIwSt11char_traitsIwESaIwEEC2ESt13_Ios_Openmode' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/sstream' line='299' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt19basic_istringstreamIwSt11char_traitsIwESaIwEEC2ESt13_Ios_Openmode@@GLIBCXX_3.4'>
             <parameter type-id='type-id-3039' is-artificial='yes'/>
             <parameter type-id='type-id-6' is-artificial='yes'/>
-            <parameter type-id='type-id-37' is-artificial='yes'/>
+            <parameter type-id='type-id-35' is-artificial='yes'/>
             <parameter type-id='type-id-875'/>
             <return type-id='type-id-5'/>
           </function-decl>
@@ -43286,7 +43249,7 @@
           <function-decl name='basic_istringstream' mangled-name='_ZNSt19basic_istringstreamIwSt11char_traitsIwESaIwEEC1ESt13_Ios_Openmode' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/sstream' line='299' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt19basic_istringstreamIwSt11char_traitsIwESaIwEEC1ESt13_Ios_Openmode@@GLIBCXX_3.4'>
             <parameter type-id='type-id-3039' is-artificial='yes'/>
             <parameter type-id='type-id-6' is-artificial='yes'/>
-            <parameter type-id='type-id-37' is-artificial='yes'/>
+            <parameter type-id='type-id-35' is-artificial='yes'/>
             <parameter type-id='type-id-875'/>
             <return type-id='type-id-5'/>
           </function-decl>
@@ -43295,7 +43258,7 @@
           <function-decl name='basic_istringstream' mangled-name='_ZNSt19basic_istringstreamIwSt11char_traitsIwESaIwEEC2ERKSbIwS1_S2_ESt13_Ios_Openmode' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/sstream' line='317' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt19basic_istringstreamIwSt11char_traitsIwESaIwEEC2ERKSbIwS1_S2_ESt13_Ios_Openmode@@GLIBCXX_3.4'>
             <parameter type-id='type-id-3039' is-artificial='yes'/>
             <parameter type-id='type-id-6' is-artificial='yes'/>
-            <parameter type-id='type-id-37' is-artificial='yes'/>
+            <parameter type-id='type-id-35' is-artificial='yes'/>
             <parameter type-id='type-id-3013'/>
             <parameter type-id='type-id-875'/>
             <return type-id='type-id-5'/>
@@ -43305,7 +43268,7 @@
           <function-decl name='basic_istringstream' mangled-name='_ZNSt19basic_istringstreamIwSt11char_traitsIwESaIwEEC1ERKSbIwS1_S2_ESt13_Ios_Openmode' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/sstream' line='317' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt19basic_istringstreamIwSt11char_traitsIwESaIwEEC1ERKSbIwS1_S2_ESt13_Ios_Openmode@@GLIBCXX_3.4'>
             <parameter type-id='type-id-3039' is-artificial='yes'/>
             <parameter type-id='type-id-6' is-artificial='yes'/>
-            <parameter type-id='type-id-37' is-artificial='yes'/>
+            <parameter type-id='type-id-35' is-artificial='yes'/>
             <parameter type-id='type-id-3013'/>
             <parameter type-id='type-id-875'/>
             <return type-id='type-id-5'/>
@@ -43315,7 +43278,7 @@
           <function-decl name='~basic_istringstream' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/sstream' line='328' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-3039' is-artificial='yes'/>
             <parameter type-id='type-id-6' is-artificial='yes'/>
-            <parameter type-id='type-id-37' is-artificial='yes'/>
+            <parameter type-id='type-id-35' is-artificial='yes'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
@@ -43323,7 +43286,7 @@
           <function-decl name='~basic_istringstream' mangled-name='_ZNSt19basic_istringstreamIwSt11char_traitsIwESaIwEED0Ev' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/sstream' line='328' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt19basic_istringstreamIwSt11char_traitsIwESaIwEED0Ev@@GLIBCXX_3.4'>
             <parameter type-id='type-id-3039' is-artificial='yes'/>
             <parameter type-id='type-id-6' is-artificial='yes'/>
-            <parameter type-id='type-id-37' is-artificial='yes'/>
+            <parameter type-id='type-id-35' is-artificial='yes'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
@@ -43331,7 +43294,7 @@
           <function-decl name='~basic_istringstream' mangled-name='_ZNSt19basic_istringstreamIwSt11char_traitsIwESaIwEED1Ev' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/sstream' line='328' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt19basic_istringstreamIwSt11char_traitsIwESaIwEED1Ev@@GLIBCXX_3.4'>
             <parameter type-id='type-id-3039' is-artificial='yes'/>
             <parameter type-id='type-id-6' is-artificial='yes'/>
-            <parameter type-id='type-id-37' is-artificial='yes'/>
+            <parameter type-id='type-id-35' is-artificial='yes'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
@@ -43339,7 +43302,7 @@
           <function-decl name='~basic_istringstream' mangled-name='_ZNSt19basic_istringstreamIwSt11char_traitsIwESaIwEED2Ev' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/sstream' line='328' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt19basic_istringstreamIwSt11char_traitsIwESaIwEED2Ev@@GLIBCXX_3.4'>
             <parameter type-id='type-id-3039' is-artificial='yes'/>
             <parameter type-id='type-id-6' is-artificial='yes'/>
-            <parameter type-id='type-id-37' is-artificial='yes'/>
+            <parameter type-id='type-id-35' is-artificial='yes'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
@@ -43359,7 +43322,7 @@
           <function-decl name='basic_istringstream' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/sstream' line='299' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-3036' is-artificial='yes'/>
             <parameter type-id='type-id-6' is-artificial='yes'/>
-            <parameter type-id='type-id-37' is-artificial='yes'/>
+            <parameter type-id='type-id-35' is-artificial='yes'/>
             <parameter type-id='type-id-875'/>
             <return type-id='type-id-5'/>
           </function-decl>
@@ -43368,7 +43331,7 @@
           <function-decl name='basic_istringstream' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/sstream' line='317' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-3036' is-artificial='yes'/>
             <parameter type-id='type-id-6' is-artificial='yes'/>
-            <parameter type-id='type-id-37' is-artificial='yes'/>
+            <parameter type-id='type-id-35' is-artificial='yes'/>
             <parameter type-id='type-id-3007'/>
             <parameter type-id='type-id-875'/>
             <return type-id='type-id-5'/>
@@ -43397,7 +43360,7 @@
           <function-decl name='basic_istringstream' mangled-name='_ZNSt19basic_istringstreamIcSt11char_traitsIcESaIcEEC2ESt13_Ios_Openmode' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/sstream' line='299' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt19basic_istringstreamIcSt11char_traitsIcESaIcEEC2ESt13_Ios_Openmode@@GLIBCXX_3.4'>
             <parameter type-id='type-id-3036' is-artificial='yes'/>
             <parameter type-id='type-id-6' is-artificial='yes'/>
-            <parameter type-id='type-id-37' is-artificial='yes'/>
+            <parameter type-id='type-id-35' is-artificial='yes'/>
             <parameter type-id='type-id-875'/>
             <return type-id='type-id-5'/>
           </function-decl>
@@ -43406,7 +43369,7 @@
           <function-decl name='basic_istringstream' mangled-name='_ZNSt19basic_istringstreamIcSt11char_traitsIcESaIcEEC1ESt13_Ios_Openmode' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/sstream' line='299' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt19basic_istringstreamIcSt11char_traitsIcESaIcEEC1ESt13_Ios_Openmode@@GLIBCXX_3.4'>
             <parameter type-id='type-id-3036' is-artificial='yes'/>
             <parameter type-id='type-id-6' is-artificial='yes'/>
-            <parameter type-id='type-id-37' is-artificial='yes'/>
+            <parameter type-id='type-id-35' is-artificial='yes'/>
             <parameter type-id='type-id-875'/>
             <return type-id='type-id-5'/>
           </function-decl>
@@ -43415,7 +43378,7 @@
           <function-decl name='basic_istringstream' mangled-name='_ZNSt19basic_istringstreamIcSt11char_traitsIcESaIcEEC2ERKSsSt13_Ios_Openmode' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/sstream' line='317' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt19basic_istringstreamIcSt11char_traitsIcESaIcEEC2ERKSsSt13_Ios_Openmode@@GLIBCXX_3.4'>
             <parameter type-id='type-id-3036' is-artificial='yes'/>
             <parameter type-id='type-id-6' is-artificial='yes'/>
-            <parameter type-id='type-id-37' is-artificial='yes'/>
+            <parameter type-id='type-id-35' is-artificial='yes'/>
             <parameter type-id='type-id-3007'/>
             <parameter type-id='type-id-875'/>
             <return type-id='type-id-5'/>
@@ -43425,7 +43388,7 @@
           <function-decl name='basic_istringstream' mangled-name='_ZNSt19basic_istringstreamIcSt11char_traitsIcESaIcEEC1ERKSsSt13_Ios_Openmode' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/sstream' line='317' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt19basic_istringstreamIcSt11char_traitsIcESaIcEEC1ERKSsSt13_Ios_Openmode@@GLIBCXX_3.4'>
             <parameter type-id='type-id-3036' is-artificial='yes'/>
             <parameter type-id='type-id-6' is-artificial='yes'/>
-            <parameter type-id='type-id-37' is-artificial='yes'/>
+            <parameter type-id='type-id-35' is-artificial='yes'/>
             <parameter type-id='type-id-3007'/>
             <parameter type-id='type-id-875'/>
             <return type-id='type-id-5'/>
@@ -43435,7 +43398,7 @@
           <function-decl name='~basic_istringstream' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/sstream' line='328' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-3036' is-artificial='yes'/>
             <parameter type-id='type-id-6' is-artificial='yes'/>
-            <parameter type-id='type-id-37' is-artificial='yes'/>
+            <parameter type-id='type-id-35' is-artificial='yes'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
@@ -43443,7 +43406,7 @@
           <function-decl name='~basic_istringstream' mangled-name='_ZNSt19basic_istringstreamIcSt11char_traitsIcESaIcEED0Ev' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/sstream' line='328' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt19basic_istringstreamIcSt11char_traitsIcESaIcEED0Ev@@GLIBCXX_3.4'>
             <parameter type-id='type-id-3036' is-artificial='yes'/>
             <parameter type-id='type-id-6' is-artificial='yes'/>
-            <parameter type-id='type-id-37' is-artificial='yes'/>
+            <parameter type-id='type-id-35' is-artificial='yes'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
@@ -43451,7 +43414,7 @@
           <function-decl name='~basic_istringstream' mangled-name='_ZNSt19basic_istringstreamIcSt11char_traitsIcESaIcEED1Ev' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/sstream' line='328' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt19basic_istringstreamIcSt11char_traitsIcESaIcEED1Ev@@GLIBCXX_3.4'>
             <parameter type-id='type-id-3036' is-artificial='yes'/>
             <parameter type-id='type-id-6' is-artificial='yes'/>
-            <parameter type-id='type-id-37' is-artificial='yes'/>
+            <parameter type-id='type-id-35' is-artificial='yes'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
@@ -43459,7 +43422,7 @@
           <function-decl name='~basic_istringstream' mangled-name='_ZNSt19basic_istringstreamIcSt11char_traitsIcESaIcEED2Ev' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/sstream' line='328' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt19basic_istringstreamIcSt11char_traitsIcESaIcEED2Ev@@GLIBCXX_3.4'>
             <parameter type-id='type-id-3036' is-artificial='yes'/>
             <parameter type-id='type-id-6' is-artificial='yes'/>
-            <parameter type-id='type-id-37' is-artificial='yes'/>
+            <parameter type-id='type-id-35' is-artificial='yes'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
@@ -43479,7 +43442,7 @@
           <function-decl name='basic_stringstream' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/sstream' line='518' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-3045' is-artificial='yes'/>
             <parameter type-id='type-id-6' is-artificial='yes'/>
-            <parameter type-id='type-id-37' is-artificial='yes'/>
+            <parameter type-id='type-id-35' is-artificial='yes'/>
             <parameter type-id='type-id-875'/>
             <return type-id='type-id-5'/>
           </function-decl>
@@ -43488,7 +43451,7 @@
           <function-decl name='basic_stringstream' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/sstream' line='534' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-3045' is-artificial='yes'/>
             <parameter type-id='type-id-6' is-artificial='yes'/>
-            <parameter type-id='type-id-37' is-artificial='yes'/>
+            <parameter type-id='type-id-35' is-artificial='yes'/>
             <parameter type-id='type-id-3035'/>
             <parameter type-id='type-id-875'/>
             <return type-id='type-id-5'/>
@@ -43517,7 +43480,7 @@
           <function-decl name='basic_stringstream' mangled-name='_ZNSt18basic_stringstreamIwSt11char_traitsIwESaIwEEC2ESt13_Ios_Openmode' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/sstream' line='518' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt18basic_stringstreamIwSt11char_traitsIwESaIwEEC2ESt13_Ios_Openmode@@GLIBCXX_3.4'>
             <parameter type-id='type-id-3045' is-artificial='yes'/>
             <parameter type-id='type-id-6' is-artificial='yes'/>
-            <parameter type-id='type-id-37' is-artificial='yes'/>
+            <parameter type-id='type-id-35' is-artificial='yes'/>
             <parameter type-id='type-id-875'/>
             <return type-id='type-id-5'/>
           </function-decl>
@@ -43526,7 +43489,7 @@
           <function-decl name='basic_stringstream' mangled-name='_ZNSt18basic_stringstreamIwSt11char_traitsIwESaIwEEC1ESt13_Ios_Openmode' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/sstream' line='518' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt18basic_stringstreamIwSt11char_traitsIwESaIwEEC1ESt13_Ios_Openmode@@GLIBCXX_3.4'>
             <parameter type-id='type-id-3045' is-artificial='yes'/>
             <parameter type-id='type-id-6' is-artificial='yes'/>
-            <parameter type-id='type-id-37' is-artificial='yes'/>
+            <parameter type-id='type-id-35' is-artificial='yes'/>
             <parameter type-id='type-id-875'/>
             <return type-id='type-id-5'/>
           </function-decl>
@@ -43535,7 +43498,7 @@
           <function-decl name='basic_stringstream' mangled-name='_ZNSt18basic_stringstreamIwSt11char_traitsIwESaIwEEC2ERKSbIwS1_S2_ESt13_Ios_Openmode' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/sstream' line='534' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt18basic_stringstreamIwSt11char_traitsIwESaIwEEC2ERKSbIwS1_S2_ESt13_Ios_Openmode@@GLIBCXX_3.4'>
             <parameter type-id='type-id-3045' is-artificial='yes'/>
             <parameter type-id='type-id-6' is-artificial='yes'/>
-            <parameter type-id='type-id-37' is-artificial='yes'/>
+            <parameter type-id='type-id-35' is-artificial='yes'/>
             <parameter type-id='type-id-3035'/>
             <parameter type-id='type-id-875'/>
             <return type-id='type-id-5'/>
@@ -43545,7 +43508,7 @@
           <function-decl name='basic_stringstream' mangled-name='_ZNSt18basic_stringstreamIwSt11char_traitsIwESaIwEEC1ERKSbIwS1_S2_ESt13_Ios_Openmode' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/sstream' line='534' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt18basic_stringstreamIwSt11char_traitsIwESaIwEEC1ERKSbIwS1_S2_ESt13_Ios_Openmode@@GLIBCXX_3.4'>
             <parameter type-id='type-id-3045' is-artificial='yes'/>
             <parameter type-id='type-id-6' is-artificial='yes'/>
-            <parameter type-id='type-id-37' is-artificial='yes'/>
+            <parameter type-id='type-id-35' is-artificial='yes'/>
             <parameter type-id='type-id-3035'/>
             <parameter type-id='type-id-875'/>
             <return type-id='type-id-5'/>
@@ -43555,7 +43518,7 @@
           <function-decl name='~basic_stringstream' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/sstream' line='545' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-3045' is-artificial='yes'/>
             <parameter type-id='type-id-6' is-artificial='yes'/>
-            <parameter type-id='type-id-37' is-artificial='yes'/>
+            <parameter type-id='type-id-35' is-artificial='yes'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
@@ -43563,7 +43526,7 @@
           <function-decl name='~basic_stringstream' mangled-name='_ZNSt18basic_stringstreamIwSt11char_traitsIwESaIwEED0Ev' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/sstream' line='545' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt18basic_stringstreamIwSt11char_traitsIwESaIwEED0Ev@@GLIBCXX_3.4'>
             <parameter type-id='type-id-3045' is-artificial='yes'/>
             <parameter type-id='type-id-6' is-artificial='yes'/>
-            <parameter type-id='type-id-37' is-artificial='yes'/>
+            <parameter type-id='type-id-35' is-artificial='yes'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
@@ -43571,7 +43534,7 @@
           <function-decl name='~basic_stringstream' mangled-name='_ZNSt18basic_stringstreamIwSt11char_traitsIwESaIwEED1Ev' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/sstream' line='545' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt18basic_stringstreamIwSt11char_traitsIwESaIwEED1Ev@@GLIBCXX_3.4'>
             <parameter type-id='type-id-3045' is-artificial='yes'/>
             <parameter type-id='type-id-6' is-artificial='yes'/>
-            <parameter type-id='type-id-37' is-artificial='yes'/>
+            <parameter type-id='type-id-35' is-artificial='yes'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
@@ -43579,7 +43542,7 @@
           <function-decl name='~basic_stringstream' mangled-name='_ZNSt18basic_stringstreamIwSt11char_traitsIwESaIwEED2Ev' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/sstream' line='545' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt18basic_stringstreamIwSt11char_traitsIwESaIwEED2Ev@@GLIBCXX_3.4'>
             <parameter type-id='type-id-3045' is-artificial='yes'/>
             <parameter type-id='type-id-6' is-artificial='yes'/>
-            <parameter type-id='type-id-37' is-artificial='yes'/>
+            <parameter type-id='type-id-35' is-artificial='yes'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
@@ -43976,7 +43939,7 @@
     <pointer-type-def type-id='type-id-929' size-in-bits='64' id='type-id-932'/>
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='../../../.././libstdc++-v3/src/c++98/streambuf.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/src/c++98' language='LANG_C_plus_plus'>
-    <reference-type-def kind='lvalue' type-id='type-id-42' size-in-bits='64' id='type-id-577'/>
+    <reference-type-def kind='lvalue' type-id='type-id-40' size-in-bits='64' id='type-id-577'/>
     <qualified-type-def type-id='type-id-814' const='yes' id='type-id-3072'/>
     <pointer-type-def type-id='type-id-3072' size-in-bits='64' id='type-id-873'/>
     <qualified-type-def type-id='type-id-817' const='yes' id='type-id-3073'/>
@@ -44020,7 +43983,7 @@
     <pointer-type-def type-id='type-id-3083' size-in-bits='64' id='type-id-3095'/>
     <reference-type-def kind='lvalue' type-id='type-id-3086' size-in-bits='64' id='type-id-3096'/>
     <pointer-type-def type-id='type-id-3086' size-in-bits='64' id='type-id-3097'/>
-    <pointer-type-def type-id='type-id-82' size-in-bits='64' id='type-id-2615'/>
+    <pointer-type-def type-id='type-id-80' size-in-bits='64' id='type-id-2615'/>
     <namespace-decl name='std'>
       <function-decl name='max&lt;long int&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/stl_algobase.h' line='210' column='1' visibility='default' binding='global' size-in-bits='64'>
         <parameter type-id='type-id-680'/>
@@ -44102,7 +44065,7 @@
           </function-decl>
         </member-function>
       </class-decl>
-      <typedef-decl name='streamoff' type-id='type-id-22' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/postypes.h' line='90' column='1' id='type-id-881'/>
+      <typedef-decl name='streamoff' type-id='type-id-20' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/postypes.h' line='90' column='1' id='type-id-881'/>
       <typedef-decl name='streampos' type-id='type-id-2614' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/postypes.h' line='230' column='1' id='type-id-880'/>
       <class-decl name='strstreambuf' size-in-bits='704' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/backward/strstream' line='65' column='1' id='type-id-3086'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-733'/>
@@ -44110,16 +44073,16 @@
           <var-decl name='_M_alloc_fun' type-id='type-id-170' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/backward/strstream' line='118' column='1'/>
         </data-member>
         <data-member access='private' layout-offset-in-bits='576'>
-          <var-decl name='_M_free_fun' type-id='type-id-88' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/backward/strstream' line='119' column='1'/>
+          <var-decl name='_M_free_fun' type-id='type-id-87' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/backward/strstream' line='119' column='1'/>
         </data-member>
         <data-member access='private' layout-offset-in-bits='7'>
-          <var-decl name='_M_dynamic' type-id='type-id-42' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/backward/strstream' line='121' column='1'/>
+          <var-decl name='_M_dynamic' type-id='type-id-40' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/backward/strstream' line='121' column='1'/>
         </data-member>
         <data-member access='private' layout-offset-in-bits='6'>
-          <var-decl name='_M_frozen' type-id='type-id-42' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/backward/strstream' line='122' column='1'/>
+          <var-decl name='_M_frozen' type-id='type-id-40' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/backward/strstream' line='122' column='1'/>
         </data-member>
         <data-member access='private' layout-offset-in-bits='5'>
-          <var-decl name='_M_constant' type-id='type-id-42' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/backward/strstream' line='123' column='1'/>
+          <var-decl name='_M_constant' type-id='type-id-40' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/backward/strstream' line='123' column='1'/>
         </data-member>
         <member-function access='private' constructor='yes'>
           <function-decl name='strstreambuf' filepath='../../../.././libstdc++-v3/src/c++98/strstream.cc' line='56' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -44132,16 +44095,16 @@
           <function-decl name='strstreambuf' filepath='../../../.././libstdc++-v3/src/c++98/strstream.cc' line='70' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-3097' is-artificial='yes'/>
             <parameter type-id='type-id-170'/>
-            <parameter type-id='type-id-88'/>
+            <parameter type-id='type-id-87'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='private' constructor='yes'>
           <function-decl name='strstreambuf' filepath='../../../.././libstdc++-v3/src/c++98/strstream.cc' line='84' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-3097' is-artificial='yes'/>
-            <parameter type-id='type-id-93'/>
+            <parameter type-id='type-id-92'/>
             <parameter type-id='type-id-872'/>
-            <parameter type-id='type-id-93'/>
+            <parameter type-id='type-id-92'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
@@ -44182,7 +44145,7 @@
         <member-function access='private' constructor='yes'>
           <function-decl name='strstreambuf' filepath='../../../.././libstdc++-v3/src/c++98/strstream.cc' line='110' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-3097' is-artificial='yes'/>
-            <parameter type-id='type-id-84'/>
+            <parameter type-id='type-id-82'/>
             <parameter type-id='type-id-872'/>
             <return type-id='type-id-5'/>
           </function-decl>
@@ -44190,14 +44153,14 @@
         <member-function access='private'>
           <function-decl name='freeze' mangled-name='_ZNSt12strstreambuf6freezeEb' filepath='../../../.././libstdc++-v3/src/c++98/strstream.cc' line='122' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt12strstreambuf6freezeEb@@GLIBCXX_3.4'>
             <parameter type-id='type-id-3097' is-artificial='yes'/>
-            <parameter type-id='type-id-42'/>
+            <parameter type-id='type-id-40'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='str' mangled-name='_ZNSt12strstreambuf3strEv' filepath='../../../.././libstdc++-v3/src/c++98/strstream.cc' line='129' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt12strstreambuf3strEv@@GLIBCXX_3.4'>
             <parameter type-id='type-id-3097' is-artificial='yes'/>
-            <return type-id='type-id-93'/>
+            <return type-id='type-id-92'/>
           </function-decl>
         </member-function>
         <member-function access='private' const='yes'>
@@ -44223,22 +44186,22 @@
         <member-function access='private'>
           <function-decl name='_M_alloc' mangled-name='_ZNSt12strstreambuf8_M_allocEm' filepath='../../../.././libstdc++-v3/src/c++98/strstream.cc' line='300' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt12strstreambuf8_M_allocEm@@GLIBCXX_3.4'>
             <parameter type-id='type-id-3097' is-artificial='yes'/>
-            <parameter type-id='type-id-94'/>
-            <return type-id='type-id-93'/>
+            <parameter type-id='type-id-93'/>
+            <return type-id='type-id-92'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='_M_free' mangled-name='_ZNSt12strstreambuf7_M_freeEPc' filepath='../../../.././libstdc++-v3/src/c++98/strstream.cc' line='309' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt12strstreambuf7_M_freeEPc@@GLIBCXX_3.4'>
             <parameter type-id='type-id-3097' is-artificial='yes'/>
-            <parameter type-id='type-id-93'/>
+            <parameter type-id='type-id-92'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='_M_setup' mangled-name='_ZNSt12strstreambuf8_M_setupEPcS0_l' filepath='../../../.././libstdc++-v3/src/c++98/strstream.cc' line='321' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt12strstreambuf8_M_setupEPcS0_l@@GLIBCXX_3.4'>
             <parameter type-id='type-id-3097' is-artificial='yes'/>
-            <parameter type-id='type-id-93'/>
-            <parameter type-id='type-id-93'/>
+            <parameter type-id='type-id-92'/>
+            <parameter type-id='type-id-92'/>
             <parameter type-id='type-id-872'/>
             <return type-id='type-id-5'/>
           </function-decl>
@@ -44247,7 +44210,7 @@
           <function-decl name='strstreambuf' mangled-name='_ZNSt12strstreambufC2EPFPvmEPFvS0_E' filepath='../../../.././libstdc++-v3/src/c++98/strstream.cc' line='70' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt12strstreambufC1EPFPvmEPFvS0_E@@GLIBCXX_3.4'>
             <parameter type-id='type-id-3097' is-artificial='yes'/>
             <parameter type-id='type-id-170'/>
-            <parameter type-id='type-id-88'/>
+            <parameter type-id='type-id-87'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
@@ -44261,7 +44224,7 @@
         <member-function access='private' constructor='yes'>
           <function-decl name='strstreambuf' mangled-name='_ZNSt12strstreambufC2EPKhl' filepath='../../../.././libstdc++-v3/src/c++98/strstream.cc' line='110' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt12strstreambufC1EPKhl@@GLIBCXX_3.4'>
             <parameter type-id='type-id-3097' is-artificial='yes'/>
-            <parameter type-id='type-id-84'/>
+            <parameter type-id='type-id-82'/>
             <parameter type-id='type-id-872'/>
             <return type-id='type-id-5'/>
           </function-decl>
@@ -44303,9 +44266,9 @@
         <member-function access='private' constructor='yes'>
           <function-decl name='strstreambuf' mangled-name='_ZNSt12strstreambufC2EPclS0_' filepath='../../../.././libstdc++-v3/src/c++98/strstream.cc' line='84' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt12strstreambufC1EPclS0_@@GLIBCXX_3.4'>
             <parameter type-id='type-id-3097' is-artificial='yes'/>
-            <parameter type-id='type-id-93'/>
+            <parameter type-id='type-id-92'/>
             <parameter type-id='type-id-872'/>
-            <parameter type-id='type-id-93'/>
+            <parameter type-id='type-id-92'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
@@ -44333,7 +44296,7 @@
         <member-function access='protected' vtable-offset='3'>
           <function-decl name='setbuf' mangled-name='_ZNSt12strstreambuf6setbufEPcl' filepath='../../../.././libstdc++-v3/src/c++98/strstream.cc' line='223' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt12strstreambuf6setbufEPcl@@GLIBCXX_3.4'>
             <parameter type-id='type-id-3097' is-artificial='yes'/>
-            <parameter type-id='type-id-93'/>
+            <parameter type-id='type-id-92'/>
             <parameter type-id='type-id-872'/>
             <return type-id='type-id-813'/>
           </function-decl>
@@ -44383,7 +44346,7 @@
           <function-decl name='basic_iostream' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/istream' line='814' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-3090' is-artificial='yes'/>
             <parameter type-id='type-id-6' is-artificial='yes'/>
-            <parameter type-id='type-id-37' is-artificial='yes'/>
+            <parameter type-id='type-id-35' is-artificial='yes'/>
             <parameter type-id='type-id-813'/>
             <return type-id='type-id-5'/>
           </function-decl>
@@ -44392,7 +44355,7 @@
           <function-decl name='basic_iostream' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/istream' line='824' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-3090' is-artificial='yes'/>
             <parameter type-id='type-id-6' is-artificial='yes'/>
-            <parameter type-id='type-id-37' is-artificial='yes'/>
+            <parameter type-id='type-id-35' is-artificial='yes'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
@@ -44400,7 +44363,7 @@
           <function-decl name='basic_iostream' mangled-name='_ZNSdC2EPSt15basic_streambufIcSt11char_traitsIcEE' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/istream' line='814' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSdC2EPSt15basic_streambufIcSt11char_traitsIcEE@@GLIBCXX_3.4'>
             <parameter type-id='type-id-3090' is-artificial='yes'/>
             <parameter type-id='type-id-6' is-artificial='yes'/>
-            <parameter type-id='type-id-37' is-artificial='yes'/>
+            <parameter type-id='type-id-35' is-artificial='yes'/>
             <parameter type-id='type-id-813'/>
             <return type-id='type-id-5'/>
           </function-decl>
@@ -44409,7 +44372,7 @@
           <function-decl name='basic_iostream' mangled-name='_ZNSdC1EPSt15basic_streambufIcSt11char_traitsIcEE' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/istream' line='814' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSdC1EPSt15basic_streambufIcSt11char_traitsIcEE@@GLIBCXX_3.4'>
             <parameter type-id='type-id-3090' is-artificial='yes'/>
             <parameter type-id='type-id-6' is-artificial='yes'/>
-            <parameter type-id='type-id-37' is-artificial='yes'/>
+            <parameter type-id='type-id-35' is-artificial='yes'/>
             <parameter type-id='type-id-813'/>
             <return type-id='type-id-5'/>
           </function-decl>
@@ -44418,7 +44381,7 @@
           <function-decl name='basic_iostream' mangled-name='_ZNSdC2Ev' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/istream' line='824' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSdC2Ev@@GLIBCXX_3.4'>
             <parameter type-id='type-id-3090' is-artificial='yes'/>
             <parameter type-id='type-id-6' is-artificial='yes'/>
-            <parameter type-id='type-id-37' is-artificial='yes'/>
+            <parameter type-id='type-id-35' is-artificial='yes'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
@@ -44426,7 +44389,7 @@
           <function-decl name='basic_iostream' mangled-name='_ZNSdC1Ev' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/istream' line='824' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSdC1Ev@@GLIBCXX_3.4'>
             <parameter type-id='type-id-3090' is-artificial='yes'/>
             <parameter type-id='type-id-6' is-artificial='yes'/>
-            <parameter type-id='type-id-37' is-artificial='yes'/>
+            <parameter type-id='type-id-35' is-artificial='yes'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
@@ -44434,7 +44397,7 @@
           <function-decl name='~basic_iostream' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/istream' line='821' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-3090' is-artificial='yes'/>
             <parameter type-id='type-id-6' is-artificial='yes'/>
-            <parameter type-id='type-id-37' is-artificial='yes'/>
+            <parameter type-id='type-id-35' is-artificial='yes'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
@@ -44442,7 +44405,7 @@
           <function-decl name='~basic_iostream' mangled-name='_ZNSdD0Ev' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/istream' line='821' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSdD0Ev@@GLIBCXX_3.4'>
             <parameter type-id='type-id-3090' is-artificial='yes'/>
             <parameter type-id='type-id-6' is-artificial='yes'/>
-            <parameter type-id='type-id-37' is-artificial='yes'/>
+            <parameter type-id='type-id-35' is-artificial='yes'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
@@ -44450,7 +44413,7 @@
           <function-decl name='~basic_iostream' mangled-name='_ZNSdD1Ev' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/istream' line='821' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSdD1Ev@@GLIBCXX_3.4'>
             <parameter type-id='type-id-3090' is-artificial='yes'/>
             <parameter type-id='type-id-6' is-artificial='yes'/>
-            <parameter type-id='type-id-37' is-artificial='yes'/>
+            <parameter type-id='type-id-35' is-artificial='yes'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
@@ -44458,7 +44421,7 @@
           <function-decl name='~basic_iostream' mangled-name='_ZNSdD2Ev' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/istream' line='821' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSdD2Ev@@GLIBCXX_3.4'>
             <parameter type-id='type-id-3090' is-artificial='yes'/>
             <parameter type-id='type-id-6' is-artificial='yes'/>
-            <parameter type-id='type-id-37' is-artificial='yes'/>
+            <parameter type-id='type-id-35' is-artificial='yes'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
@@ -44472,7 +44435,7 @@
           <function-decl name='strstream' filepath='../../../.././libstdc++-v3/src/c++98/strstream.cc' line='390' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-3095' is-artificial='yes'/>
             <parameter type-id='type-id-6' is-artificial='yes'/>
-            <parameter type-id='type-id-37' is-artificial='yes'/>
+            <parameter type-id='type-id-35' is-artificial='yes'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
@@ -44480,8 +44443,8 @@
           <function-decl name='strstream' filepath='../../../.././libstdc++-v3/src/c++98/strstream.cc' line='394' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-3095' is-artificial='yes'/>
             <parameter type-id='type-id-6' is-artificial='yes'/>
-            <parameter type-id='type-id-37' is-artificial='yes'/>
-            <parameter type-id='type-id-93'/>
+            <parameter type-id='type-id-35' is-artificial='yes'/>
+            <parameter type-id='type-id-92'/>
             <parameter type-id='type-id-6'/>
             <parameter type-id='type-id-875'/>
             <return type-id='type-id-5'/>
@@ -44496,7 +44459,7 @@
         <member-function access='private'>
           <function-decl name='freeze' mangled-name='_ZNSt9strstream6freezeEb' filepath='../../../.././libstdc++-v3/src/c++98/strstream.cc' line='406' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt9strstream6freezeEb@@GLIBCXX_3.4'>
             <parameter type-id='type-id-3095' is-artificial='yes'/>
-            <parameter type-id='type-id-42'/>
+            <parameter type-id='type-id-40'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
@@ -44509,14 +44472,14 @@
         <member-function access='private'>
           <function-decl name='str' mangled-name='_ZNSt9strstream3strEv' filepath='../../../.././libstdc++-v3/src/c++98/strstream.cc' line='414' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt9strstream3strEv@@GLIBCXX_3.4'>
             <parameter type-id='type-id-3095' is-artificial='yes'/>
-            <return type-id='type-id-93'/>
+            <return type-id='type-id-92'/>
           </function-decl>
         </member-function>
         <member-function access='private' constructor='yes'>
           <function-decl name='strstream' mangled-name='_ZNSt9strstreamC2Ev' filepath='../../../.././libstdc++-v3/src/c++98/strstream.cc' line='390' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt9strstreamC2Ev@@GLIBCXX_3.4'>
             <parameter type-id='type-id-3095' is-artificial='yes'/>
             <parameter type-id='type-id-6' is-artificial='yes'/>
-            <parameter type-id='type-id-37' is-artificial='yes'/>
+            <parameter type-id='type-id-35' is-artificial='yes'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
@@ -44524,7 +44487,7 @@
           <function-decl name='strstream' mangled-name='_ZNSt9strstreamC1Ev' filepath='../../../.././libstdc++-v3/src/c++98/strstream.cc' line='390' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt9strstreamC1Ev@@GLIBCXX_3.4'>
             <parameter type-id='type-id-3095' is-artificial='yes'/>
             <parameter type-id='type-id-6' is-artificial='yes'/>
-            <parameter type-id='type-id-37' is-artificial='yes'/>
+            <parameter type-id='type-id-35' is-artificial='yes'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
@@ -44532,8 +44495,8 @@
           <function-decl name='strstream' mangled-name='_ZNSt9strstreamC2EPciSt13_Ios_Openmode' filepath='../../../.././libstdc++-v3/src/c++98/strstream.cc' line='394' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt9strstreamC2EPciSt13_Ios_Openmode@@GLIBCXX_3.4'>
             <parameter type-id='type-id-3095' is-artificial='yes'/>
             <parameter type-id='type-id-6' is-artificial='yes'/>
-            <parameter type-id='type-id-37' is-artificial='yes'/>
-            <parameter type-id='type-id-93'/>
+            <parameter type-id='type-id-35' is-artificial='yes'/>
+            <parameter type-id='type-id-92'/>
             <parameter type-id='type-id-6'/>
             <parameter type-id='type-id-875'/>
             <return type-id='type-id-5'/>
@@ -44543,8 +44506,8 @@
           <function-decl name='strstream' mangled-name='_ZNSt9strstreamC1EPciSt13_Ios_Openmode' filepath='../../../.././libstdc++-v3/src/c++98/strstream.cc' line='394' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt9strstreamC1EPciSt13_Ios_Openmode@@GLIBCXX_3.4'>
             <parameter type-id='type-id-3095' is-artificial='yes'/>
             <parameter type-id='type-id-6' is-artificial='yes'/>
-            <parameter type-id='type-id-37' is-artificial='yes'/>
-            <parameter type-id='type-id-93'/>
+            <parameter type-id='type-id-35' is-artificial='yes'/>
+            <parameter type-id='type-id-92'/>
             <parameter type-id='type-id-6'/>
             <parameter type-id='type-id-875'/>
             <return type-id='type-id-5'/>
@@ -44554,7 +44517,7 @@
           <function-decl name='~strstream' filepath='../../../.././libstdc++-v3/src/c++98/strstream.cc' line='399' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-3095' is-artificial='yes'/>
             <parameter type-id='type-id-6' is-artificial='yes'/>
-            <parameter type-id='type-id-37' is-artificial='yes'/>
+            <parameter type-id='type-id-35' is-artificial='yes'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
@@ -44562,7 +44525,7 @@
           <function-decl name='~strstream' mangled-name='_ZNSt9strstreamD0Ev' filepath='../../../.././libstdc++-v3/src/c++98/strstream.cc' line='399' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt9strstreamD0Ev@@GLIBCXX_3.4'>
             <parameter type-id='type-id-3095' is-artificial='yes'/>
             <parameter type-id='type-id-6' is-artificial='yes'/>
-            <parameter type-id='type-id-37' is-artificial='yes'/>
+            <parameter type-id='type-id-35' is-artificial='yes'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
@@ -44570,7 +44533,7 @@
           <function-decl name='~strstream' mangled-name='_ZNSt9strstreamD1Ev' filepath='../../../.././libstdc++-v3/src/c++98/strstream.cc' line='399' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt9strstreamD1Ev@@GLIBCXX_3.4'>
             <parameter type-id='type-id-3095' is-artificial='yes'/>
             <parameter type-id='type-id-6' is-artificial='yes'/>
-            <parameter type-id='type-id-37' is-artificial='yes'/>
+            <parameter type-id='type-id-35' is-artificial='yes'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
@@ -44578,7 +44541,7 @@
           <function-decl name='~strstream' mangled-name='_ZNSt9strstreamD2Ev' filepath='../../../.././libstdc++-v3/src/c++98/strstream.cc' line='399' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt9strstreamD2Ev@@GLIBCXX_3.4'>
             <parameter type-id='type-id-3095' is-artificial='yes'/>
             <parameter type-id='type-id-6' is-artificial='yes'/>
-            <parameter type-id='type-id-37' is-artificial='yes'/>
+            <parameter type-id='type-id-35' is-artificial='yes'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
@@ -44592,7 +44555,7 @@
           <function-decl name='ostrstream' filepath='../../../.././libstdc++-v3/src/c++98/strstream.cc' line='363' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-3094' is-artificial='yes'/>
             <parameter type-id='type-id-6' is-artificial='yes'/>
-            <parameter type-id='type-id-37' is-artificial='yes'/>
+            <parameter type-id='type-id-35' is-artificial='yes'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
@@ -44600,8 +44563,8 @@
           <function-decl name='ostrstream' filepath='../../../.././libstdc++-v3/src/c++98/strstream.cc' line='367' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-3094' is-artificial='yes'/>
             <parameter type-id='type-id-6' is-artificial='yes'/>
-            <parameter type-id='type-id-37' is-artificial='yes'/>
-            <parameter type-id='type-id-93'/>
+            <parameter type-id='type-id-35' is-artificial='yes'/>
+            <parameter type-id='type-id-92'/>
             <parameter type-id='type-id-6'/>
             <parameter type-id='type-id-875'/>
             <return type-id='type-id-5'/>
@@ -44616,14 +44579,14 @@
         <member-function access='private'>
           <function-decl name='freeze' mangled-name='_ZNSt10ostrstream6freezeEb' filepath='../../../.././libstdc++-v3/src/c++98/strstream.cc' line='379' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt10ostrstream6freezeEb@@GLIBCXX_3.4'>
             <parameter type-id='type-id-3094' is-artificial='yes'/>
-            <parameter type-id='type-id-42'/>
+            <parameter type-id='type-id-40'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='str' mangled-name='_ZNSt10ostrstream3strEv' filepath='../../../.././libstdc++-v3/src/c++98/strstream.cc' line='383' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt10ostrstream3strEv@@GLIBCXX_3.4'>
             <parameter type-id='type-id-3094' is-artificial='yes'/>
-            <return type-id='type-id-93'/>
+            <return type-id='type-id-92'/>
           </function-decl>
         </member-function>
         <member-function access='private' const='yes'>
@@ -44636,7 +44599,7 @@
           <function-decl name='ostrstream' mangled-name='_ZNSt10ostrstreamC2Ev' filepath='../../../.././libstdc++-v3/src/c++98/strstream.cc' line='363' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt10ostrstreamC2Ev@@GLIBCXX_3.4'>
             <parameter type-id='type-id-3094' is-artificial='yes'/>
             <parameter type-id='type-id-6' is-artificial='yes'/>
-            <parameter type-id='type-id-37' is-artificial='yes'/>
+            <parameter type-id='type-id-35' is-artificial='yes'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
@@ -44644,7 +44607,7 @@
           <function-decl name='ostrstream' mangled-name='_ZNSt10ostrstreamC1Ev' filepath='../../../.././libstdc++-v3/src/c++98/strstream.cc' line='363' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt10ostrstreamC1Ev@@GLIBCXX_3.4'>
             <parameter type-id='type-id-3094' is-artificial='yes'/>
             <parameter type-id='type-id-6' is-artificial='yes'/>
-            <parameter type-id='type-id-37' is-artificial='yes'/>
+            <parameter type-id='type-id-35' is-artificial='yes'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
@@ -44652,8 +44615,8 @@
           <function-decl name='ostrstream' mangled-name='_ZNSt10ostrstreamC2EPciSt13_Ios_Openmode' filepath='../../../.././libstdc++-v3/src/c++98/strstream.cc' line='367' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt10ostrstreamC2EPciSt13_Ios_Openmode@@GLIBCXX_3.4'>
             <parameter type-id='type-id-3094' is-artificial='yes'/>
             <parameter type-id='type-id-6' is-artificial='yes'/>
-            <parameter type-id='type-id-37' is-artificial='yes'/>
-            <parameter type-id='type-id-93'/>
+            <parameter type-id='type-id-35' is-artificial='yes'/>
+            <parameter type-id='type-id-92'/>
             <parameter type-id='type-id-6'/>
             <parameter type-id='type-id-875'/>
             <return type-id='type-id-5'/>
@@ -44663,8 +44626,8 @@
           <function-decl name='ostrstream' mangled-name='_ZNSt10ostrstreamC1EPciSt13_Ios_Openmode' filepath='../../../.././libstdc++-v3/src/c++98/strstream.cc' line='367' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt10ostrstreamC1EPciSt13_Ios_Openmode@@GLIBCXX_3.4'>
             <parameter type-id='type-id-3094' is-artificial='yes'/>
             <parameter type-id='type-id-6' is-artificial='yes'/>
-            <parameter type-id='type-id-37' is-artificial='yes'/>
-            <parameter type-id='type-id-93'/>
+            <parameter type-id='type-id-35' is-artificial='yes'/>
+            <parameter type-id='type-id-92'/>
             <parameter type-id='type-id-6'/>
             <parameter type-id='type-id-875'/>
             <return type-id='type-id-5'/>
@@ -44674,7 +44637,7 @@
           <function-decl name='~ostrstream' filepath='../../../.././libstdc++-v3/src/c++98/strstream.cc' line='372' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-3094' is-artificial='yes'/>
             <parameter type-id='type-id-6' is-artificial='yes'/>
-            <parameter type-id='type-id-37' is-artificial='yes'/>
+            <parameter type-id='type-id-35' is-artificial='yes'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
@@ -44682,7 +44645,7 @@
           <function-decl name='~ostrstream' mangled-name='_ZNSt10ostrstreamD0Ev' filepath='../../../.././libstdc++-v3/src/c++98/strstream.cc' line='372' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt10ostrstreamD0Ev@@GLIBCXX_3.4'>
             <parameter type-id='type-id-3094' is-artificial='yes'/>
             <parameter type-id='type-id-6' is-artificial='yes'/>
-            <parameter type-id='type-id-37' is-artificial='yes'/>
+            <parameter type-id='type-id-35' is-artificial='yes'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
@@ -44690,7 +44653,7 @@
           <function-decl name='~ostrstream' mangled-name='_ZNSt10ostrstreamD1Ev' filepath='../../../.././libstdc++-v3/src/c++98/strstream.cc' line='372' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt10ostrstreamD1Ev@@GLIBCXX_3.4'>
             <parameter type-id='type-id-3094' is-artificial='yes'/>
             <parameter type-id='type-id-6' is-artificial='yes'/>
-            <parameter type-id='type-id-37' is-artificial='yes'/>
+            <parameter type-id='type-id-35' is-artificial='yes'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
@@ -44698,7 +44661,7 @@
           <function-decl name='~ostrstream' mangled-name='_ZNSt10ostrstreamD2Ev' filepath='../../../.././libstdc++-v3/src/c++98/strstream.cc' line='372' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt10ostrstreamD2Ev@@GLIBCXX_3.4'>
             <parameter type-id='type-id-3094' is-artificial='yes'/>
             <parameter type-id='type-id-6' is-artificial='yes'/>
-            <parameter type-id='type-id-37' is-artificial='yes'/>
+            <parameter type-id='type-id-35' is-artificial='yes'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
@@ -44712,8 +44675,8 @@
           <function-decl name='istrstream' filepath='../../../.././libstdc++-v3/src/c++98/strstream.cc' line='337' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-3093' is-artificial='yes'/>
             <parameter type-id='type-id-6' is-artificial='yes'/>
-            <parameter type-id='type-id-37' is-artificial='yes'/>
-            <parameter type-id='type-id-93'/>
+            <parameter type-id='type-id-35' is-artificial='yes'/>
+            <parameter type-id='type-id-92'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
@@ -44721,7 +44684,7 @@
           <function-decl name='istrstream' filepath='../../../.././libstdc++-v3/src/c++98/strstream.cc' line='341' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-3093' is-artificial='yes'/>
             <parameter type-id='type-id-6' is-artificial='yes'/>
-            <parameter type-id='type-id-37' is-artificial='yes'/>
+            <parameter type-id='type-id-35' is-artificial='yes'/>
             <parameter type-id='type-id-4'/>
             <return type-id='type-id-5'/>
           </function-decl>
@@ -44730,8 +44693,8 @@
           <function-decl name='istrstream' filepath='../../../.././libstdc++-v3/src/c++98/strstream.cc' line='345' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-3093' is-artificial='yes'/>
             <parameter type-id='type-id-6' is-artificial='yes'/>
-            <parameter type-id='type-id-37' is-artificial='yes'/>
-            <parameter type-id='type-id-93'/>
+            <parameter type-id='type-id-35' is-artificial='yes'/>
+            <parameter type-id='type-id-92'/>
             <parameter type-id='type-id-872'/>
             <return type-id='type-id-5'/>
           </function-decl>
@@ -44740,7 +44703,7 @@
           <function-decl name='istrstream' filepath='../../../.././libstdc++-v3/src/c++98/strstream.cc' line='349' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-3093' is-artificial='yes'/>
             <parameter type-id='type-id-6' is-artificial='yes'/>
-            <parameter type-id='type-id-37' is-artificial='yes'/>
+            <parameter type-id='type-id-35' is-artificial='yes'/>
             <parameter type-id='type-id-4'/>
             <parameter type-id='type-id-872'/>
             <return type-id='type-id-5'/>
@@ -44755,15 +44718,15 @@
         <member-function access='private'>
           <function-decl name='str' mangled-name='_ZNSt10istrstream3strEv' filepath='../../../.././libstdc++-v3/src/c++98/strstream.cc' line='360' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt10istrstream3strEv@@GLIBCXX_3.4'>
             <parameter type-id='type-id-3093' is-artificial='yes'/>
-            <return type-id='type-id-93'/>
+            <return type-id='type-id-92'/>
           </function-decl>
         </member-function>
         <member-function access='private' constructor='yes'>
           <function-decl name='istrstream' mangled-name='_ZNSt10istrstreamC2EPc' filepath='../../../.././libstdc++-v3/src/c++98/strstream.cc' line='337' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt10istrstreamC2EPc@@GLIBCXX_3.4'>
             <parameter type-id='type-id-3093' is-artificial='yes'/>
             <parameter type-id='type-id-6' is-artificial='yes'/>
-            <parameter type-id='type-id-37' is-artificial='yes'/>
-            <parameter type-id='type-id-93'/>
+            <parameter type-id='type-id-35' is-artificial='yes'/>
+            <parameter type-id='type-id-92'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
@@ -44771,8 +44734,8 @@
           <function-decl name='istrstream' mangled-name='_ZNSt10istrstreamC1EPc' filepath='../../../.././libstdc++-v3/src/c++98/strstream.cc' line='337' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt10istrstreamC1EPc@@GLIBCXX_3.4'>
             <parameter type-id='type-id-3093' is-artificial='yes'/>
             <parameter type-id='type-id-6' is-artificial='yes'/>
-            <parameter type-id='type-id-37' is-artificial='yes'/>
-            <parameter type-id='type-id-93'/>
+            <parameter type-id='type-id-35' is-artificial='yes'/>
+            <parameter type-id='type-id-92'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
@@ -44780,7 +44743,7 @@
           <function-decl name='istrstream' mangled-name='_ZNSt10istrstreamC2EPKc' filepath='../../../.././libstdc++-v3/src/c++98/strstream.cc' line='341' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt10istrstreamC2EPKc@@GLIBCXX_3.4'>
             <parameter type-id='type-id-3093' is-artificial='yes'/>
             <parameter type-id='type-id-6' is-artificial='yes'/>
-            <parameter type-id='type-id-37' is-artificial='yes'/>
+            <parameter type-id='type-id-35' is-artificial='yes'/>
             <parameter type-id='type-id-4'/>
             <return type-id='type-id-5'/>
           </function-decl>
@@ -44789,7 +44752,7 @@
           <function-decl name='istrstream' mangled-name='_ZNSt10istrstreamC1EPKc' filepath='../../../.././libstdc++-v3/src/c++98/strstream.cc' line='341' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt10istrstreamC1EPKc@@GLIBCXX_3.4'>
             <parameter type-id='type-id-3093' is-artificial='yes'/>
             <parameter type-id='type-id-6' is-artificial='yes'/>
-            <parameter type-id='type-id-37' is-artificial='yes'/>
+            <parameter type-id='type-id-35' is-artificial='yes'/>
             <parameter type-id='type-id-4'/>
             <return type-id='type-id-5'/>
           </function-decl>
@@ -44798,8 +44761,8 @@
           <function-decl name='istrstream' mangled-name='_ZNSt10istrstreamC2EPcl' filepath='../../../.././libstdc++-v3/src/c++98/strstream.cc' line='345' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt10istrstreamC2EPcl@@GLIBCXX_3.4'>
             <parameter type-id='type-id-3093' is-artificial='yes'/>
             <parameter type-id='type-id-6' is-artificial='yes'/>
-            <parameter type-id='type-id-37' is-artificial='yes'/>
-            <parameter type-id='type-id-93'/>
+            <parameter type-id='type-id-35' is-artificial='yes'/>
+            <parameter type-id='type-id-92'/>
             <parameter type-id='type-id-872'/>
             <return type-id='type-id-5'/>
           </function-decl>
@@ -44808,8 +44771,8 @@
           <function-decl name='istrstream' mangled-name='_ZNSt10istrstreamC1EPcl' filepath='../../../.././libstdc++-v3/src/c++98/strstream.cc' line='345' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt10istrstreamC1EPcl@@GLIBCXX_3.4'>
             <parameter type-id='type-id-3093' is-artificial='yes'/>
             <parameter type-id='type-id-6' is-artificial='yes'/>
-            <parameter type-id='type-id-37' is-artificial='yes'/>
-            <parameter type-id='type-id-93'/>
+            <parameter type-id='type-id-35' is-artificial='yes'/>
+            <parameter type-id='type-id-92'/>
             <parameter type-id='type-id-872'/>
             <return type-id='type-id-5'/>
           </function-decl>
@@ -44818,7 +44781,7 @@
           <function-decl name='istrstream' mangled-name='_ZNSt10istrstreamC2EPKcl' filepath='../../../.././libstdc++-v3/src/c++98/strstream.cc' line='349' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt10istrstreamC2EPKcl@@GLIBCXX_3.4'>
             <parameter type-id='type-id-3093' is-artificial='yes'/>
             <parameter type-id='type-id-6' is-artificial='yes'/>
-            <parameter type-id='type-id-37' is-artificial='yes'/>
+            <parameter type-id='type-id-35' is-artificial='yes'/>
             <parameter type-id='type-id-4'/>
             <parameter type-id='type-id-872'/>
             <return type-id='type-id-5'/>
@@ -44828,7 +44791,7 @@
           <function-decl name='istrstream' mangled-name='_ZNSt10istrstreamC1EPKcl' filepath='../../../.././libstdc++-v3/src/c++98/strstream.cc' line='349' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt10istrstreamC1EPKcl@@GLIBCXX_3.4'>
             <parameter type-id='type-id-3093' is-artificial='yes'/>
             <parameter type-id='type-id-6' is-artificial='yes'/>
-            <parameter type-id='type-id-37' is-artificial='yes'/>
+            <parameter type-id='type-id-35' is-artificial='yes'/>
             <parameter type-id='type-id-4'/>
             <parameter type-id='type-id-872'/>
             <return type-id='type-id-5'/>
@@ -44838,7 +44801,7 @@
           <function-decl name='~istrstream' filepath='../../../.././libstdc++-v3/src/c++98/strstream.cc' line='353' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-3093' is-artificial='yes'/>
             <parameter type-id='type-id-6' is-artificial='yes'/>
-            <parameter type-id='type-id-37' is-artificial='yes'/>
+            <parameter type-id='type-id-35' is-artificial='yes'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
@@ -44846,7 +44809,7 @@
           <function-decl name='~istrstream' mangled-name='_ZNSt10istrstreamD0Ev' filepath='../../../.././libstdc++-v3/src/c++98/strstream.cc' line='353' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt10istrstreamD0Ev@@GLIBCXX_3.4'>
             <parameter type-id='type-id-3093' is-artificial='yes'/>
             <parameter type-id='type-id-6' is-artificial='yes'/>
-            <parameter type-id='type-id-37' is-artificial='yes'/>
+            <parameter type-id='type-id-35' is-artificial='yes'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
@@ -44854,7 +44817,7 @@
           <function-decl name='~istrstream' mangled-name='_ZNSt10istrstreamD1Ev' filepath='../../../.././libstdc++-v3/src/c++98/strstream.cc' line='353' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt10istrstreamD1Ev@@GLIBCXX_3.4'>
             <parameter type-id='type-id-3093' is-artificial='yes'/>
             <parameter type-id='type-id-6' is-artificial='yes'/>
-            <parameter type-id='type-id-37' is-artificial='yes'/>
+            <parameter type-id='type-id-35' is-artificial='yes'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
@@ -44862,7 +44825,7 @@
           <function-decl name='~istrstream' mangled-name='_ZNSt10istrstreamD2Ev' filepath='../../../.././libstdc++-v3/src/c++98/strstream.cc' line='353' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt10istrstreamD2Ev@@GLIBCXX_3.4'>
             <parameter type-id='type-id-3093' is-artificial='yes'/>
             <parameter type-id='type-id-6' is-artificial='yes'/>
-            <parameter type-id='type-id-37' is-artificial='yes'/>
+            <parameter type-id='type-id-35' is-artificial='yes'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
@@ -44878,7 +44841,7 @@
     <reference-type-def kind='lvalue' type-id='type-id-1507' size-in-bits='64' id='type-id-3102'/>
     <namespace-decl name='std'>
       <enum-decl name='_Rb_tree_color' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/stl_tree.h' line='88' column='1' id='type-id-3099'>
-        <underlying-type type-id='type-id-39'/>
+        <underlying-type type-id='type-id-37'/>
         <enumerator name='_S_red' value='0'/>
         <enumerator name='_S_black' value='1'/>
       </enum-decl>
@@ -44958,7 +44921,7 @@
         <return type-id='type-id-5'/>
       </function-decl>
       <function-decl name='_Rb_tree_insert_and_rebalance' mangled-name='_ZSt29_Rb_tree_insert_and_rebalancebPSt18_Rb_tree_node_baseS0_RS_' filepath='../../../.././libstdc++-v3/src/c++98/tree.cc' line='195' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt29_Rb_tree_insert_and_rebalancebPSt18_Rb_tree_node_baseS0_RS_@@GLIBCXX_3.4'>
-        <parameter type-id='type-id-42'/>
+        <parameter type-id='type-id-40'/>
         <parameter type-id='type-id-1507'/>
         <parameter type-id='type-id-1507'/>
         <parameter type-id='type-id-3101'/>
@@ -44972,14 +44935,14 @@
       <function-decl name='_Rb_tree_black_count' mangled-name='_ZSt20_Rb_tree_black_countPKSt18_Rb_tree_node_baseS1_' filepath='../../../.././libstdc++-v3/src/c++98/tree.cc' line='447' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt20_Rb_tree_black_countPKSt18_Rb_tree_node_baseS1_@@GLIBCXX_3.4'>
         <parameter type-id='type-id-1509'/>
         <parameter type-id='type-id-1509'/>
-        <return type-id='type-id-41'/>
+        <return type-id='type-id-39'/>
       </function-decl>
     </namespace-decl>
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='../../../.././libstdc++-v3/src/c++98/valarray.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/src/c++98' language='LANG_C_plus_plus'>
     <pointer-type-def type-id='type-id-3103' size-in-bits='64' id='type-id-3104'/>
     <pointer-type-def type-id='type-id-3105' size-in-bits='64' id='type-id-3106'/>
-    <pointer-type-def type-id='type-id-42' size-in-bits='64' id='type-id-3107'/>
+    <pointer-type-def type-id='type-id-40' size-in-bits='64' id='type-id-3107'/>
     <qualified-type-def type-id='type-id-3107' const='yes' id='type-id-3108'/>
     <reference-type-def kind='lvalue' type-id='type-id-243' size-in-bits='64' id='type-id-2345'/>
     <pointer-type-def type-id='type-id-243' size-in-bits='64' id='type-id-3109'/>
@@ -45041,12 +45004,12 @@
     <pointer-type-def type-id='type-id-3156' size-in-bits='64' id='type-id-3180'/>
     <pointer-type-def type-id='type-id-3181' size-in-bits='64' id='type-id-3182'/>
     <pointer-type-def type-id='type-id-3183' size-in-bits='64' id='type-id-3184'/>
-    <reference-type-def kind='lvalue' type-id='type-id-51' size-in-bits='64' id='type-id-1048'/>
+    <reference-type-def kind='lvalue' type-id='type-id-49' size-in-bits='64' id='type-id-1048'/>
     <namespace-decl name='std'>
       <function-decl name='__valarray_product&lt;long unsigned int&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/valarray_array.h' line='359' column='1' visibility='default' binding='global' size-in-bits='64'>
         <parameter type-id='type-id-3161'/>
         <parameter type-id='type-id-3161'/>
-        <return type-id='type-id-51'/>
+        <return type-id='type-id-49'/>
       </function-decl>
       <function-decl name='__valarray_destroy_elements&lt;long unsigned int&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/valarray_array.h' line='206' column='1' visibility='default' binding='global' size-in-bits='64'>
         <parameter type-id='type-id-1968'/>
@@ -45054,12 +45017,12 @@
         <return type-id='type-id-5'/>
       </function-decl>
       <function-decl name='__valarray_release_memory' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/valarray_array.h' line='67' column='1' visibility='default' binding='global' size-in-bits='64'>
-        <parameter type-id='type-id-36'/>
+        <parameter type-id='type-id-34'/>
         <return type-id='type-id-5'/>
       </function-decl>
       <function-decl name='__valarray_get_memory' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/valarray_array.h' line='54' column='1' visibility='default' binding='global' size-in-bits='64'>
-        <parameter type-id='type-id-94'/>
-        <return type-id='type-id-36'/>
+        <parameter type-id='type-id-93'/>
+        <return type-id='type-id-34'/>
       </function-decl>
       <function-decl name='__valarray_copy_construct&lt;long unsigned int&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/valarray_array.h' line='162' column='1' visibility='default' binding='global' size-in-bits='64'>
         <parameter type-id='type-id-3161'/>
@@ -45102,7 +45065,7 @@
           </class-decl>
         </member-type>
         <data-member access='private' layout-offset-in-bits='0'>
-          <var-decl name='_M_size' type-id='type-id-94' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/valarray' line='562' column='1'/>
+          <var-decl name='_M_size' type-id='type-id-93' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/valarray' line='562' column='1'/>
         </data-member>
         <data-member access='private' layout-offset-in-bits='64'>
           <var-decl name='_M_data' type-id='type-id-1968' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/valarray' line='563' column='1'/>
@@ -45116,7 +45079,7 @@
         <member-function access='private'>
           <function-decl name='valarray' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/valarray' line='134' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-3180' is-artificial='yes'/>
-            <parameter type-id='type-id-94'/>
+            <parameter type-id='type-id-93'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
@@ -45124,7 +45087,7 @@
           <function-decl name='valarray' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/valarray' line='137' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-3180' is-artificial='yes'/>
             <parameter type-id='type-id-1962'/>
-            <parameter type-id='type-id-94'/>
+            <parameter type-id='type-id-93'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
@@ -45132,7 +45095,7 @@
           <function-decl name='valarray' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/valarray' line='140' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-3180' is-artificial='yes'/>
             <parameter type-id='type-id-3161'/>
-            <parameter type-id='type-id-94'/>
+            <parameter type-id='type-id-93'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
@@ -45223,14 +45186,14 @@
         <member-function access='private'>
           <function-decl name='operator[]' mangled-name='_ZNSt8valarrayImEixEm' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/valarray' line='578' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt8valarrayImEixEm@@GLIBCXX_3.4'>
             <parameter type-id='type-id-3180' is-artificial='yes'/>
-            <parameter type-id='type-id-94'/>
+            <parameter type-id='type-id-93'/>
             <return type-id='type-id-1048'/>
           </function-decl>
         </member-function>
         <member-function access='private' const='yes'>
           <function-decl name='operator[]' mangled-name='_ZNKSt8valarrayImEixEm' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/valarray' line='570' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-3160' is-artificial='yes'/>
-            <parameter type-id='type-id-94'/>
+            <parameter type-id='type-id-93'/>
             <return type-id='type-id-1962'/>
           </function-decl>
         </member-function>
@@ -45457,25 +45420,25 @@
         <member-function access='private' const='yes'>
           <function-decl name='size' mangled-name='_ZNKSt8valarrayImE4sizeEv' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/valarray' line='476' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSt8valarrayImE4sizeEv@@GLIBCXX_3.4'>
             <parameter type-id='type-id-3160' is-artificial='yes'/>
-            <return type-id='type-id-94'/>
+            <return type-id='type-id-93'/>
           </function-decl>
         </member-function>
         <member-function access='private' const='yes'>
           <function-decl name='sum' mangled-name='_ZNKSt8valarrayImE3sumEv' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/valarray' line='484' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-3160' is-artificial='yes'/>
-            <return type-id='type-id-51'/>
+            <return type-id='type-id-49'/>
           </function-decl>
         </member-function>
         <member-function access='private' const='yes'>
           <function-decl name='min' mangled-name='_ZNKSt8valarrayImE3minEv' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/valarray' line='487' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-3160' is-artificial='yes'/>
-            <return type-id='type-id-51'/>
+            <return type-id='type-id-49'/>
           </function-decl>
         </member-function>
         <member-function access='private' const='yes'>
           <function-decl name='max' mangled-name='_ZNKSt8valarrayImE3maxEv' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/valarray' line='490' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-3160' is-artificial='yes'/>
-            <return type-id='type-id-51'/>
+            <return type-id='type-id-49'/>
           </function-decl>
         </member-function>
         <member-function access='private' const='yes'>
@@ -45509,8 +45472,8 @@
         <member-function access='private'>
           <function-decl name='resize' mangled-name='_ZNSt8valarrayImE6resizeEmm' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/valarray' line='559' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-3180' is-artificial='yes'/>
-            <parameter type-id='type-id-94'/>
-            <parameter type-id='type-id-51'/>
+            <parameter type-id='type-id-93'/>
+            <parameter type-id='type-id-49'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
@@ -45531,7 +45494,7 @@
         <member-function access='private'>
           <function-decl name='valarray' mangled-name='_ZNSt8valarrayImEC2Em' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/valarray' line='134' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt8valarrayImEC2Em@@GLIBCXX_3.4'>
             <parameter type-id='type-id-3180' is-artificial='yes'/>
-            <parameter type-id='type-id-94'/>
+            <parameter type-id='type-id-93'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
@@ -45670,7 +45633,7 @@
         <member-function access='public'>
           <function-decl name='_Array' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/valarray_array.h' line='409' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-3163' is-artificial='yes'/>
-            <parameter type-id='type-id-94'/>
+            <parameter type-id='type-id-93'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
@@ -45692,7 +45655,7 @@
           <function-decl name='_Array' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/valarray_array.h' line='412' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-3163' is-artificial='yes'/>
             <parameter type-id='type-id-3161'/>
-            <parameter type-id='type-id-94'/>
+            <parameter type-id='type-id-93'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
@@ -45705,13 +45668,13 @@
       </class-decl>
       <class-decl name='slice' size-in-bits='192' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/slice_array.h' line='60' column='1' id='type-id-3141'>
         <data-member access='private' layout-offset-in-bits='0'>
-          <var-decl name='_M_off' type-id='type-id-94' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/slice_array.h' line='83' column='1'/>
+          <var-decl name='_M_off' type-id='type-id-93' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/slice_array.h' line='83' column='1'/>
         </data-member>
         <data-member access='private' layout-offset-in-bits='64'>
-          <var-decl name='_M_sz' type-id='type-id-94' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/slice_array.h' line='84' column='1'/>
+          <var-decl name='_M_sz' type-id='type-id-93' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/slice_array.h' line='84' column='1'/>
         </data-member>
         <data-member access='private' layout-offset-in-bits='128'>
-          <var-decl name='_M_st' type-id='type-id-94' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/slice_array.h' line='85' column='1'/>
+          <var-decl name='_M_st' type-id='type-id-93' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/slice_array.h' line='85' column='1'/>
         </data-member>
         <member-function access='private' constructor='yes'>
           <function-decl name='slice' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/slice_array.h' line='64' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -45722,28 +45685,28 @@
         <member-function access='private' constructor='yes'>
           <function-decl name='slice' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/slice_array.h' line='73' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-3174' is-artificial='yes'/>
-            <parameter type-id='type-id-94'/>
-            <parameter type-id='type-id-94'/>
-            <parameter type-id='type-id-94'/>
+            <parameter type-id='type-id-93'/>
+            <parameter type-id='type-id-93'/>
+            <parameter type-id='type-id-93'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='private' const='yes'>
           <function-decl name='start' mangled-name='_ZNKSt5slice5startEv' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/slice_array.h' line='76' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-3144' is-artificial='yes'/>
-            <return type-id='type-id-94'/>
+            <return type-id='type-id-93'/>
           </function-decl>
         </member-function>
         <member-function access='private' const='yes'>
           <function-decl name='size' mangled-name='_ZNKSt5slice4sizeEv' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/slice_array.h' line='78' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-3144' is-artificial='yes'/>
-            <return type-id='type-id-94'/>
+            <return type-id='type-id-93'/>
           </function-decl>
         </member-function>
         <member-function access='private' const='yes'>
           <function-decl name='stride' mangled-name='_ZNKSt5slice6strideEv' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/slice_array.h' line='80' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-3144' is-artificial='yes'/>
-            <return type-id='type-id-94'/>
+            <return type-id='type-id-93'/>
           </function-decl>
         </member-function>
       </class-decl>
@@ -45979,7 +45942,7 @@
           <function-decl name='mask_array' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/mask_array.h' line='145' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-3173' is-artificial='yes'/>
             <parameter type-id='type-id-3113'/>
-            <parameter type-id='type-id-94'/>
+            <parameter type-id='type-id-93'/>
             <parameter type-id='type-id-3110'/>
             <return type-id='type-id-5'/>
           </function-decl>
@@ -45998,7 +45961,7 @@
         <member-function access='public'>
           <function-decl name='_Array' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/valarray_array.h' line='504' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-3162' is-artificial='yes'/>
-            <parameter type-id='type-id-94'/>
+            <parameter type-id='type-id-93'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
@@ -46020,7 +45983,7 @@
           <function-decl name='_Array' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/valarray_array.h' line='520' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-3162' is-artificial='yes'/>
             <parameter type-id='type-id-3109'/>
-            <parameter type-id='type-id-94'/>
+            <parameter type-id='type-id-93'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
@@ -46061,7 +46024,7 @@
           </class-decl>
         </member-type>
         <data-member access='private' layout-offset-in-bits='0'>
-          <var-decl name='_M_size' type-id='type-id-94' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/valarray' line='562' column='1'/>
+          <var-decl name='_M_size' type-id='type-id-93' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/valarray' line='562' column='1'/>
         </data-member>
         <data-member access='private' layout-offset-in-bits='64'>
           <var-decl name='_M_data' type-id='type-id-3107' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/valarray' line='563' column='1'/>
@@ -46075,7 +46038,7 @@
         <member-function access='private'>
           <function-decl name='valarray' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/valarray' line='134' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-3178' is-artificial='yes'/>
-            <parameter type-id='type-id-94'/>
+            <parameter type-id='type-id-93'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
@@ -46083,7 +46046,7 @@
           <function-decl name='valarray' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/valarray' line='137' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-3178' is-artificial='yes'/>
             <parameter type-id='type-id-2345'/>
-            <parameter type-id='type-id-94'/>
+            <parameter type-id='type-id-93'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
@@ -46091,7 +46054,7 @@
           <function-decl name='valarray' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/valarray' line='140' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-3178' is-artificial='yes'/>
             <parameter type-id='type-id-3109'/>
-            <parameter type-id='type-id-94'/>
+            <parameter type-id='type-id-93'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
@@ -46182,14 +46145,14 @@
         <member-function access='private'>
           <function-decl name='operator[]' mangled-name='_ZNSt8valarrayIbEixEm' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/valarray' line='578' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-3178' is-artificial='yes'/>
-            <parameter type-id='type-id-94'/>
+            <parameter type-id='type-id-93'/>
             <return type-id='type-id-577'/>
           </function-decl>
         </member-function>
         <member-function access='private' const='yes'>
           <function-decl name='operator[]' mangled-name='_ZNKSt8valarrayIbEixEm' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/valarray' line='570' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-3155' is-artificial='yes'/>
-            <parameter type-id='type-id-94'/>
+            <parameter type-id='type-id-93'/>
             <return type-id='type-id-2345'/>
           </function-decl>
         </member-function>
@@ -46416,25 +46379,25 @@
         <member-function access='private' const='yes'>
           <function-decl name='size' mangled-name='_ZNKSt8valarrayIbE4sizeEv' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/valarray' line='476' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-3155' is-artificial='yes'/>
-            <return type-id='type-id-94'/>
+            <return type-id='type-id-93'/>
           </function-decl>
         </member-function>
         <member-function access='private' const='yes'>
           <function-decl name='sum' mangled-name='_ZNKSt8valarrayIbE3sumEv' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/valarray' line='484' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-3155' is-artificial='yes'/>
-            <return type-id='type-id-42'/>
+            <return type-id='type-id-40'/>
           </function-decl>
         </member-function>
         <member-function access='private' const='yes'>
           <function-decl name='min' mangled-name='_ZNKSt8valarrayIbE3minEv' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/valarray' line='487' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-3155' is-artificial='yes'/>
-            <return type-id='type-id-42'/>
+            <return type-id='type-id-40'/>
           </function-decl>
         </member-function>
         <member-function access='private' const='yes'>
           <function-decl name='max' mangled-name='_ZNKSt8valarrayIbE3maxEv' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/valarray' line='490' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-3155' is-artificial='yes'/>
-            <return type-id='type-id-42'/>
+            <return type-id='type-id-40'/>
           </function-decl>
         </member-function>
         <member-function access='private' const='yes'>
@@ -46468,8 +46431,8 @@
         <member-function access='private'>
           <function-decl name='resize' mangled-name='_ZNSt8valarrayIbE6resizeEmb' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/valarray' line='559' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-3178' is-artificial='yes'/>
-            <parameter type-id='type-id-94'/>
-            <parameter type-id='type-id-42'/>
+            <parameter type-id='type-id-93'/>
+            <parameter type-id='type-id-40'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
@@ -46488,10 +46451,10 @@
         <member-type access='private'>
           <class-decl name='_Indexer' size-in-bits='512' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/gslice.h' line='107' column='1' id='type-id-3166'>
             <data-member access='public' layout-offset-in-bits='0'>
-              <var-decl name='_M_count' type-id='type-id-94' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/gslice.h' line='109' column='1'/>
+              <var-decl name='_M_count' type-id='type-id-93' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/gslice.h' line='109' column='1'/>
             </data-member>
             <data-member access='public' layout-offset-in-bits='64'>
-              <var-decl name='_M_start' type-id='type-id-94' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/gslice.h' line='110' column='1'/>
+              <var-decl name='_M_start' type-id='type-id-93' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/gslice.h' line='110' column='1'/>
             </data-member>
             <data-member access='public' layout-offset-in-bits='128'>
               <var-decl name='_M_size' type-id='type-id-3156' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/gslice.h' line='111' column='1'/>
@@ -46511,7 +46474,7 @@
             <member-function access='public' constructor='yes'>
               <function-decl name='_Indexer' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/gslice.h' line='118' column='1' visibility='default' binding='global' size-in-bits='64'>
                 <parameter type-id='type-id-3167' is-artificial='yes'/>
-                <parameter type-id='type-id-94'/>
+                <parameter type-id='type-id-93'/>
                 <parameter type-id='type-id-3158'/>
                 <parameter type-id='type-id-3158'/>
                 <return type-id='type-id-5'/>
@@ -46526,13 +46489,13 @@
             <member-function access='public'>
               <function-decl name='_M_decrement_use' mangled-name='_ZNSt6gslice8_Indexer16_M_decrement_useEv' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/gslice.h' line='126' column='1' visibility='default' binding='global' size-in-bits='64'>
                 <parameter type-id='type-id-3167' is-artificial='yes'/>
-                <return type-id='type-id-94'/>
+                <return type-id='type-id-93'/>
               </function-decl>
             </member-function>
             <member-function access='public' constructor='yes'>
               <function-decl name='_Indexer' mangled-name='_ZNSt6gslice8_IndexerC2EmRKSt8valarrayImES4_' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/gslice.h' line='118' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt6gslice8_IndexerC2EmRKSt8valarrayImES4_@@GLIBCXX_3.4'>
                 <parameter type-id='type-id-3167' is-artificial='yes'/>
-                <parameter type-id='type-id-94'/>
+                <parameter type-id='type-id-93'/>
                 <parameter type-id='type-id-3158'/>
                 <parameter type-id='type-id-3158'/>
                 <return type-id='type-id-5'/>
@@ -46552,7 +46515,7 @@
         <member-function access='private' constructor='yes'>
           <function-decl name='gslice' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/gslice.h' line='81' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-3165' is-artificial='yes'/>
-            <parameter type-id='type-id-94'/>
+            <parameter type-id='type-id-93'/>
             <parameter type-id='type-id-3158'/>
             <parameter type-id='type-id-3158'/>
             <return type-id='type-id-5'/>
@@ -46582,7 +46545,7 @@
         <member-function access='private' const='yes'>
           <function-decl name='start' mangled-name='_ZNKSt6gslice5startEv' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/gslice.h' line='98' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-3119' is-artificial='yes'/>
-            <return type-id='type-id-94'/>
+            <return type-id='type-id-93'/>
           </function-decl>
         </member-function>
         <member-function access='private' const='yes'>
@@ -46713,7 +46676,7 @@
           <function-decl name='indirect_array' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/indirect_array.h' line='149' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-3171' is-artificial='yes'/>
             <parameter type-id='type-id-3113'/>
-            <parameter type-id='type-id-94'/>
+            <parameter type-id='type-id-93'/>
             <parameter type-id='type-id-3113'/>
             <return type-id='type-id-5'/>
           </function-decl>
@@ -46732,14 +46695,14 @@
       <class-decl name='_Expr&lt;std::_RefFunClos&lt;std::_ValArray, long unsigned int&gt;, long unsigned int&gt;' visibility='default' is-declaration-only='yes' id='type-id-3201'/>
       <function-decl name='__valarray_product' filepath='../../../.././libstdc++-v3/src/c++98/valarray.cc' line='50' column='1' visibility='default' binding='global' size-in-bits='64'>
         <parameter type-id='type-id-3158'/>
-        <return type-id='type-id-94'/>
+        <return type-id='type-id-93'/>
       </function-decl>
       <function-decl name='__valarray_get_storage&lt;long unsigned int&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/valarray_array.h' line='59' column='1' visibility='default' binding='global' size-in-bits='64'>
-        <parameter type-id='type-id-94'/>
+        <parameter type-id='type-id-93'/>
         <return type-id='type-id-1968'/>
       </function-decl>
       <function-decl name='__gslice_to_index' mangled-name='_ZSt17__gslice_to_indexmRKSt8valarrayImES2_RS0_' filepath='../../../.././libstdc++-v3/src/c++98/valarray.cc' line='65' column='1' visibility='default' binding='global' size-in-bits='64'>
-        <parameter type-id='type-id-94'/>
+        <parameter type-id='type-id-93'/>
         <parameter type-id='type-id-3158'/>
         <parameter type-id='type-id-3158'/>
         <parameter type-id='type-id-3179'/>
@@ -46747,13 +46710,13 @@
       </function-decl>
       <function-decl name='__valarray_fill&lt;long unsigned int&gt;' mangled-name='_ZSt15__valarray_fillImEvPT_mRKS0_' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/valarray_array.h' line='219' column='1' visibility='default' binding='global' size-in-bits='64'>
         <parameter type-id='type-id-1968'/>
-        <parameter type-id='type-id-94'/>
+        <parameter type-id='type-id-93'/>
         <parameter type-id='type-id-1962'/>
         <return type-id='type-id-5'/>
       </function-decl>
       <function-decl name='__valarray_copy&lt;long unsigned int&gt;' mangled-name='_ZSt15__valarray_copyImEvPKT_mPS0_' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/valarray_array.h' line='269' column='1' visibility='default' binding='global' size-in-bits='64'>
         <parameter type-id='type-id-3161'/>
-        <parameter type-id='type-id-94'/>
+        <parameter type-id='type-id-93'/>
         <parameter type-id='type-id-1968'/>
         <return type-id='type-id-5'/>
       </function-decl>
@@ -46780,7 +46743,7 @@
         <member-function access='public' static='yes'>
           <function-decl name='_S_do_it' mangled-name='_ZNSt13_Array_copierImLb1EE8_S_do_itEPKmmPm' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/valarray_array.h' line='262' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-3161'/>
-            <parameter type-id='type-id-94'/>
+            <parameter type-id='type-id-93'/>
             <parameter type-id='type-id-1968'/>
             <return type-id='type-id-5'/>
           </function-decl>
@@ -46788,20 +46751,20 @@
       </class-decl>
     </namespace-decl>
     <function-type size-in-bits='64' id='type-id-3103'>
-      <parameter type-id='type-id-42'/>
-      <return type-id='type-id-42'/>
+      <parameter type-id='type-id-40'/>
+      <return type-id='type-id-40'/>
     </function-type>
     <function-type size-in-bits='64' id='type-id-3105'>
       <parameter type-id='type-id-2345'/>
-      <return type-id='type-id-42'/>
+      <return type-id='type-id-40'/>
     </function-type>
     <function-type size-in-bits='64' id='type-id-3181'>
       <parameter type-id='type-id-1962'/>
-      <return type-id='type-id-51'/>
+      <return type-id='type-id-49'/>
     </function-type>
     <function-type size-in-bits='64' id='type-id-3183'>
-      <parameter type-id='type-id-51'/>
-      <return type-id='type-id-51'/>
+      <parameter type-id='type-id-49'/>
+      <return type-id='type-id-49'/>
     </function-type>
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='../../../.././libstdc++-v3/src/c++98/wlocale-inst.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/src/c++98' language='LANG_C_plus_plus'>
@@ -46910,7 +46873,7 @@
       <function-decl name='operator!=&lt;wchar_t, std::char_traits&lt;wchar_t&gt; &gt;' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/streambuf_iterator.h' line='212' column='1' visibility='default' binding='global' size-in-bits='64'>
         <parameter type-id='type-id-2579'/>
         <parameter type-id='type-id-2579'/>
-        <return type-id='type-id-42'/>
+        <return type-id='type-id-40'/>
       </function-decl>
       <function-decl name='use_facet&lt;std::codecvt&lt;wchar_t, char, __mbstate_t&gt; &gt;' mangled-name='_ZSt9use_facetISt7codecvtIwc11__mbstate_tEERKT_RKSt6locale' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_classes.tcc' line='130' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt9use_facetISt7codecvtIwc11__mbstate_tEERKT_RKSt6locale@@GLIBCXX_3.4'>
         <parameter type-id='type-id-862'/>
@@ -46958,59 +46921,59 @@
       </function-decl>
       <function-decl name='has_facet&lt;std::codecvt&lt;wchar_t, char, __mbstate_t&gt; &gt;' mangled-name='_ZSt9has_facetISt7codecvtIwc11__mbstate_tEEbRKSt6locale' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_classes.tcc' line='103' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt9has_facetISt7codecvtIwc11__mbstate_tEEbRKSt6locale@@GLIBCXX_3.4'>
         <parameter type-id='type-id-862'/>
-        <return type-id='type-id-42'/>
+        <return type-id='type-id-40'/>
       </function-decl>
       <function-decl name='has_facet&lt;std::collate&lt;wchar_t&gt; &gt;' mangled-name='_ZSt9has_facetISt7collateIwEEbRKSt6locale' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_classes.tcc' line='103' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt9has_facetISt7collateIwEEbRKSt6locale@@GLIBCXX_3.4'>
         <parameter type-id='type-id-862'/>
-        <return type-id='type-id-42'/>
+        <return type-id='type-id-40'/>
       </function-decl>
       <function-decl name='has_facet&lt;std::numpunct&lt;wchar_t&gt; &gt;' mangled-name='_ZSt9has_facetISt8numpunctIwEEbRKSt6locale' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_classes.tcc' line='103' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt9has_facetISt8numpunctIwEEbRKSt6locale@@GLIBCXX_3.4'>
         <parameter type-id='type-id-862'/>
-        <return type-id='type-id-42'/>
+        <return type-id='type-id-40'/>
       </function-decl>
       <function-decl name='has_facet&lt;std::moneypunct&lt;wchar_t, false&gt; &gt;' mangled-name='_ZSt9has_facetISt10moneypunctIwLb0EEEbRKSt6locale' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_classes.tcc' line='103' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt9has_facetISt10moneypunctIwLb0EEEbRKSt6locale@@GLIBCXX_3.4'>
         <parameter type-id='type-id-862'/>
-        <return type-id='type-id-42'/>
+        <return type-id='type-id-40'/>
       </function-decl>
       <function-decl name='has_facet&lt;std::money_put&lt;wchar_t&gt; &gt;' mangled-name='_ZSt9has_facetISt9money_putIwSt19ostreambuf_iteratorIwSt11char_traitsIwEEEEbRKSt6locale' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_classes.tcc' line='103' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt9has_facetISt9money_putIwSt19ostreambuf_iteratorIwSt11char_traitsIwEEEEbRKSt6locale@@GLIBCXX_3.4'>
         <parameter type-id='type-id-862'/>
-        <return type-id='type-id-42'/>
+        <return type-id='type-id-40'/>
       </function-decl>
       <function-decl name='has_facet&lt;std::money_get&lt;wchar_t&gt; &gt;' mangled-name='_ZSt9has_facetISt9money_getIwSt19istreambuf_iteratorIwSt11char_traitsIwEEEEbRKSt6locale' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_classes.tcc' line='103' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt9has_facetISt9money_getIwSt19istreambuf_iteratorIwSt11char_traitsIwEEEEbRKSt6locale@@GLIBCXX_3.4'>
         <parameter type-id='type-id-862'/>
-        <return type-id='type-id-42'/>
+        <return type-id='type-id-40'/>
       </function-decl>
       <function-decl name='has_facet&lt;std::__timepunct&lt;wchar_t&gt; &gt;' mangled-name='_ZSt9has_facetISt11__timepunctIwEEbRKSt6locale' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_classes.tcc' line='103' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt9has_facetISt11__timepunctIwEEbRKSt6locale@@GLIBCXX_3.4'>
         <parameter type-id='type-id-862'/>
-        <return type-id='type-id-42'/>
+        <return type-id='type-id-40'/>
       </function-decl>
       <function-decl name='has_facet&lt;std::time_put&lt;wchar_t&gt; &gt;' mangled-name='_ZSt9has_facetISt8time_putIwSt19ostreambuf_iteratorIwSt11char_traitsIwEEEEbRKSt6locale' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_classes.tcc' line='103' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt9has_facetISt8time_putIwSt19ostreambuf_iteratorIwSt11char_traitsIwEEEEbRKSt6locale@@GLIBCXX_3.4'>
         <parameter type-id='type-id-862'/>
-        <return type-id='type-id-42'/>
+        <return type-id='type-id-40'/>
       </function-decl>
       <function-decl name='has_facet&lt;std::time_get&lt;wchar_t&gt; &gt;' mangled-name='_ZSt9has_facetISt8time_getIwSt19istreambuf_iteratorIwSt11char_traitsIwEEEEbRKSt6locale' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_classes.tcc' line='103' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt9has_facetISt8time_getIwSt19istreambuf_iteratorIwSt11char_traitsIwEEEEbRKSt6locale@@GLIBCXX_3.4'>
         <parameter type-id='type-id-862'/>
-        <return type-id='type-id-42'/>
+        <return type-id='type-id-40'/>
       </function-decl>
       <function-decl name='has_facet&lt;std::messages&lt;wchar_t&gt; &gt;' mangled-name='_ZSt9has_facetISt8messagesIwEEbRKSt6locale' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_classes.tcc' line='103' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt9has_facetISt8messagesIwEEbRKSt6locale@@GLIBCXX_3.4'>
         <parameter type-id='type-id-862'/>
-        <return type-id='type-id-42'/>
+        <return type-id='type-id-40'/>
       </function-decl>
       <function-decl name='__add_grouping&lt;wchar_t&gt;' mangled-name='_ZSt14__add_groupingIwEPT_S1_S0_PKcmPKS0_S5_' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='1242' column='1' visibility='default' binding='global' size-in-bits='64'>
         <parameter type-id='type-id-333'/>
         <parameter type-id='type-id-375'/>
         <parameter type-id='type-id-4'/>
-        <parameter type-id='type-id-94'/>
+        <parameter type-id='type-id-93'/>
         <parameter type-id='type-id-354'/>
         <parameter type-id='type-id-354'/>
         <return type-id='type-id-333'/>
       </function-decl>
       <function-decl name='__int_to_char&lt;wchar_t, long unsigned int&gt;' mangled-name='_ZSt13__int_to_charIwmEiPT_T0_PKS0_St13_Ios_Fmtflagsb' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='791' column='1' visibility='default' binding='global' size-in-bits='64'>
         <parameter type-id='type-id-333'/>
-        <parameter type-id='type-id-51'/>
+        <parameter type-id='type-id-49'/>
         <parameter type-id='type-id-354'/>
         <parameter type-id='type-id-898'/>
-        <parameter type-id='type-id-42'/>
+        <parameter type-id='type-id-40'/>
         <return type-id='type-id-6'/>
       </function-decl>
       <function-decl name='__int_to_char&lt;wchar_t, long long unsigned int&gt;' mangled-name='_ZSt13__int_to_charIwyEiPT_T0_PKS0_St13_Ios_Fmtflagsb' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='791' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -47018,7 +46981,7 @@
         <parameter type-id='type-id-376'/>
         <parameter type-id='type-id-354'/>
         <parameter type-id='type-id-898'/>
-        <parameter type-id='type-id-42'/>
+        <parameter type-id='type-id-40'/>
         <return type-id='type-id-6'/>
       </function-decl>
       <function-decl name='__write&lt;wchar_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='114' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -47033,7 +46996,7 @@
           <function-decl name='collate_byname' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_classes.h' line='770' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-3271' is-artificial='yes'/>
             <parameter type-id='type-id-4'/>
-            <parameter type-id='type-id-94'/>
+            <parameter type-id='type-id-93'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
@@ -47041,7 +47004,7 @@
           <function-decl name='collate_byname' mangled-name='_ZNSt14collate_bynameIwEC2EPKcm' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_classes.h' line='770' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt14collate_bynameIwEC2EPKcm@@GLIBCXX_3.4'>
             <parameter type-id='type-id-3271' is-artificial='yes'/>
             <parameter type-id='type-id-4'/>
-            <parameter type-id='type-id-94'/>
+            <parameter type-id='type-id-93'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
@@ -47073,7 +47036,7 @@
           <function-decl name='codecvt_byname' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/codecvt.h' line='463' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-3269' is-artificial='yes'/>
             <parameter type-id='type-id-4'/>
-            <parameter type-id='type-id-94'/>
+            <parameter type-id='type-id-93'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
@@ -47081,7 +47044,7 @@
           <function-decl name='codecvt_byname' mangled-name='_ZNSt14codecvt_bynameIwc11__mbstate_tEC2EPKcm' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/codecvt.h' line='463' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt14codecvt_bynameIwc11__mbstate_tEC1EPKcm@@GLIBCXX_3.4'>
             <parameter type-id='type-id-3269' is-artificial='yes'/>
             <parameter type-id='type-id-4'/>
-            <parameter type-id='type-id-94'/>
+            <parameter type-id='type-id-93'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
@@ -47113,7 +47076,7 @@
           <function-decl name='messages_byname' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/x86_64-unknown-linux-gnu/bits/messages_members.h' line='105' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-3273' is-artificial='yes'/>
             <parameter type-id='type-id-4'/>
-            <parameter type-id='type-id-94'/>
+            <parameter type-id='type-id-93'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
@@ -47121,7 +47084,7 @@
           <function-decl name='messages_byname' mangled-name='_ZNSt15messages_bynameIwEC2EPKcm' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/x86_64-unknown-linux-gnu/bits/messages_members.h' line='105' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt15messages_bynameIwEC1EPKcm@@GLIBCXX_3.4'>
             <parameter type-id='type-id-3273' is-artificial='yes'/>
             <parameter type-id='type-id-4'/>
-            <parameter type-id='type-id-94'/>
+            <parameter type-id='type-id-93'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
@@ -47153,7 +47116,7 @@
           <function-decl name='numpunct_byname' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='1883' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-3279' is-artificial='yes'/>
             <parameter type-id='type-id-4'/>
-            <parameter type-id='type-id-94'/>
+            <parameter type-id='type-id-93'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
@@ -47161,7 +47124,7 @@
           <function-decl name='numpunct_byname' mangled-name='_ZNSt15numpunct_bynameIwEC2EPKcm' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='1883' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt15numpunct_bynameIwEC1EPKcm@@GLIBCXX_3.4'>
             <parameter type-id='type-id-3279' is-artificial='yes'/>
             <parameter type-id='type-id-4'/>
-            <parameter type-id='type-id-94'/>
+            <parameter type-id='type-id-93'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
@@ -47196,7 +47159,7 @@
           <function-decl name='moneypunct_byname' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='1333' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-3277' is-artificial='yes'/>
             <parameter type-id='type-id-4'/>
-            <parameter type-id='type-id-94'/>
+            <parameter type-id='type-id-93'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
@@ -47204,7 +47167,7 @@
           <function-decl name='moneypunct_byname' mangled-name='_ZNSt17moneypunct_bynameIwLb1EEC2EPKcm' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='1333' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt17moneypunct_bynameIwLb1EEC1EPKcm@@GLIBCXX_3.4'>
             <parameter type-id='type-id-3277' is-artificial='yes'/>
             <parameter type-id='type-id-4'/>
-            <parameter type-id='type-id-94'/>
+            <parameter type-id='type-id-93'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
@@ -47239,7 +47202,7 @@
           <function-decl name='moneypunct_byname' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='1333' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-3275' is-artificial='yes'/>
             <parameter type-id='type-id-4'/>
-            <parameter type-id='type-id-94'/>
+            <parameter type-id='type-id-93'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
@@ -47247,7 +47210,7 @@
           <function-decl name='moneypunct_byname' mangled-name='_ZNSt17moneypunct_bynameIwLb0EEC2EPKcm' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='1333' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt17moneypunct_bynameIwLb0EEC2EPKcm@@GLIBCXX_3.4'>
             <parameter type-id='type-id-3275' is-artificial='yes'/>
             <parameter type-id='type-id-4'/>
-            <parameter type-id='type-id-94'/>
+            <parameter type-id='type-id-93'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
@@ -47279,7 +47242,7 @@
           <function-decl name='time_put_byname' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='819' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-3283' is-artificial='yes'/>
             <parameter type-id='type-id-4'/>
-            <parameter type-id='type-id-94'/>
+            <parameter type-id='type-id-93'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
@@ -47287,7 +47250,7 @@
           <function-decl name='time_put_byname' mangled-name='_ZNSt15time_put_bynameIwSt19ostreambuf_iteratorIwSt11char_traitsIwEEEC2EPKcm' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='819' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt15time_put_bynameIwSt19ostreambuf_iteratorIwSt11char_traitsIwEEEC1EPKcm@@GLIBCXX_3.4'>
             <parameter type-id='type-id-3283' is-artificial='yes'/>
             <parameter type-id='type-id-4'/>
-            <parameter type-id='type-id-94'/>
+            <parameter type-id='type-id-93'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
@@ -47319,7 +47282,7 @@
           <function-decl name='time_get_byname' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='694' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-3281' is-artificial='yes'/>
             <parameter type-id='type-id-4'/>
-            <parameter type-id='type-id-94'/>
+            <parameter type-id='type-id-93'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
@@ -47327,7 +47290,7 @@
           <function-decl name='time_get_byname' mangled-name='_ZNSt15time_get_bynameIwSt19istreambuf_iteratorIwSt11char_traitsIwEEEC2EPKcm' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='694' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt15time_get_bynameIwSt19istreambuf_iteratorIwSt11char_traitsIwEEEC1EPKcm@@GLIBCXX_3.4'>
             <parameter type-id='type-id-3281' is-artificial='yes'/>
             <parameter type-id='type-id-4'/>
-            <parameter type-id='type-id-94'/>
+            <parameter type-id='type-id-93'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
@@ -47397,7 +47360,7 @@
     <namespace-decl name='__gnu_cxx'>
       <function-decl name='__is_null_pointer&lt;const wchar_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ext/type_traits.h' line='150' column='1' visibility='default' binding='global' size-in-bits='64'>
         <parameter type-id='type-id-354'/>
-        <return type-id='type-id-42'/>
+        <return type-id='type-id-40'/>
       </function-decl>
     </namespace-decl>
   </abi-instr>
@@ -47418,15 +47381,15 @@
     </namespace-decl>
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='basic_file.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/src/c++98' language='LANG_C_plus_plus'>
-    <array-type-def dimensions='1' type-id='type-id-22' size-in-bits='192' id='type-id-3287'>
+    <array-type-def dimensions='1' type-id='type-id-20' size-in-bits='192' id='type-id-3287'>
       <subrange length='3' type-id='type-id-174' id='type-id-3288'/>
     </array-type-def>
     <class-decl name='iovec' size-in-bits='128' is-struct='yes' visibility='default' filepath='/usr/include/bits/uio.h' line='44' column='1' id='type-id-3289'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='iov_base' type-id='type-id-36' visibility='default' filepath='/usr/include/bits/uio.h' line='46' column='1'/>
+        <var-decl name='iov_base' type-id='type-id-34' visibility='default' filepath='/usr/include/bits/uio.h' line='46' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
-        <var-decl name='iov_len' type-id='type-id-92' visibility='default' filepath='/usr/include/bits/uio.h' line='47' column='1'/>
+        <var-decl name='iov_len' type-id='type-id-91' visibility='default' filepath='/usr/include/bits/uio.h' line='47' column='1'/>
       </data-member>
     </class-decl>
     <class-decl name='stat64' size-in-bits='1152' is-struct='yes' visibility='default' filepath='/usr/include/bits/stat.h' line='119' column='1' id='type-id-3290'>
@@ -47476,20 +47439,20 @@
         <var-decl name='__unused' type-id='type-id-3287' visibility='default' filepath='/usr/include/bits/stat.h' line='167' column='1'/>
       </data-member>
     </class-decl>
-    <typedef-decl name='__dev_t' type-id='type-id-51' filepath='/usr/include/bits/types.h' line='134' column='1' id='type-id-3291'/>
-    <typedef-decl name='__ino64_t' type-id='type-id-51' filepath='/usr/include/bits/types.h' line='138' column='1' id='type-id-3292'/>
-    <typedef-decl name='__nlink_t' type-id='type-id-51' filepath='/usr/include/bits/types.h' line='140' column='1' id='type-id-3293'/>
-    <typedef-decl name='__mode_t' type-id='type-id-41' filepath='/usr/include/bits/types.h' line='139' column='1' id='type-id-3294'/>
-    <typedef-decl name='__uid_t' type-id='type-id-41' filepath='/usr/include/bits/types.h' line='135' column='1' id='type-id-3295'/>
-    <typedef-decl name='__gid_t' type-id='type-id-41' filepath='/usr/include/bits/types.h' line='136' column='1' id='type-id-3296'/>
-    <typedef-decl name='__blksize_t' type-id='type-id-22' filepath='/usr/include/bits/types.h' line='164' column='1' id='type-id-3297'/>
-    <typedef-decl name='__blkcnt64_t' type-id='type-id-22' filepath='/usr/include/bits/types.h' line='170' column='1' id='type-id-3298'/>
+    <typedef-decl name='__dev_t' type-id='type-id-49' filepath='/usr/include/bits/types.h' line='134' column='1' id='type-id-3291'/>
+    <typedef-decl name='__ino64_t' type-id='type-id-49' filepath='/usr/include/bits/types.h' line='138' column='1' id='type-id-3292'/>
+    <typedef-decl name='__nlink_t' type-id='type-id-49' filepath='/usr/include/bits/types.h' line='140' column='1' id='type-id-3293'/>
+    <typedef-decl name='__mode_t' type-id='type-id-39' filepath='/usr/include/bits/types.h' line='139' column='1' id='type-id-3294'/>
+    <typedef-decl name='__uid_t' type-id='type-id-39' filepath='/usr/include/bits/types.h' line='135' column='1' id='type-id-3295'/>
+    <typedef-decl name='__gid_t' type-id='type-id-39' filepath='/usr/include/bits/types.h' line='136' column='1' id='type-id-3296'/>
+    <typedef-decl name='__blksize_t' type-id='type-id-20' filepath='/usr/include/bits/types.h' line='164' column='1' id='type-id-3297'/>
+    <typedef-decl name='__blkcnt64_t' type-id='type-id-20' filepath='/usr/include/bits/types.h' line='170' column='1' id='type-id-3298'/>
     <class-decl name='timespec' size-in-bits='128' is-struct='yes' visibility='default' filepath='/usr/include/time.h' line='120' column='1' id='type-id-3299'>
       <data-member access='public' layout-offset-in-bits='0'>
         <var-decl name='tv_sec' type-id='type-id-191' visibility='default' filepath='/usr/include/time.h' line='122' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
-        <var-decl name='tv_nsec' type-id='type-id-22' visibility='default' filepath='/usr/include/time.h' line='123' column='1'/>
+        <var-decl name='tv_nsec' type-id='type-id-20' visibility='default' filepath='/usr/include/time.h' line='123' column='1'/>
       </data-member>
     </class-decl>
     <class-decl name='pollfd' size-in-bits='64' is-struct='yes' visibility='default' filepath='/usr/include/sys/poll.h' line='40' column='1' id='type-id-3300'>
@@ -47503,7 +47466,7 @@
         <var-decl name='revents' type-id='type-id-630' visibility='default' filepath='/usr/include/sys/poll.h' line='44' column='1'/>
       </data-member>
     </class-decl>
-    <typedef-decl name='nfds_t' type-id='type-id-51' filepath='/usr/include/sys/poll.h' line='37' column='1' id='type-id-3301'/>
+    <typedef-decl name='nfds_t' type-id='type-id-49' filepath='/usr/include/sys/poll.h' line='37' column='1' id='type-id-3301'/>
     <qualified-type-def type-id='type-id-3289' const='yes' id='type-id-3302'/>
     <pointer-type-def type-id='type-id-3302' size-in-bits='64' id='type-id-3303'/>
     <qualified-type-def type-id='type-id-1081' const='yes' id='type-id-3304'/>
@@ -47585,7 +47548,7 @@
         </data-member>
         <member-function access='public' static='yes'>
           <function-decl name='max' mangled-name='_ZNSt14numeric_limitsIlE3maxEv' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/limits' line='1129' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <return type-id='type-id-22'/>
+            <return type-id='type-id-20'/>
           </function-decl>
         </member-function>
       </class-decl>
@@ -47594,7 +47557,7 @@
           <var-decl name='_M_cfile' type-id='type-id-2479' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/x86_64-unknown-linux-gnu/bits/basic_file.h' line='57' column='1'/>
         </data-member>
         <data-member access='private' layout-offset-in-bits='64'>
-          <var-decl name='_M_cfile_created' type-id='type-id-42' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/x86_64-unknown-linux-gnu/bits/basic_file.h' line='60' column='1'/>
+          <var-decl name='_M_cfile_created' type-id='type-id-40' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/x86_64-unknown-linux-gnu/bits/basic_file.h' line='60' column='1'/>
         </data-member>
         <member-function access='private'>
           <function-decl name='__basic_file' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/x86_64-unknown-linux-gnu/bits/basic_file.h' line='63' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -47637,7 +47600,7 @@
         <member-function access='private' const='yes'>
           <function-decl name='is_open' mangled-name='_ZNKSt12__basic_fileIcE7is_openEv' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/x86_64-unknown-linux-gnu/bits/basic_file.h' line='78' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSt12__basic_fileIcE7is_openEv@@GLIBCXX_3.4'>
             <parameter type-id='type-id-3305' is-artificial='yes'/>
-            <return type-id='type-id-42'/>
+            <return type-id='type-id-40'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
@@ -47680,7 +47643,7 @@
         <member-function access='private'>
           <function-decl name='xsgetn' mangled-name='_ZNSt12__basic_fileIcE6xsgetnEPcl' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/x86_64-unknown-linux-gnu/bits/basic_file.h' line='96' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt12__basic_fileIcE6xsgetnEPcl@@GLIBCXX_3.4'>
             <parameter type-id='type-id-3308' is-artificial='yes'/>
-            <parameter type-id='type-id-93'/>
+            <parameter type-id='type-id-92'/>
             <parameter type-id='type-id-872'/>
             <return type-id='type-id-872'/>
           </function-decl>
@@ -47720,7 +47683,7 @@
           </function-decl>
         </member-function>
       </class-decl>
-      <typedef-decl name='__c_lock' type-id='type-id-70' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/x86_64-unknown-linux-gnu/bits/c++io.h' line='43' column='1' id='type-id-1090'/>
+      <typedef-decl name='__c_lock' type-id='type-id-68' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/x86_64-unknown-linux-gnu/bits/c++io.h' line='43' column='1' id='type-id-1090'/>
     </namespace-decl>
     <function-decl name='__errno_location' filepath='/usr/include/bits/errno.h' line='47' column='1' visibility='default' binding='global' size-in-bits='64'>
       <return type-id='type-id-109'/>
@@ -47741,8 +47704,8 @@
     </function-decl>
     <function-decl name='read' filepath='/usr/include/unistd.h' line='357' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-6'/>
-      <parameter type-id='type-id-36'/>
-      <parameter type-id='type-id-92'/>
+      <parameter type-id='type-id-34'/>
+      <parameter type-id='type-id-91'/>
       <return type-id='type-id-157'/>
     </function-decl>
     <function-decl name='writev' filepath='/usr/include/sys/uio.h' line='51' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -47765,7 +47728,7 @@
     </function-decl>
     <function-decl name='ioctl' filepath='/usr/include/sys/ioctl.h' line='42' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-6'/>
-      <parameter type-id='type-id-51'/>
+      <parameter type-id='type-id-49'/>
       <parameter is-variadic='yes'/>
       <return type-id='type-id-6'/>
     </function-decl>
@@ -48081,12 +48044,12 @@
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='codecvt_members.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/src/c++98' language='LANG_C_plus_plus'>
     <function-decl name='wcsnrtombs' filepath='/usr/include/wchar.h' line='427' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-93'/>
-      <parameter type-id='type-id-788'/>
-      <parameter type-id='type-id-92'/>
       <parameter type-id='type-id-92'/>
+      <parameter type-id='type-id-788'/>
+      <parameter type-id='type-id-91'/>
+      <parameter type-id='type-id-91'/>
       <parameter type-id='type-id-791'/>
-      <return type-id='type-id-92'/>
+      <return type-id='type-id-91'/>
     </function-decl>
     <function-decl name='__uselocale' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/x86_64-unknown-linux-gnu/bits/c++locale_internal.h' line='52' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-2030'/>
@@ -48095,13 +48058,13 @@
     <function-decl name='mbsnrtowcs' filepath='/usr/include/wchar.h' line='421' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-333'/>
       <parameter type-id='type-id-677'/>
-      <parameter type-id='type-id-92'/>
-      <parameter type-id='type-id-92'/>
+      <parameter type-id='type-id-91'/>
+      <parameter type-id='type-id-91'/>
       <parameter type-id='type-id-791'/>
-      <return type-id='type-id-92'/>
+      <return type-id='type-id-91'/>
     </function-decl>
     <function-decl name='__ctype_get_mb_cur_max' filepath='/usr/include/stdlib.h' line='140' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-92'/>
+      <return type-id='type-id-91'/>
     </function-decl>
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='collate_members.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/src/c++98' language='LANG_C_plus_plus'>
@@ -48116,11 +48079,11 @@
       <return type-id='type-id-6'/>
     </function-decl>
     <function-decl name='__strxfrm_l' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/x86_64-unknown-linux-gnu/bits/c++locale_internal.h' line='48' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-93'/>
-      <parameter type-id='type-id-4'/>
       <parameter type-id='type-id-92'/>
+      <parameter type-id='type-id-4'/>
+      <parameter type-id='type-id-91'/>
       <parameter type-id='type-id-2030'/>
-      <return type-id='type-id-92'/>
+      <return type-id='type-id-91'/>
     </function-decl>
     <function-decl name='__wcscoll_l' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/x86_64-unknown-linux-gnu/bits/c++locale_internal.h' line='58' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-354'/>
@@ -48131,9 +48094,9 @@
     <function-decl name='__wcsxfrm_l' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/x86_64-unknown-linux-gnu/bits/c++locale_internal.h' line='60' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-333'/>
       <parameter type-id='type-id-354'/>
-      <parameter type-id='type-id-92'/>
+      <parameter type-id='type-id-91'/>
       <parameter type-id='type-id-2030'/>
-      <return type-id='type-id-92'/>
+      <return type-id='type-id-91'/>
     </function-decl>
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='ctype_configure_char.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/src/c++98' language='LANG_C_plus_plus'>
@@ -48147,7 +48110,7 @@
           <function-decl name='ctype_byname' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/src/c++98/ctype_members.cc' line='42' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-3316' is-artificial='yes'/>
             <parameter type-id='type-id-4'/>
-            <parameter type-id='type-id-94'/>
+            <parameter type-id='type-id-93'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
@@ -48155,7 +48118,7 @@
           <function-decl name='ctype_byname' mangled-name='_ZNSt12ctype_bynameIcEC2EPKcm' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/src/c++98/ctype_members.cc' line='42' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt12ctype_bynameIcEC2EPKcm@@GLIBCXX_3.4'>
             <parameter type-id='type-id-3316' is-artificial='yes'/>
             <parameter type-id='type-id-4'/>
-            <parameter type-id='type-id-94'/>
+            <parameter type-id='type-id-93'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
@@ -48228,7 +48191,7 @@
     </namespace-decl>
     <function-decl name='gettext' filepath='/usr/include/libintl.h' line='40' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-4'/>
-      <return type-id='type-id-93'/>
+      <return type-id='type-id-92'/>
     </function-decl>
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='monetary_members.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/src/c++98' language='LANG_C_plus_plus'>
@@ -48236,7 +48199,7 @@
     <function-decl name='__nl_langinfo_l' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/x86_64-unknown-linux-gnu/bits/c++locale_internal.h' line='42' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-3318'/>
       <parameter type-id='type-id-2030'/>
-      <return type-id='type-id-93'/>
+      <return type-id='type-id-92'/>
     </function-decl>
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='numeric_members.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/src/c++98' language='LANG_C_plus_plus'>
@@ -48247,20 +48210,20 @@
     <qualified-type-def type-id='type-id-2768' const='yes' id='type-id-3232'/>
     <pointer-type-def type-id='type-id-3232' size-in-bits='64' id='type-id-2859'/>
     <function-decl name='__strftime_l' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/x86_64-unknown-linux-gnu/bits/c++locale_internal.h' line='44' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-93'/>
       <parameter type-id='type-id-92'/>
+      <parameter type-id='type-id-91'/>
       <parameter type-id='type-id-4'/>
       <parameter type-id='type-id-253'/>
       <parameter type-id='type-id-2030'/>
-      <return type-id='type-id-92'/>
+      <return type-id='type-id-91'/>
     </function-decl>
     <function-decl name='__wcsftime_l' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/x86_64-unknown-linux-gnu/bits/c++locale_internal.h' line='59' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-333'/>
-      <parameter type-id='type-id-92'/>
+      <parameter type-id='type-id-91'/>
       <parameter type-id='type-id-354'/>
       <parameter type-id='type-id-253'/>
       <parameter type-id='type-id-2030'/>
-      <return type-id='type-id-92'/>
+      <return type-id='type-id-91'/>
     </function-decl>
   </abi-instr>
 </abi-corpus>