diff options
| author | arseny.kapoulkine <arseny.kapoulkine@99668b35-9821-0410-8761-19e4c4f06640> | 2011-08-19 04:25:13 +0000 |
|---|---|---|
| committer | arseny.kapoulkine <arseny.kapoulkine@99668b35-9821-0410-8761-19e4c4f06640> | 2011-08-19 04:25:13 +0000 |
| commit | 8a5144a927fb2659bc80d18620121d99cfcf1edc (patch) | |
| tree | 3d12e21ae8a10c6eda7c0ffa2d10038126755d57 /src/pugixml.cpp | |
| parent | 1d6db79bd98e13a9fc009fb9d1114bc745b2b0b3 (diff) | |
Fixed unspecified bool conversion for MSVC CLR for the case when pugixml is compiled as unmanaged and calling code is compiled as managed. Fixes issue 121.
git-svn-id: http://pugixml.googlecode.com/svn/trunk@817 99668b35-9821-0410-8761-19e4c4f06640
Diffstat (limited to 'src/pugixml.cpp')
| -rw-r--r-- | src/pugixml.cpp | 24 |
1 files changed, 20 insertions, 4 deletions
diff --git a/src/pugixml.cpp b/src/pugixml.cpp index 774de6c..7a6e946 100644 --- a/src/pugixml.cpp +++ b/src/pugixml.cpp @@ -3419,9 +3419,13 @@ namespace pugi { } + static void unspecified_bool_xml_attribute(xml_attribute***) + { + } + xml_attribute::operator xml_attribute::unspecified_bool_type() const { - return _attr ? &xml_attribute::_attr : 0; + return _attr ? unspecified_bool_xml_attribute : 0; } bool xml_attribute::operator!() const @@ -3663,9 +3667,13 @@ namespace pugi { } + static void unspecified_bool_xml_node(xml_node***) + { + } + xml_node::operator xml_node::unspecified_bool_type() const { - return _root ? &xml_node::_root : 0; + return _root ? unspecified_bool_xml_node : 0; } bool xml_node::operator!() const @@ -9160,9 +9168,13 @@ namespace pugi return _attribute ? _node : _node.parent(); } + static void unspecified_bool_xpath_node(xpath_node***) + { + } + xpath_node::operator xpath_node::unspecified_bool_type() const { - return (_node || _attribute) ? &xpath_node::_node : 0; + return (_node || _attribute) ? unspecified_bool_xpath_node : 0; } bool xpath_node::operator!() const @@ -9637,9 +9649,13 @@ namespace pugi return _result; } + static void unspecified_bool_xpath_query(xpath_query***) + { + } + xpath_query::operator xpath_query::unspecified_bool_type() const { - return _impl ? &xpath_query::_impl : 0; + return _impl ? unspecified_bool_xpath_query : 0; } bool xpath_query::operator!() const |