diff options
author | Henning Baldersheim <balder@oath.com> | 2018-08-11 00:35:43 +0200 |
---|---|---|
committer | Henning Baldersheim <balder@oath.com> | 2018-08-11 00:35:43 +0200 |
commit | bb54ccd7a3422f9f3835d71dc71bded0a766fd88 (patch) | |
tree | 2beda45dfa7cfc3fdb8ae198a171e2ab48083a0e /staging_vespalib | |
parent | e198573919f269bf62bb7ff22c0fb5797375ef9c (diff) |
Pass stringref by value
Diffstat (limited to 'staging_vespalib')
10 files changed, 23 insertions, 23 deletions
diff --git a/staging_vespalib/src/vespa/vespalib/net/json_handler_repo.h b/staging_vespalib/src/vespa/vespalib/net/json_handler_repo.h index 8cca0165cd7..d1450f957de 100644 --- a/staging_vespalib/src/vespa/vespalib/net/json_handler_repo.h +++ b/staging_vespalib/src/vespa/vespalib/net/json_handler_repo.h @@ -34,7 +34,7 @@ private: vespalib::string path_prefix; const JsonGetHandler *handler; Hook(size_t seq_in, - const vespalib::stringref &prefix_in, + vespalib::stringref prefix_in, const JsonGetHandler &handler_in) : seq(seq_in), path_prefix(prefix_in), handler(&handler_in) {} bool operator <(const Hook &rhs) const { diff --git a/staging_vespalib/src/vespa/vespalib/objects/asciiserializer.cpp b/staging_vespalib/src/vespa/vespalib/objects/asciiserializer.cpp index 5006e267acc..698900a8e80 100644 --- a/staging_vespalib/src/vespa/vespalib/objects/asciiserializer.cpp +++ b/staging_vespalib/src/vespa/vespalib/objects/asciiserializer.cpp @@ -39,7 +39,7 @@ AsciiSerializer &AsciiSerializer::put(const IFieldBase &, double value) { return *this; } -AsciiSerializer &AsciiSerializer::put(const IFieldBase &, const stringref & value) { +AsciiSerializer &AsciiSerializer::put(const IFieldBase &, stringref value) { _stream << value; return *this; } diff --git a/staging_vespalib/src/vespa/vespalib/objects/asciiserializer.h b/staging_vespalib/src/vespa/vespalib/objects/asciiserializer.h index 999adcce575..0066c96934e 100644 --- a/staging_vespalib/src/vespa/vespalib/objects/asciiserializer.h +++ b/staging_vespalib/src/vespa/vespalib/objects/asciiserializer.h @@ -18,7 +18,7 @@ public: AsciiSerializer &put(const IFieldBase &field, uint64_t value) override; AsciiSerializer &put(const IFieldBase &field, float value) override; AsciiSerializer &put(const IFieldBase &field, double value) override; - AsciiSerializer &put(const IFieldBase &field, const stringref &val) override; + AsciiSerializer &put(const IFieldBase &field, stringref val) override; const asciistream &getStream() const { return _stream; } asciistream &getStream() { return _stream; } diff --git a/staging_vespalib/src/vespa/vespalib/objects/nboserializer.cpp b/staging_vespalib/src/vespa/vespalib/objects/nboserializer.cpp index 91c2eb7239b..e56ca6ca026 100644 --- a/staging_vespalib/src/vespa/vespalib/objects/nboserializer.cpp +++ b/staging_vespalib/src/vespa/vespalib/objects/nboserializer.cpp @@ -43,7 +43,7 @@ NBOSerializer &NBOSerializer::put(const IFieldBase &, double value) { return *this; } -NBOSerializer &NBOSerializer::put(const IFieldBase &, const stringref & value) { +NBOSerializer &NBOSerializer::put(const IFieldBase &, stringref value) { _stream << value; return *this; } diff --git a/staging_vespalib/src/vespa/vespalib/objects/nboserializer.h b/staging_vespalib/src/vespa/vespalib/objects/nboserializer.h index 516005c2b3f..ee75710dbfb 100644 --- a/staging_vespalib/src/vespa/vespalib/objects/nboserializer.h +++ b/staging_vespalib/src/vespa/vespalib/objects/nboserializer.h @@ -18,7 +18,7 @@ public: NBOSerializer &put(const IFieldBase &field, uint64_t value) override; NBOSerializer &put(const IFieldBase &field, float value) override; NBOSerializer &put(const IFieldBase &field, double value) override; - NBOSerializer &put(const IFieldBase &field, const stringref &val) override; + NBOSerializer &put(const IFieldBase &field, stringref val) override; NBOSerializer &get(const IFieldBase &field, bool &value) override; NBOSerializer &get(const IFieldBase &field, uint8_t &value) override; diff --git a/staging_vespalib/src/vespa/vespalib/objects/serializer.h b/staging_vespalib/src/vespa/vespalib/objects/serializer.h index 7d506d6a6bd..0458903e830 100644 --- a/staging_vespalib/src/vespa/vespalib/objects/serializer.h +++ b/staging_vespalib/src/vespa/vespalib/objects/serializer.h @@ -21,7 +21,7 @@ public: virtual Serializer & put(const IFieldBase & field, uint64_t value) = 0; virtual Serializer & put(const IFieldBase & field, float value) = 0; virtual Serializer & put(const IFieldBase & field, double value) = 0; - virtual Serializer & put(const IFieldBase & field, const stringref & value) = 0; + virtual Serializer & put(const IFieldBase & field, stringref value) = 0; virtual Serializer & put(const IFieldBase & field, const Identifiable & value); virtual Serializer & put(const IFieldBase & field, int8_t value); @@ -40,7 +40,7 @@ public: Serializer & operator << (int64_t value) { return put(_unspecifiedField, value); } Serializer & operator << (float value) { return put(_unspecifiedField, value); } Serializer & operator << (double value) { return put(_unspecifiedField, value); } - Serializer & operator << (const stringref & value) { return put(_unspecifiedField, value); } + Serializer & operator << (stringref value) { return put(_unspecifiedField, value); } template <typename T> Serializer & operator << (const vespalib::Array<T> & v); template <typename T> diff --git a/staging_vespalib/src/vespa/vespalib/objects/visit.h b/staging_vespalib/src/vespa/vespalib/objects/visit.h index 4d45ceea7fb..22c73dceefd 100644 --- a/staging_vespalib/src/vespa/vespalib/objects/visit.h +++ b/staging_vespalib/src/vespa/vespalib/objects/visit.h @@ -22,5 +22,5 @@ void visit(vespalib::ObjectVisitor &self, const vespalib::string &name, uint64_t void visit(vespalib::ObjectVisitor &self, const vespalib::string &name, float value); void visit(vespalib::ObjectVisitor &self, const vespalib::string &name, double value); void visit(vespalib::ObjectVisitor &self, const vespalib::string &name, const vespalib::string &value); -void visit(vespalib::ObjectVisitor &self, const vespalib::string &name, const vespalib::stringref &value); +void visit(vespalib::ObjectVisitor &self, const vespalib::string &name, vespalib::stringref value); void visit(vespalib::ObjectVisitor &self, const vespalib::string &name, const char *value); diff --git a/staging_vespalib/src/vespa/vespalib/util/xmlstream.cpp b/staging_vespalib/src/vespa/vespalib/util/xmlstream.cpp index 0390933f89a..6399faeefec 100644 --- a/staging_vespalib/src/vespa/vespalib/util/xmlstream.cpp +++ b/staging_vespalib/src/vespa/vespalib/util/xmlstream.cpp @@ -446,18 +446,18 @@ XmlContentWrapper::XmlContentWrapper(const char* value, uint32_t size) using CharP = char *; using ConstCharP = const char *; -template XmlAttribute::XmlAttribute(const std::string &, const std::string &, unsigned int); -template XmlAttribute::XmlAttribute(const std::string &, const vespalib::string &, unsigned int); -template XmlAttribute::XmlAttribute(const std::string &, const vespalib::stringref &, unsigned int); -template XmlAttribute::XmlAttribute(const std::string &, const CharP &, unsigned int); -template XmlAttribute::XmlAttribute(const std::string &, const ConstCharP &, unsigned int); -template XmlAttribute::XmlAttribute(const std::string &, const bool &, unsigned int); -template XmlAttribute::XmlAttribute(const std::string &, const int16_t &, unsigned int); -template XmlAttribute::XmlAttribute(const std::string &, const int32_t &, unsigned int); -template XmlAttribute::XmlAttribute(const std::string &, const int64_t &, unsigned int); -template XmlAttribute::XmlAttribute(const std::string &, const uint16_t &, unsigned int); -template XmlAttribute::XmlAttribute(const std::string &, const uint32_t &, unsigned int); -template XmlAttribute::XmlAttribute(const std::string &, const uint64_t &, unsigned int); -template XmlAttribute::XmlAttribute(const std::string &, const double &, unsigned int); +template XmlAttribute::XmlAttribute(const std::string &, std::string, unsigned int); +template XmlAttribute::XmlAttribute(const std::string &, vespalib::string, unsigned int); +template XmlAttribute::XmlAttribute(const std::string &, vespalib::stringref, unsigned int); +template XmlAttribute::XmlAttribute(const std::string &, CharP, unsigned int); +template XmlAttribute::XmlAttribute(const std::string &, ConstCharP, unsigned int); +template XmlAttribute::XmlAttribute(const std::string &, bool, unsigned int); +template XmlAttribute::XmlAttribute(const std::string &, int16_t, unsigned int); +template XmlAttribute::XmlAttribute(const std::string &, int32_t, unsigned int); +template XmlAttribute::XmlAttribute(const std::string &, int64_t, unsigned int); +template XmlAttribute::XmlAttribute(const std::string &, uint16_t, unsigned int); +template XmlAttribute::XmlAttribute(const std::string &, uint32_t, unsigned int); +template XmlAttribute::XmlAttribute(const std::string &, uint64_t, unsigned int); +template XmlAttribute::XmlAttribute(const std::string &, double, unsigned int); } diff --git a/staging_vespalib/src/vespa/vespalib/util/xmlstream.h b/staging_vespalib/src/vespa/vespalib/util/xmlstream.h index 3185fa8c119..5455251eea1 100644 --- a/staging_vespalib/src/vespa/vespalib/util/xmlstream.h +++ b/staging_vespalib/src/vespa/vespalib/util/xmlstream.h @@ -90,7 +90,7 @@ public: XmlAttribute(const XmlAttribute&); /** Add any value that can be written to an ostringstream. */ template<typename T> - XmlAttribute(const std::string& name, const T& value, uint32_t flags = NONE); + XmlAttribute(const std::string& name, T value, uint32_t flags = NONE); XmlAttribute(const std::string& name, const char * value, uint32_t flags = NONE); ~XmlAttribute(); diff --git a/staging_vespalib/src/vespa/vespalib/util/xmlstream.hpp b/staging_vespalib/src/vespa/vespalib/util/xmlstream.hpp index babcf91e791..7ee7d8d0b82 100644 --- a/staging_vespalib/src/vespa/vespalib/util/xmlstream.hpp +++ b/staging_vespalib/src/vespa/vespalib/util/xmlstream.hpp @@ -9,7 +9,7 @@ namespace vespalib::xml { template<typename T> -XmlAttribute::XmlAttribute(const std::string& name, const T& value, uint32_t flags) +XmlAttribute::XmlAttribute(const std::string& name, T value, uint32_t flags) : _name(name), _value(), _next() |