summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorarseny.kapoulkine <arseny.kapoulkine@99668b35-9821-0410-8761-19e4c4f06640>2010-05-11 06:55:07 +0000
committerarseny.kapoulkine <arseny.kapoulkine@99668b35-9821-0410-8761-19e4c4f06640>2010-05-11 06:55:07 +0000
commit544a527abd3eb9a4d92738d7474a7c63c30ce5be (patch)
treeecb48278d2e10fcc54a8477d89a836dfa50498a0 /src
parent157f720e12eb687235d86bbc53cf6c3d240770f1 (diff)
Fixed incorrect allocator pointer in pages during parsing
git-svn-id: http://pugixml.googlecode.com/svn/trunk@415 99668b35-9821-0410-8761-19e4c4f06640
Diffstat (limited to 'src')
-rw-r--r--src/pugixml.cpp9
1 files changed, 1 insertions, 8 deletions
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;
}