diff options
| author | Henning Baldersheim <balder@yahoo-inc.com> | 2016-12-02 15:40:36 +0100 |
|---|---|---|
| committer | Henning Baldersheim <balder@yahoo-inc.com> | 2016-12-12 02:55:44 +0100 |
| commit | f2fd8d33d46edb8b3c4351d14f4abbc386ffbabf (patch) | |
| tree | 087f1b61806834edd4349fb52ba69c5b1dd34756 /staging_vespalib | |
| parent | f97313b7611fc90f87c656c61c97ff2baa0b22a7 (diff) | |
Include asciistream in implementation only.
Diffstat (limited to 'staging_vespalib')
3 files changed, 6 insertions, 5 deletions
diff --git a/staging_vespalib/src/vespa/vespalib/util/bits.h b/staging_vespalib/src/vespa/vespalib/util/bits.h index 8926cdfec64..18c5325dc3d 100644 --- a/staging_vespalib/src/vespa/vespalib/util/bits.h +++ b/staging_vespalib/src/vespa/vespalib/util/bits.h @@ -1,7 +1,7 @@ // Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #pragma once -#include <vespa/fastos/fastos.h> +#include <stdint.h> namespace vespalib { diff --git a/staging_vespalib/src/vespa/vespalib/util/xmlserializable.cpp b/staging_vespalib/src/vespa/vespalib/util/xmlserializable.cpp index 17c5a2e4a68..75d10f46262 100644 --- a/staging_vespalib/src/vespa/vespalib/util/xmlserializable.cpp +++ b/staging_vespalib/src/vespa/vespalib/util/xmlserializable.cpp @@ -3,6 +3,7 @@ #include <vespa/vespalib/util/xmlserializable.hpp> #include <vector> #include <vespa/vespalib/encoding/base64.h> +#include <vespa/vespalib/stllike/asciistream.h> namespace vespalib { namespace xml { @@ -66,7 +67,7 @@ namespace { } const std::string xmlAttributeEscape(const std::string& s) { - std::ostringstream ost; + vespalib::asciistream ost; for (uint32_t i=0, n=s.size(); i<n; ++i) { if (s[i] == '"' || s[i] == '\n' || escapedXmlChars[static_cast<uint8_t>(s[i])]) @@ -379,8 +380,8 @@ XmlAttribute::XmlAttribute(const std::string& name, const char * value, uint32_t _value(), _next() { - std::ostringstream ost; - if (flags & HEX) ost << std::hex << "0x"; + vespalib::asciistream ost; + if (flags & HEX) ost << vespalib::hex << "0x"; ost << value; _value = ost.str(); if (!isLegalName(name)) { diff --git a/staging_vespalib/src/vespa/vespalib/util/xmlserializable.h b/staging_vespalib/src/vespa/vespalib/util/xmlserializable.h index 0c064ebd43f..69a48596115 100644 --- a/staging_vespalib/src/vespa/vespalib/util/xmlserializable.h +++ b/staging_vespalib/src/vespa/vespalib/util/xmlserializable.h @@ -29,7 +29,7 @@ #pragma once -#include <ostream> +#include <iosfwd> #include <list> #include <memory> |