From 544a527abd3eb9a4d92738d7474a7c63c30ce5be Mon Sep 17 00:00:00 2001 From: "arseny.kapoulkine" Date: Tue, 11 May 2010 06:55:07 +0000 Subject: Fixed incorrect allocator pointer in pages during parsing git-svn-id: http://pugixml.googlecode.com/svn/trunk@415 99668b35-9821-0410-8761-19e4c4f06640 --- src/pugixml.cpp | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) (limited to 'src/pugixml.cpp') diff --git a/src/pugixml.cpp b/src/pugixml.cpp index 574bb08..364bee4 100644 --- a/src/pugixml.cpp +++ b/src/pugixml.cpp @@ -237,8 +237,6 @@ namespace pugi namespace pugi { - struct xml_document_struct; - static const uintptr_t xml_memory_page_alignment = 32; static const uintptr_t xml_memory_page_pointer_mask = ~(xml_memory_page_alignment - 1); static const uintptr_t xml_memory_page_name_allocated_mask = 16; @@ -257,11 +255,6 @@ namespace pugi { } - ~xml_allocator() - { - if (_root) _root->busy_size = _busy_size; - } - xml_memory_page* allocate_page(size_t data_size) { #ifdef __GNUC__ @@ -282,7 +275,7 @@ namespace pugi xml_memory_page* page = new (page_memory) xml_memory_page(); page->memory = memory; - page->allocator = this; + page->allocator = _root->allocator; return page; } -- cgit v1.2.3