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

Fix Borland C++ issues with compact mode

Browse Source
This commit is contained in:
Arseny Kapoulkine 2015-10-18 16:01:11 -07:00
parent 00d9f98ccc
commit 18483b024c
1 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/pugixml.cpp
View File

@ -106,6 +106,7 @@
#if defined(__BORLANDC__) && !defined(__MEM_H_USING_LIST) #if defined(__BORLANDC__) && !defined(__MEM_H_USING_LIST)
using std::memcpy; using std::memcpy;
using std::memmove; using std::memmove;
using std::memset;
#endif #endif
// In some environments MSVC is a compiler but the CRT lacks certain MSVC-specific features // In some environments MSVC is a compiler but the CRT lacks certain MSVC-specific features
@ -743,12 +744,12 @@ PUGI__NS_BEGIN
void operator&=(uintptr_t mod) void operator&=(uintptr_t mod)
{ {
_flags &= mod; _flags &= static_cast<unsigned char>(mod);
} }
void operator|=(uintptr_t mod) void operator|=(uintptr_t mod)
{ {
_flags |= mod; _flags |= static_cast<unsigned char>(mod);
} }
uintptr_t operator&(uintptr_t mod) const uintptr_t operator&(uintptr_t mod) const
@ -3437,7 +3438,7 @@ PUGI__NS_BEGIN
return make_parse_result(status_unrecognized_tag, length - 1); return make_parse_result(status_unrecognized_tag, length - 1);
// check if there are any element nodes parsed // check if there are any element nodes parsed
xml_node_struct* first_root_child_parsed = last_root_child ? last_root_child->next_sibling + 0 : root->first_child; xml_node_struct* first_root_child_parsed = last_root_child ? last_root_child->next_sibling + 0 : root->first_child+ 0;
if (!PUGI__OPTSET(parse_fragment) && !has_element_node_siblings(first_root_child_parsed)) if (!PUGI__OPTSET(parse_fragment) && !has_element_node_siblings(first_root_child_parsed))
return make_parse_result(status_no_document_element, length - 1); return make_parse_result(status_no_document_element, length - 1);
@ -3980,7 +3981,7 @@ PUGI__NS_BEGIN
writer.write(' '); writer.write(' ');
} }
writer.write_string(a->name ? a->name : default_name); writer.write_string(a->name ? a->name + 0 : default_name);
writer.write('=', '"'); writer.write('=', '"');
if (a->value) if (a->value)
@ -3993,7 +3994,7 @@ PUGI__NS_BEGIN
PUGI__FN bool node_output_start(xml_buffered_writer& writer, xml_node_struct* node, const char_t* indent, size_t indent_length, unsigned int flags, unsigned int depth) PUGI__FN bool node_output_start(xml_buffered_writer& writer, xml_node_struct* node, const char_t* indent, size_t indent_length, unsigned int flags, unsigned int depth)
{ {
const char_t* default_name = PUGIXML_TEXT(":anonymous"); const char_t* default_name = PUGIXML_TEXT(":anonymous");
const char_t* name = node->name ? node->name : default_name; const char_t* name = node->name ? node->name + 0 : default_name;
writer.write('<'); writer.write('<');
writer.write_string(name); writer.write_string(name);
@ -4018,7 +4019,7 @@ PUGI__NS_BEGIN
PUGI__FN void node_output_end(xml_buffered_writer& writer, xml_node_struct* node) PUGI__FN void node_output_end(xml_buffered_writer& writer, xml_node_struct* node)
{ {
const char_t* default_name = PUGIXML_TEXT(":anonymous"); const char_t* default_name = PUGIXML_TEXT(":anonymous");
const char_t* name = node->name ? node->name : default_name; const char_t* name = node->name ? node->name + 0 : default_name;
writer.write('<', '/'); writer.write('<', '/');
writer.write_string(name); writer.write_string(name);
@ -4045,7 +4046,7 @@ PUGI__NS_BEGIN
case node_pi: case node_pi:
writer.write('<', '?'); writer.write('<', '?');
writer.write_string(node->name ? node->name : default_name); writer.write_string(node->name ? node->name + 0 : default_name);
if (node->value) if (node->value)
{ {
@ -4058,7 +4059,7 @@ PUGI__NS_BEGIN
case node_declaration: case node_declaration:
writer.write('<', '?'); writer.write('<', '?');
writer.write_string(node->name ? node->name : default_name); writer.write_string(node->name ? node->name + 0 : default_name);
node_output_attributes(writer, node, PUGIXML_TEXT(""), 0, flags | format_raw, 0); node_output_attributes(writer, node, PUGIXML_TEXT(""), 0, flags | format_raw, 0);
writer.write('?', '>'); writer.write('?', '>');
break; break;
@ -5038,7 +5039,7 @@ namespace pugi
PUGI__FN const char_t* xml_attribute::as_string(const char_t* def) const PUGI__FN const char_t* xml_attribute::as_string(const char_t* def) const
{ {
return (_attr && _attr->value) ? _attr->value : def; return (_attr && _attr->value) ? _attr->value + 0 : def;
} }
PUGI__FN int xml_attribute::as_int(int def) const PUGI__FN int xml_attribute::as_int(int def) const
@ -6239,7 +6240,7 @@ namespace pugi
{ {
xml_node_struct* d = _data(); xml_node_struct* d = _data();
return (d && d->value) ? d->value : def; return (d && d->value) ? d->value + 0 : def;
} }
PUGI__FN int xml_text::as_int(int def) const PUGI__FN int xml_text::as_int(int def) const