Fixed istream loading
git-svn-id: http://pugixml.googlecode.com/svn/trunk@22 99668b35-9821-0410-8761-19e4c4f06640
This commit is contained in:
parent
688bbe9290
commit
5203fa2e22
@ -238,7 +238,7 @@ namespace pugi
|
|||||||
xml_allocator& alloc;
|
xml_allocator& alloc;
|
||||||
bool chartype_symbol_table[256];
|
bool chartype_symbol_table[256];
|
||||||
|
|
||||||
bool chartype_symbol(char c) { return chartype_symbol_table[(unsigned char)c]; }
|
bool chartype_symbol(char c) const { return chartype_symbol_table[(unsigned char)c]; }
|
||||||
|
|
||||||
static bool chartype_space(char c) { return c < '!' && c > 0; }
|
static bool chartype_space(char c) { return c < '!' && c > 0; }
|
||||||
static bool chartype_enter(char c) { return c == '<'; }
|
static bool chartype_enter(char c) { return c == '<'; }
|
||||||
@ -995,11 +995,6 @@ namespace pugi
|
|||||||
return find;
|
return find;
|
||||||
}
|
}
|
||||||
|
|
||||||
namespace impl
|
|
||||||
{
|
|
||||||
int strcmpwild(const char* src, const char* dst);
|
|
||||||
}
|
|
||||||
|
|
||||||
// Wildcard pattern match.
|
// Wildcard pattern match.
|
||||||
static int strcmpwild_astr(const char** src, const char** dst)
|
static int strcmpwild_astr(const char** src, const char** dst)
|
||||||
{
|
{
|
||||||
@ -1934,6 +1929,9 @@ namespace pugi
|
|||||||
|
|
||||||
char* xml_parser::parse(char* xmlstr,unsigned int optmsk)
|
char* xml_parser::parse(char* xmlstr,unsigned int optmsk)
|
||||||
{
|
{
|
||||||
|
if (xmlstr == _buffer)
|
||||||
|
_buffer = 0;
|
||||||
|
|
||||||
free();
|
free();
|
||||||
|
|
||||||
if(!xmlstr) return 0;
|
if(!xmlstr) return 0;
|
||||||
@ -1951,6 +1949,9 @@ namespace pugi
|
|||||||
|
|
||||||
char* xml_parser::parse(const transfer_ownership_tag&, char* xmlstr,unsigned int optmsk)
|
char* xml_parser::parse(const transfer_ownership_tag&, char* xmlstr,unsigned int optmsk)
|
||||||
{
|
{
|
||||||
|
if (xmlstr == _buffer)
|
||||||
|
_buffer = 0;
|
||||||
|
|
||||||
free();
|
free();
|
||||||
|
|
||||||
if(!xmlstr) return 0;
|
if(!xmlstr) return 0;
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user