External/pugixml
8
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

XPath: Minor refactoring

Browse Source 
git-svn-id: http://pugixml.googlecode.com/svn/trunk@776 99668b35-9821-0410-8761-19e4c4f06640
This commit is contained in:
arseny.kapoulkine 2010-10-22 19:08:46 +00:00
parent 59c88d7236
commit 0e73657345
1 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/pugixml.cpp
View File

@ -5000,6 +5000,10 @@ namespace
size_t _root_size; size_t _root_size;
public: public:
#ifdef PUGIXML_NO_EXCEPTIONS
jmp_buf* error_handler;
#endif
xpath_allocator(xpath_memory_block* root, size_t root_size = 0): _root(root), _root_size(root_size) xpath_allocator(xpath_memory_block* root, size_t root_size = 0): _root(root), _root_size(root_size)
{ {
#ifdef PUGIXML_NO_EXCEPTIONS #ifdef PUGIXML_NO_EXCEPTIONS
@ -5132,10 +5136,6 @@ namespace
cur = next; cur = next;
} }
} }
#ifdef PUGIXML_NO_EXCEPTIONS
jmp_buf* error_handler;
#endif
}; };
struct xpath_allocator_capture struct xpath_allocator_capture
@ -9298,13 +9298,9 @@ namespace pugi
{ {
static xpath_query_impl* create() static xpath_query_impl* create()
{ {
void* memory = global_allocate(sizeof(xpath_query_impl) + sizeof(xpath_memory_block)); void* memory = global_allocate(sizeof(xpath_query_impl));
if (!memory) return 0;
xpath_memory_block* root = reinterpret_cast<xpath_memory_block*>(static_cast<xpath_query_impl*>(memory) + 1); return new (memory) xpath_query_impl();
root->next = 0;
return new (memory) xpath_query_impl(root);
} }
static void destroy(void* ptr) static void destroy(void* ptr)
@ -9318,12 +9314,14 @@ namespace pugi
global_deallocate(ptr); global_deallocate(ptr);
} }
xpath_query_impl(xpath_memory_block* block): root(0), alloc(block) xpath_query_impl(): root(0), alloc(&block)
{ {
block.next = 0;
} }
xpath_ast_node* root; xpath_ast_node* root;
xpath_allocator alloc; xpath_allocator alloc;
xpath_memory_block block;
}; };
xpath_query::xpath_query(const char_t* query, xpath_variable_set* variables): _impl(0) xpath_query::xpath_query(const char_t* query, xpath_variable_set* variables): _impl(0)