diff options
4 files changed, 7 insertions, 7 deletions
diff --git a/metrics/src/vespa/metrics/xmlwriter.cpp b/metrics/src/vespa/metrics/xmlwriter.cpp index 25bc4e23d96..70e4f72d761 100644 --- a/metrics/src/vespa/metrics/xmlwriter.cpp +++ b/metrics/src/vespa/metrics/xmlwriter.cpp @@ -37,7 +37,7 @@ XmlWriter::visitMetricSet(const MetricSet& set, bool) { using namespace vespalib::xml; if (set.used() || _verbosity >= 2) { - _xos << XmlTag(set.getName(), CONVERT_ILLEGAL_CHARACTERS); + _xos << XmlTag(set.getName(), XmlTagFlags::CONVERT_ILLEGAL_CHARACTERS); printCommonXmlParts(set); return true; } @@ -56,7 +56,7 @@ XmlWriter::visitCountMetric(const AbstractCountMetric& metric, bool) if (!metric.inUse(*values) && _verbosity < 2) return true; using namespace vespalib::xml; std::ostringstream ost; - _xos << XmlTag(metric.getName(), CONVERT_ILLEGAL_CHARACTERS) + _xos << XmlTag(metric.getName(), XmlTagFlags::CONVERT_ILLEGAL_CHARACTERS) << XmlAttribute(metric.sumOnAdd() ? "count" : "value", values->toString("count")); printCommonXmlParts(metric); @@ -70,7 +70,7 @@ XmlWriter::visitValueMetric(const AbstractValueMetric& metric, bool) MetricValueClass::UP values(metric.getValues()); if (!metric.inUse(*values) && _verbosity < 2) return true; using namespace vespalib::xml; - _xos << XmlTag(metric.getName(), CONVERT_ILLEGAL_CHARACTERS) + _xos << XmlTag(metric.getName(), XmlTagFlags::CONVERT_ILLEGAL_CHARACTERS) << XmlAttribute("average", values->getLongValue("count") == 0 ? 0 : values->getDoubleValue("total") / values->getDoubleValue("count")) 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; } |