diff options
| author | Boris Kolpackov <boris@codesynthesis.com> | 2014-05-09 16:24:44 -0700 |
|---|---|---|
| committer | Boris Kolpackov <boris@codesynthesis.com> | 2014-05-09 16:24:44 -0700 |
| commit | 41569646f9b5e70e53769e24d5e8efe45c2d24b4 (patch) | |
| tree | ac973b8eedc7341793675746c67381d742b7cf36 /xml/parser.hxx | |
| parent | 850aca7f66a32f3301795c207926beef5165c45a (diff) | |
Move content model enum out of parser and into xml namespace
Diffstat (limited to 'xml/parser.hxx')
| -rw-r--r-- | xml/parser.hxx | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/xml/parser.hxx b/xml/parser.hxx index cd33588..1d45e8c 100644 --- a/xml/parser.hxx +++ b/xml/parser.hxx @@ -29,6 +29,7 @@ #include <xml/forward.hxx> #include <xml/qname.hxx> +#include <xml/content.hxx> #include <xml/exception.hxx> #include <xml/details/export.hxx> @@ -80,6 +81,8 @@ namespace xml { public: typedef xml::qname qname_type; + typedef xml::content content_type; + typedef unsigned short feature_type; // If both receive_attributes_event and receive_attributes_map are @@ -246,15 +249,6 @@ namespace xml // Optional content processing. // public: - enum content_type - { - // element characters whitespaces notes - empty, // no no ignored - simple, // no yes preserved content accumulated - complex, // yes no ignored - mixed // yes yes preserved - }; - // Note that you cannot get/set content while peeking. // void @@ -434,7 +428,7 @@ namespace xml // struct element_entry { - element_entry (std::size_t d, content_type c = mixed) + element_entry (std::size_t d, content_type c = content_type::mixed) : depth (d), content (c), attr_unhandled_ (0) {} std::size_t depth; |