diff options
| author | arseny.kapoulkine <arseny.kapoulkine@99668b35-9821-0410-8761-19e4c4f06640> | 2010-08-29 15:44:01 +0000 |
|---|---|---|
| committer | arseny.kapoulkine <arseny.kapoulkine@99668b35-9821-0410-8761-19e4c4f06640> | 2010-08-29 15:44:01 +0000 |
| commit | f3795e55dd2f071bf8ef5b6980ef71b538ec27fb (patch) | |
| tree | 866682b603588486c5958f572b6d5e9924f8f943 | |
| parent | e7b0e52068bd292bccfb0ae886c770578604cf6d (diff) | |
Minor unspecified bool refactoring (removed redundant CW workaround)
git-svn-id: http://pugixml.googlecode.com/svn/trunk@685 99668b35-9821-0410-8761-19e4c4f06640
| -rw-r--r-- | src/pugixml.cpp | 8 | ||||
| -rw-r--r-- | src/pugixml.hpp | 9 |
2 files changed, 1 insertions, 16 deletions
diff --git a/src/pugixml.cpp b/src/pugixml.cpp index 95ac883..ebc5e82 100644 --- a/src/pugixml.cpp +++ b/src/pugixml.cpp @@ -3071,11 +3071,7 @@ namespace pugi xml_attribute::operator xml_attribute::unspecified_bool_type() const { -#ifdef __MWERKS__ - return _attr ? &xml_attribute::empty : 0; -#else return _attr ? &xml_attribute::_attr : 0; -#endif } bool xml_attribute::operator!() const @@ -3319,11 +3315,7 @@ namespace pugi xml_node::operator xml_node::unspecified_bool_type() const { -#ifdef __MWERKS__ - return _root ? &xml_node::empty : 0; -#else return _root ? &xml_node::_root : 0; -#endif } bool xml_node::operator!() const diff --git a/src/pugixml.hpp b/src/pugixml.hpp index 20e8716..55e4b99 100644 --- a/src/pugixml.hpp +++ b/src/pugixml.hpp @@ -411,11 +411,7 @@ namespace pugi xml_attribute_struct* _attr; /// \internal Safe bool type -#ifdef __MWERKS__ - typedef bool (xml_attribute::*unspecified_bool_type)() const; -#else typedef xml_attribute_struct* xml_attribute::*unspecified_bool_type; -#endif /// \internal Initializing constructor explicit xml_attribute(xml_attribute_struct* attr); @@ -672,11 +668,7 @@ namespace pugi xml_node_struct* _root; /// \internal Safe bool type -#ifdef __MWERKS__ - typedef bool (xml_node::*unspecified_bool_type)() const; -#else typedef xml_node_struct* xml_node::*unspecified_bool_type; -#endif /// \internal Initializing constructor explicit xml_node(xml_node_struct* p); @@ -1881,6 +1873,7 @@ namespace pugi xpath_ast_node* _root; xpath_parse_result _result; + /// \internal Safe bool type typedef xpath_ast_node* xpath_query::*unspecified_bool_type; public: |