diff options
| author | Tor Egge <Tor.Egge@broadpark.no> | 2019-07-30 22:26:51 +0200 |
|---|---|---|
| committer | Tor Egge <Tor.Egge@broadpark.no> | 2019-07-30 22:26:51 +0200 |
| commit | aba794a1f788619780a0b1770087a67f792d9da6 (patch) | |
| tree | 293615be82a81e46ee427d928699f36f62c58920 /staging_vespalib | |
| parent | 0beb5f054f3662b07b76bb0cd9d3311abafe63cb (diff) | |
Use enum class for vespalib::xml::XmlTagFlags.
Diffstat (limited to 'staging_vespalib')
3 files changed, 4 insertions, 4 deletions
diff --git a/staging_vespalib/src/tests/xmlserializable/xmlserializabletest.cpp b/staging_vespalib/src/tests/xmlserializable/xmlserializabletest.cpp index f2990d7b511..a389ada2214 100644 --- a/staging_vespalib/src/tests/xmlserializable/xmlserializabletest.cpp +++ b/staging_vespalib/src/tests/xmlserializable/xmlserializabletest.cpp @@ -56,7 +56,7 @@ Test::testEscaping() std::ostringstream ost; XmlOutputStream xos(ost); using namespace vespalib::xml; - xos << XmlTag("!#trash%-", CONVERT_ILLEGAL_CHARACTERS) + xos << XmlTag("!#trash%-", XmlTagFlags::CONVERT_ILLEGAL_CHARACTERS) << XmlTag("foo") << XmlAttribute("bar", "<100%\" &\n>") << XmlEndTag() diff --git a/staging_vespalib/src/vespa/vespalib/util/xmlstream.cpp b/staging_vespalib/src/vespa/vespalib/util/xmlstream.cpp index b5fd5b10844..e1778a881be 100644 --- a/staging_vespalib/src/vespa/vespalib/util/xmlstream.cpp +++ b/staging_vespalib/src/vespa/vespalib/util/xmlstream.cpp @@ -361,7 +361,7 @@ XmlTag::XmlTag(const std::string& name, XmlTagFlags flags) _content(), _flags(flags) { - if (_flags == CONVERT_ILLEGAL_CHARACTERS) { + if (_flags == XmlTagFlags::CONVERT_ILLEGAL_CHARACTERS) { convertToLegalName(_name); } if (!isLegalName(_name)) { diff --git a/staging_vespalib/src/vespa/vespalib/util/xmlstream.h b/staging_vespalib/src/vespa/vespalib/util/xmlstream.h index 5455251eea1..01f3104a595 100644 --- a/staging_vespalib/src/vespa/vespalib/util/xmlstream.h +++ b/staging_vespalib/src/vespa/vespalib/util/xmlstream.h @@ -42,7 +42,7 @@ class XmlOutputStream; bool isLegalName(const std::string& name); -enum XmlTagFlags { NONE = 0, CONVERT_ILLEGAL_CHARACTERS = 1 }; +enum class XmlTagFlags { NONE = 0, CONVERT_ILLEGAL_CHARACTERS = 1 }; /** * @class document::XmlTag @@ -56,7 +56,7 @@ class XmlTag { XmlTagFlags _flags; public: XmlTag(const XmlTag&); - XmlTag(const std::string& name, XmlTagFlags = NONE); + XmlTag(const std::string& name, XmlTagFlags = XmlTagFlags::NONE); ~XmlTag(); const std::string& getName() const { return _name; } |