diff options
| author | arseny.kapoulkine <arseny.kapoulkine@99668b35-9821-0410-8761-19e4c4f06640> | 2007-10-31 17:46:35 +0000 |
|---|---|---|
| committer | arseny.kapoulkine <arseny.kapoulkine@99668b35-9821-0410-8761-19e4c4f06640> | 2007-10-31 17:46:35 +0000 |
| commit | 2c06637bf86fed5be3b8a1d04f454b9fe6964c7f (patch) | |
| tree | 7e82a52508b90e2b28f7d3556cea9c4fbde5e7b3 /src/pugixml.hpp | |
| parent | faf69388f0f2e505cb2204cfd30bfd110c042922 (diff) | |
Merged 0.34 in trunk (revisions 69:84)
git-svn-id: http://pugixml.googlecode.com/svn/trunk@85 99668b35-9821-0410-8761-19e4c4f06640
Diffstat (limited to 'src/pugixml.hpp')
| -rw-r--r-- | src/pugixml.hpp | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/src/pugixml.hpp b/src/pugixml.hpp index 91e7a5b..5ce3fcd 100644 --- a/src/pugixml.hpp +++ b/src/pugixml.hpp @@ -1,6 +1,6 @@ /////////////////////////////////////////////////////////////////////////////// // -// Pug Improved XML Parser - Version 0.3 +// Pug Improved XML Parser - Version 0.34 // -------------------------------------------------------- // Copyright (C) 2006-2007, by Arseny Kapoulkine (arseny.kapoulkine@gmail.com) // This work is based on the pugxml parser, which is: @@ -29,8 +29,8 @@ # endif #endif -#include <cstddef> -#include <cstring> +#include <stddef.h> +#include <string.h> /// The PugiXML Parser namespace. namespace pugi @@ -311,7 +311,11 @@ 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 ctor explicit xml_attribute(xml_attribute_struct* attr); @@ -519,7 +523,11 @@ 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 ctor explicit xml_node(xml_node_struct* p); @@ -1315,7 +1323,7 @@ namespace pugi const xml_document& operator=(const xml_document&); void create(); - void free(); + void destroy(); public: /** |