diff options
| author | Arseny Kapoulkine <arseny.kapoulkine@gmail.com> | 2014-10-28 20:14:17 -0700 |
|---|---|---|
| committer | Arseny Kapoulkine <arseny.kapoulkine@gmail.com> | 2014-10-28 20:14:17 -0700 |
| commit | 650c67a663515a3b76144a7dc16b26df0a8f2372 (patch) | |
| tree | dca9fb28a88a616b76c63c44c6213e6547979bc7 /src | |
| parent | a49f932b6110bc46e02f80ba4a4264991202cbee (diff) | |
Fix compilation after merge.
Diffstat (limited to 'src')
| -rw-r--r-- | src/pugixml.cpp | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/src/pugixml.cpp b/src/pugixml.cpp index b565482..163af21 100644 --- a/src/pugixml.cpp +++ b/src/pugixml.cpp @@ -3968,7 +3968,7 @@ PUGI__NS_BEGIN PUGI__FN bool node_output_start(xml_buffered_writer& writer, xml_node_struct* node, unsigned int flags) { const char_t* default_name = PUGIXML_TEXT(":anonymous"); - const char_t* name = node->name ? node->name : default_name; + const char_t* name = node->contents ? node->contents : default_name; writer.write('<'); writer.write_string(name); @@ -3997,7 +3997,7 @@ PUGI__NS_BEGIN { writer.write('>'); - const char_t* value = first->value ? first->value : PUGIXML_TEXT(""); + const char_t* value = first->contents ? first->contents : PUGIXML_TEXT(""); if (PUGI__NODETYPE(first) == node_pcdata) text_output(writer, value, ctx_special_pcdata, flags); @@ -4022,7 +4022,7 @@ PUGI__NS_BEGIN PUGI__FN void node_output_end(xml_buffered_writer& writer, xml_node_struct* node, unsigned int flags) { const char_t* default_name = PUGIXML_TEXT(":anonymous"); - const char_t* name = node->name ? node->name : default_name; + const char_t* name = node->contents ? node->contents : default_name; writer.write('<', '/'); writer.write_string(name); @@ -4040,28 +4040,28 @@ PUGI__NS_BEGIN switch (PUGI__NODETYPE(node)) { case node_pcdata: - text_output(writer, node->value ? node->value : PUGIXML_TEXT(""), ctx_special_pcdata, flags); + text_output(writer, node->contents ? node->contents : PUGIXML_TEXT(""), ctx_special_pcdata, flags); if ((flags & format_raw) == 0) writer.write('\n'); break; case node_cdata: - text_output_cdata(writer, node->value ? node->value : PUGIXML_TEXT("")); + text_output_cdata(writer, node->contents ? node->contents : PUGIXML_TEXT("")); if ((flags & format_raw) == 0) writer.write('\n'); break; case node_comment: - node_output_comment(writer, node->value ? node->value : PUGIXML_TEXT("")); + node_output_comment(writer, node->contents ? node->contents : PUGIXML_TEXT("")); if ((flags & format_raw) == 0) writer.write('\n'); break; case node_pi: writer.write('<', '?'); - writer.write_string(node->name ? node->name : default_name); + writer.write_string(node->contents ? node->contents : default_name); - if (node->value) + if (node->contents) { writer.write(' '); - writer.write_string(node->value); + writer.write_string(node->contents); } writer.write('?', '>'); @@ -4070,7 +4070,7 @@ PUGI__NS_BEGIN case node_declaration: writer.write('<', '?'); - writer.write_string(node->name ? node->name : default_name); + writer.write_string(node->contents ? node->contents : default_name); node_output_attributes(writer, node, flags); writer.write('?', '>'); if ((flags & format_raw) == 0) writer.write('\n'); @@ -4080,10 +4080,10 @@ PUGI__NS_BEGIN writer.write('<', '!', 'D', 'O', 'C'); writer.write('T', 'Y', 'P', 'E'); - if (node->value) + if (node->contents) { writer.write(' '); - writer.write_string(node->value); + writer.write_string(node->contents); } writer.write('>'); |