diff options
33 files changed, 71 insertions, 71 deletions
diff --git a/storageapi/src/vespa/storageapi/message/persistence.h b/storageapi/src/vespa/storageapi/message/persistence.h index d352b2a5e94..6e93c0e7c05 100644 --- a/storageapi/src/vespa/storageapi/message/persistence.h +++ b/storageapi/src/vespa/storageapi/message/persistence.h @@ -194,7 +194,7 @@ public: const document::DocumentId& getDocumentId() const { return _docId; } Timestamp getBeforeTimestamp() const { return _beforeTimestamp; } const vespalib::string& getFieldSet() const { return _fieldSet; } - void setFieldSet(vespalib::stringref fieldSet) { _fieldSet = fieldSet; } + void setFieldSet(vespalib::stringref fieldSet) { _fieldSet = fieldSet; } vespalib::string getSummary() const override; void print(std::ostream& out, bool verbose, const std::string& indent) const override; diff --git a/storageapi/src/vespa/storageapi/message/removelocation.cpp b/storageapi/src/vespa/storageapi/message/removelocation.cpp index ac50bdd6a1e..b53584601ef 100644 --- a/storageapi/src/vespa/storageapi/message/removelocation.cpp +++ b/storageapi/src/vespa/storageapi/message/removelocation.cpp @@ -8,7 +8,7 @@ namespace storage::api { IMPLEMENT_COMMAND(RemoveLocationCommand, RemoveLocationReply) IMPLEMENT_REPLY(RemoveLocationReply) -RemoveLocationCommand::RemoveLocationCommand(vespalib::stringref documentSelection, +RemoveLocationCommand::RemoveLocationCommand(vespalib::stringref documentSelection, const document::Bucket &bucket) : BucketInfoCommand(MessageType::REMOVELOCATION, bucket), _documentSelection(documentSelection) diff --git a/storageapi/src/vespa/storageapi/message/removelocation.h b/storageapi/src/vespa/storageapi/message/removelocation.h index cdf43219169..46555497035 100644 --- a/storageapi/src/vespa/storageapi/message/removelocation.h +++ b/storageapi/src/vespa/storageapi/message/removelocation.h @@ -10,7 +10,7 @@ namespace storage::api { class RemoveLocationCommand : public BucketInfoCommand { public: - RemoveLocationCommand(vespalib::stringref documentSelection, const document::Bucket &bucket); + RemoveLocationCommand(vespalib::stringref documentSelection, const document::Bucket &bucket); ~RemoveLocationCommand(); void print(std::ostream& out, bool verbose, const std::string& indent) const override; diff --git a/storageapi/src/vespa/storageapi/message/visitor.cpp b/storageapi/src/vespa/storageapi/message/visitor.cpp index 658e3d22ca3..f5850de98ad 100644 --- a/storageapi/src/vespa/storageapi/message/visitor.cpp +++ b/storageapi/src/vespa/storageapi/message/visitor.cpp @@ -140,7 +140,7 @@ CreateVisitorReply::print(std::ostream& out, bool verbose, } } -DestroyVisitorCommand::DestroyVisitorCommand(vespalib::stringref instanceId) +DestroyVisitorCommand::DestroyVisitorCommand(vespalib::stringref instanceId) : StorageCommand(MessageType::VISITOR_DESTROY), _instanceId(instanceId) { diff --git a/storageapi/src/vespa/storageapi/message/visitor.h b/storageapi/src/vespa/storageapi/message/visitor.h index 696d8962256..0019488b583 100644 --- a/storageapi/src/vespa/storageapi/message/visitor.h +++ b/storageapi/src/vespa/storageapi/message/visitor.h @@ -63,13 +63,13 @@ public: ~CreateVisitorCommand(); void setVisitorCmdId(uint32_t id) { _visitorCmdId = id; } - void setControlDestination(vespalib::stringref d) + void setControlDestination(vespalib::stringref d) { _controlDestination = d; } - void setDataDestination(vespalib::stringref d) { _dataDestination = d; } + void setDataDestination(vespalib::stringref d) { _dataDestination = d; } void setParameters(const vdslib::Parameters& params) { _params = params; } void setMaximumPendingReplyCount(uint32_t count) { _maxPendingReplyCount = count; } - void setFieldSet(vespalib::stringref fieldSet) + void setFieldSet(vespalib::stringref fieldSet) { _fieldSet = fieldSet; } void setVisitRemoves(bool value = true) { _visitRemoves = value; } void setVisitInconsistentBuckets(bool visitInconsistent = true) @@ -77,7 +77,7 @@ public: void addBucketToBeVisited(const document::BucketId& id) { _buckets.push_back(id); } void setVisitorId(const VisitorId id) { _visitorId = id; } - void setInstanceId(vespalib::stringref id) { _instanceId = id; } + void setInstanceId(vespalib::stringref id) { _instanceId = id; } void setQueueTimeout(uint32_t milliSecs) { _queueTimeout = milliSecs; } void setFromTime(Timestamp ts) { _fromTime = ts; } void setToTime(Timestamp ts) { _toTime = ts; } @@ -157,7 +157,7 @@ private: vespalib::string _instanceId; public: - explicit DestroyVisitorCommand(vespalib::stringref instanceId); + explicit DestroyVisitorCommand(vespalib::stringref instanceId); const vespalib::string & getInstanceId() const { return _instanceId; } diff --git a/storageapi/src/vespa/storageapi/messageapi/maintenancecommand.h b/storageapi/src/vespa/storageapi/messageapi/maintenancecommand.h index 3bf65d3ac15..029365973c5 100644 --- a/storageapi/src/vespa/storageapi/messageapi/maintenancecommand.h +++ b/storageapi/src/vespa/storageapi/messageapi/maintenancecommand.h @@ -17,7 +17,7 @@ public: ~MaintenanceCommand(); const vespalib::string& getReason() const { return _reason; }; - void setReason(vespalib::stringref reason) { _reason = reason; }; + void setReason(vespalib::stringref reason) { _reason = reason; }; protected: vespalib::string _reason; }; diff --git a/storageapi/src/vespa/storageapi/messageapi/returncode.h b/storageapi/src/vespa/storageapi/messageapi/returncode.h index 23c16c85c5e..ccd95a81aa3 100644 --- a/storageapi/src/vespa/storageapi/messageapi/returncode.h +++ b/storageapi/src/vespa/storageapi/messageapi/returncode.h @@ -87,7 +87,7 @@ public: size_t getSerializedSize() const override; const vespalib::string& getMessage() const { return _message; } - void setMessage(vespalib::stringref message) { _message = message; } + void setMessage(vespalib::stringref message) { _message = message; } Result getResult() const { return _result; } diff --git a/storageapi/src/vespa/storageapi/messageapi/storagemessage.cpp b/storageapi/src/vespa/storageapi/messageapi/storagemessage.cpp index 39ece68d2fe..563a2aab7c1 100644 --- a/storageapi/src/vespa/storageapi/messageapi/storagemessage.cpp +++ b/storageapi/src/vespa/storageapi/messageapi/storagemessage.cpp @@ -123,7 +123,7 @@ MessageType::MessageType::get(Id id) } return *it->second; } -MessageType::MessageType(vespalib::stringref name, Id id, +MessageType::MessageType(vespalib::stringref name, Id id, const MessageType* replyOf) : _name(name), _id(id), _reply(NULL), _replyOf(replyOf) { @@ -163,14 +163,14 @@ std::ostream & operator << (std::ostream & os, const StorageMessageAddress & add } static vespalib::string -createAddress(vespalib::stringref cluster, const lib::NodeType& type, uint16_t index) +createAddress(vespalib::stringref cluster, const lib::NodeType& type, uint16_t index) { vespalib::asciistream os; os << STORAGEADDRESS_PREFIX << cluster << '/' << type.toString() << '/' << index << "/default"; return os.str(); } -StorageMessageAddress::StorageMessageAddress(vespalib::stringref cluster, const lib::NodeType& type, +StorageMessageAddress::StorageMessageAddress(vespalib::stringref cluster, const lib::NodeType& type, uint16_t index, Protocol protocol) : _route(), _retryEnabled(false), diff --git a/storageapi/src/vespa/storageapi/messageapi/storagemessage.h b/storageapi/src/vespa/storageapi/messageapi/storagemessage.h index 34ad25e76cf..c81ee51ae22 100644 --- a/storageapi/src/vespa/storageapi/messageapi/storagemessage.h +++ b/storageapi/src/vespa/storageapi/messageapi/storagemessage.h @@ -163,7 +163,7 @@ private: MessageType *_reply; const MessageType *_replyOf; - MessageType(vespalib::stringref name, Id id, const MessageType* replyOf = 0); + MessageType(vespalib::stringref name, Id id, const MessageType* replyOf = 0); public: static const MessageType DOCBLOCK; static const MessageType DOCBLOCK_REPLY; @@ -280,7 +280,7 @@ private: public: StorageMessageAddress(const mbus::Route& route); - StorageMessageAddress(vespalib::stringref clusterName, + StorageMessageAddress(vespalib::stringref clusterName, const lib::NodeType& type, uint16_t index, Protocol protocol = STORAGE); ~StorageMessageAddress(); diff --git a/vdslib/src/vespa/vdslib/container/parameters.cpp b/vdslib/src/vespa/vdslib/container/parameters.cpp index 6747bee2bec..0803c346b0a 100644 --- a/vdslib/src/vespa/vdslib/container/parameters.cpp +++ b/vdslib/src/vespa/vdslib/container/parameters.cpp @@ -111,7 +111,7 @@ Parameters* Parameters::clone() const return new Parameters(*this); } -vespalib::stringref Parameters::get(vespalib::stringref id, vespalib::stringref def) const +vespalib::stringref Parameters::get(vespalib::stringref id, vespalib::stringref def) const { ParametersMap::const_iterator it = _parameters.find(id); if (it == _parameters.end()) return def; diff --git a/vdslib/src/vespa/vdslib/container/parameters.h b/vdslib/src/vespa/vdslib/container/parameters.h index 02d54643e18..f3ea0543546 100644 --- a/vdslib/src/vespa/vdslib/container/parameters.h +++ b/vdslib/src/vespa/vdslib/container/parameters.h @@ -32,7 +32,7 @@ public: { public: Value() { } - Value(vespalib::stringref s) : vespalib::string(s) { } + Value(vespalib::stringref s) : vespalib::string(s) { } Value(const vespalib::string & s) : vespalib::string(s) { } Value(const void *v, size_t sz) : vespalib::string(v, sz) { } size_t length() const { return size() - 1; } diff --git a/vdslib/src/vespa/vdslib/state/clusterstate.h b/vdslib/src/vespa/vdslib/state/clusterstate.h index 35259ba672b..1a8e5297b65 100644 --- a/vdslib/src/vespa/vdslib/state/clusterstate.h +++ b/vdslib/src/vespa/vdslib/state/clusterstate.h @@ -62,7 +62,7 @@ public: void setVersion(uint32_t version) { _version = version; } void setClusterState(const State& state); void setNodeState(const Node& node, const NodeState& state); - void setDescription(vespalib::stringref s) { _description = s; } + void setDescription(vespalib::stringref s) { _description = s; } void setDistributionBitCount(uint16_t count) { _distributionBits = count; } void print(std::ostream& out, bool verbose, const std::string& indent) const override; diff --git a/vdslib/src/vespa/vdslib/state/diskstate.cpp b/vdslib/src/vespa/vdslib/state/diskstate.cpp index 0f41bada230..0147b422a8e 100644 --- a/vdslib/src/vespa/vdslib/state/diskstate.cpp +++ b/vdslib/src/vespa/vdslib/state/diskstate.cpp @@ -30,7 +30,7 @@ DiskState::DiskState(const State& state, vespalib::stringref description, setCapacity(capacity); } -DiskState::DiskState(vespalib::stringref serialized) +DiskState::DiskState(vespalib::stringref serialized) : _state(&State::UP), _description(""), _capacity(1.0) diff --git a/vdslib/src/vespa/vdslib/state/diskstate.h b/vdslib/src/vespa/vdslib/state/diskstate.h index 7c50ea9dacc..cb28e24daac 100644 --- a/vdslib/src/vespa/vdslib/state/diskstate.h +++ b/vdslib/src/vespa/vdslib/state/diskstate.h @@ -23,7 +23,7 @@ public: DiskState(); DiskState(const State&, vespalib::stringref description = "", double capacity = 1.0); - explicit DiskState(vespalib::stringref serialized); + explicit DiskState(vespalib::stringref serialized); void serialize(vespalib::asciistream & out, vespalib::stringref prefix = "", bool includeReason = true, bool useOldFormat = false) const; @@ -34,7 +34,7 @@ public: void setState(const State& state); void setCapacity(double capacity); - void setDescription(vespalib::stringref desc) { _description = desc; } + void setDescription(vespalib::stringref desc) { _description = desc; } void print(std::ostream& out, bool verbose, const std::string& indent) const override; bool operator==(const DiskState& other) const; diff --git a/vdslib/src/vespa/vdslib/state/nodestate.cpp b/vdslib/src/vespa/vdslib/state/nodestate.cpp index 3ca92d6730d..22854b7a571 100644 --- a/vdslib/src/vespa/vdslib/state/nodestate.cpp +++ b/vdslib/src/vespa/vdslib/state/nodestate.cpp @@ -78,7 +78,7 @@ namespace { }; } -NodeState::NodeState(vespalib::stringref serialized, const NodeType* type) +NodeState::NodeState(vespalib::stringref serialized, const NodeType* type) : _type(type), _state(&State::UP), _description(), diff --git a/vdslib/src/vespa/vdslib/state/nodestate.h b/vdslib/src/vespa/vdslib/state/nodestate.h index 75cf5044acc..74f58663650 100644 --- a/vdslib/src/vespa/vdslib/state/nodestate.h +++ b/vdslib/src/vespa/vdslib/state/nodestate.h @@ -46,7 +46,7 @@ public: vespalib::stringref description = "", double capacity = 1.0, uint16_t reliability = 1); /** Set type if you want to verify that content fit with the given type. */ - NodeState(vespalib::stringref serialized, const NodeType* nodeType = 0); + NodeState(vespalib::stringref serialized, const NodeType* nodeType = 0); ~NodeState(); /** @@ -77,7 +77,7 @@ public: void setReliability(uint16_t reliability); void setInitProgress(vespalib::Double initProgress); void setStartTimestamp(uint64_t startTimestamp); - void setDescription(vespalib::stringref desc) { _description = desc; } + void setDescription(vespalib::stringref desc) { _description = desc; } void setDiskCount(uint16_t count); void setDiskState(uint16_t index, const DiskState&); diff --git a/vdslib/src/vespa/vdslib/state/nodetype.cpp b/vdslib/src/vespa/vdslib/state/nodetype.cpp index b5664bf691b..915b1548f88 100644 --- a/vdslib/src/vespa/vdslib/state/nodetype.cpp +++ b/vdslib/src/vespa/vdslib/state/nodetype.cpp @@ -14,7 +14,7 @@ const NodeType NodeType::STORAGE("storage", 0); const NodeType NodeType::DISTRIBUTOR("distributor", 1); const NodeType& -NodeType::get(vespalib::stringref serialized) +NodeType::get(vespalib::stringref serialized) { if (serialized == STORAGE._name) { return STORAGE; @@ -26,7 +26,7 @@ NodeType::get(vespalib::stringref serialized) "Unknown node type " + serialized + " given.", VESPA_STRLOC); } -NodeType::NodeType(vespalib::stringref name, uint16_t enumValue) +NodeType::NodeType(vespalib::stringref name, uint16_t enumValue) : _enumValue(enumValue), _name(name) { } diff --git a/vdslib/src/vespa/vdslib/state/nodetype.h b/vdslib/src/vespa/vdslib/state/nodetype.h index 4adf3e0d761..35edd83fdac 100644 --- a/vdslib/src/vespa/vdslib/state/nodetype.h +++ b/vdslib/src/vespa/vdslib/state/nodetype.h @@ -24,14 +24,14 @@ class NodeType { uint16_t _enumValue; vespalib::string _name; - NodeType(vespalib::stringref name, uint16_t enumValue); + NodeType(vespalib::stringref name, uint16_t enumValue); public: static const NodeType DISTRIBUTOR; static const NodeType STORAGE; /** Throws vespalib::IllegalArgumentException if invalid state given. */ - static const NodeType& get(vespalib::stringref serialized); + static const NodeType& get(vespalib::stringref serialized); const vespalib::string& serialize() const { return _name; } operator uint16_t() const { return _enumValue; } diff --git a/vdslib/src/vespa/vdslib/state/state.cpp b/vdslib/src/vespa/vdslib/state/state.cpp index 041753beb82..5bf95b5530b 100644 --- a/vdslib/src/vespa/vdslib/state/state.cpp +++ b/vdslib/src/vespa/vdslib/state/state.cpp @@ -23,7 +23,7 @@ const State State::UP("Up", "u", 6, true, true, true, true, true, true); const State& -State::get(vespalib::stringref serialized) +State::get(vespalib::stringref serialized) { if (serialized.size() == 1) switch(serialized[0]) { case '-': return UNKNOWN; @@ -39,7 +39,7 @@ State::get(vespalib::stringref serialized) "Unknown state " + serialized + " given.", VESPA_STRLOC); } -State::State(vespalib::stringref name, vespalib::stringref serialized, +State::State(vespalib::stringref name, vespalib::stringref serialized, uint8_t rank, bool validDisk, bool validDistributorReported, bool validStorageReported, bool validDistributorWanted, bool validStorageWanted, diff --git a/vdslib/src/vespa/vdslib/state/state.h b/vdslib/src/vespa/vdslib/state/state.h index eb1c9841053..bec500a082d 100644 --- a/vdslib/src/vespa/vdslib/state/state.h +++ b/vdslib/src/vespa/vdslib/state/state.h @@ -26,7 +26,7 @@ class State : public vespalib::Printable { bool _validClusterState; State(const State&); - State(vespalib::stringref name, vespalib::stringref serialized, + State(vespalib::stringref name, vespalib::stringref serialized, uint8_t rank, bool validDisk, bool validDistributorReported, bool validStorageReported, bool validDistributorWanted, bool validStorageWanted, @@ -45,7 +45,7 @@ public: static const State UP; /** Throws vespalib::IllegalArgumentException if invalid state given. */ - static const State& get(vespalib::stringref serialized); + static const State& get(vespalib::stringref serialized); const vespalib::string& serialize() const { return _serialized; } bool validDiskState() const { return _validDiskState; } diff --git a/vespalib/src/vespa/vespalib/io/fileutil.h b/vespalib/src/vespa/vespalib/io/fileutil.h index 9d7e64788a0..1507513dbbc 100644 --- a/vespalib/src/vespa/vespalib/io/fileutil.h +++ b/vespalib/src/vespa/vespalib/io/fileutil.h @@ -218,7 +218,7 @@ class LazyFile : public File { public: typedef std::unique_ptr<LazyFile> UP; - LazyFile(vespalib::stringref filename, int flags, + LazyFile(vespalib::stringref filename, int flags, bool autoCreateDirs = false) : File(filename), _flags(flags), diff --git a/vespalib/src/vespa/vespalib/objects/nbostream.h b/vespalib/src/vespa/vespalib/objects/nbostream.h index 8942004fadf..3109295fbdc 100644 --- a/vespalib/src/vespa/vespalib/objects/nbostream.h +++ b/vespalib/src/vespa/vespalib/objects/nbostream.h @@ -71,7 +71,7 @@ public: return *this; } nbostream & operator << (const char * v) { uint32_t sz(strlen(v)); (*this) << sz; write(v, sz); return *this; } - nbostream & operator << (vespalib::stringref v) { uint32_t sz(v.size()); (*this) << sz; write(v.data(), sz); return *this; } + nbostream & operator << (vespalib::stringref v) { uint32_t sz(v.size()); (*this) << sz; write(v.data(), sz); return *this; } nbostream & operator << (const vespalib::string & v) { uint32_t sz(v.size()); (*this) << sz; write(v.c_str(), sz); return *this; } nbostream & operator >> (vespalib::string & v) { uint32_t sz; (*this) >> sz; diff --git a/vespalib/src/vespa/vespalib/stllike/asciistream.h b/vespalib/src/vespa/vespalib/stllike/asciistream.h index 80523d5133d..c225c371a78 100644 --- a/vespalib/src/vespa/vespalib/stllike/asciistream.h +++ b/vespalib/src/vespa/vespalib/stllike/asciistream.h @@ -144,8 +144,8 @@ public: asciistream & operator << (Precision v); asciistream & operator >> (Precision v); void eatWhite(); - static asciistream createFromFile(stringref fileName); - static asciistream createFromDevice(stringref fileName); + static asciistream createFromFile(stringref fileName); + static asciistream createFromDevice(stringref fileName); string getline(char delim='\n'); std::vector<string> getlines(char delim='\n'); char getFill() const noexcept { return _fill; } @@ -166,15 +166,15 @@ private: } void write(const void * buf, size_t len); size_t length() const { return _rbuf.size(); } - size_t _rPos; - string _wbuf; - stringref _rbuf; - Base _base; - FloatSpec _floatSpec; + size_t _rPos; + string _wbuf; + stringref _rbuf; + Base _base; + FloatSpec _floatSpec; FloatModifier _floatModifier; - uint32_t _width; - char _fill; - uint8_t _precision; + uint32_t _width; + char _fill; + uint8_t _precision; }; ssize_t getline(asciistream & is, vespalib::string & line, char delim='\n'); diff --git a/vespalib/src/vespa/vespalib/stllike/hash_fun.h b/vespalib/src/vespa/vespalib/stllike/hash_fun.h index 5686871b91a..0342ea4cc69 100644 --- a/vespalib/src/vespa/vespalib/stllike/hash_fun.h +++ b/vespalib/src/vespa/vespalib/stllike/hash_fun.h @@ -67,7 +67,7 @@ template<> struct hash<const char *> { }; template<> struct hash<vespalib::stringref> { - size_t operator() (vespalib::stringref arg) const { return hashValue(arg.data(), arg.size()); } + size_t operator() (vespalib::stringref arg) const { return hashValue(arg.data(), arg.size()); } }; template<> struct hash<vespalib::string> { diff --git a/vespalib/src/vespa/vespalib/stllike/string.cpp b/vespalib/src/vespa/vespalib/stllike/string.cpp index 9001901bfd2..4ec324ceef0 100644 --- a/vespalib/src/vespa/vespalib/stllike/string.cpp +++ b/vespalib/src/vespa/vespalib/stllike/string.cpp @@ -69,7 +69,7 @@ template std::ostream & operator << (std::ostream & os, const string & v); template std::istream & operator >> (std::istream & is, string & v); string -operator + (stringref a, const char * b) +operator + (stringref a, const char * b) { string t(a); t += b; @@ -85,7 +85,7 @@ operator + (const char * a, stringref b) } string -operator + (stringref a, stringref b) +operator + (stringref a, stringref b) { string t(a); t += b; diff --git a/vespalib/src/vespa/vespalib/stllike/string.h b/vespalib/src/vespa/vespalib/stllike/string.h index 7fe18285966..e787ecc071f 100644 --- a/vespalib/src/vespa/vespalib/stllike/string.h +++ b/vespalib/src/vespa/vespalib/stllike/string.h @@ -327,13 +327,13 @@ public: small_string & push_back(char c) { return append(&c, 1); } small_string & append(char c) { return append(&c, 1); } small_string & append(const char * s) { return append(s, strlen(s)); } - small_string & append(stringref s) { return append(s.data(), s.size()); } + small_string & append(stringref s) { return append(s.data(), s.size()); } small_string & append(const std::string & s) { return append(s.data(), s.size()); } small_string & append(const small_string & s) { return append(s.data(), s.size()); } small_string & append(const void * s, size_type sz); small_string & operator += (char c) { return append(c); } small_string & operator += (const char * s) { return append(s); } - small_string & operator += (stringref s) { return append(s); } + small_string & operator += (stringref s) { return append(s); } small_string & operator += (const std::string & s) { return append(s); } small_string & operator += (const small_string & s) { return append(s); } @@ -581,7 +581,7 @@ operator + (const small_string<StackSize> & a, stringref b); template<uint32_t StackSize> small_string<StackSize> -operator + (stringref a, const small_string<StackSize> & b); +operator + (stringref a, const small_string<StackSize> & b); template<uint32_t StackSize> small_string<StackSize> @@ -612,9 +612,9 @@ operator < (const T& a, const small_string<StackSize>& b) return b > a; } -string operator + (stringref a, stringref b); +string operator + (stringref a, stringref b); string operator + (const char * a, stringref b); -string operator + (stringref a, const char * b); +string operator + (stringref a, const char * b); inline bool contains(stringref text, stringref key) { return text.find(key) != stringref::npos; diff --git a/vespalib/src/vespa/vespalib/stllike/string.hpp b/vespalib/src/vespa/vespalib/stllike/string.hpp index 7f4a0baa64a..bf98d82463b 100644 --- a/vespalib/src/vespa/vespalib/stllike/string.hpp +++ b/vespalib/src/vespa/vespalib/stllike/string.hpp @@ -175,7 +175,7 @@ operator + (const small_string<StackSize> & a, stringref b) template<uint32_t StackSize> small_string<StackSize> -operator + (stringref a, const small_string<StackSize> & b) +operator + (stringref a, const small_string<StackSize> & b) { small_string<StackSize> t(a); t += b; diff --git a/vespalib/src/vespa/vespalib/text/lowercase.cpp b/vespalib/src/vespa/vespalib/text/lowercase.cpp index f62433c8cda..7296819084b 100644 --- a/vespalib/src/vespa/vespalib/text/lowercase.cpp +++ b/vespalib/src/vespa/vespalib/text/lowercase.cpp @@ -6,7 +6,7 @@ namespace vespalib { vespalib::string -LowerCase::convert(vespalib::stringref input) +LowerCase::convert(vespalib::stringref input) { vespalib::string output; Utf8Reader r(input); diff --git a/vespalib/src/vespa/vespalib/text/lowercase.h b/vespalib/src/vespa/vespalib/text/lowercase.h index e628114c663..d007ac37b3e 100644 --- a/vespalib/src/vespa/vespalib/text/lowercase.h +++ b/vespalib/src/vespa/vespalib/text/lowercase.h @@ -102,7 +102,7 @@ public: * any bytes that aren't valid UTF-8 with the Unicode REPLACEMENT * CHARACTER (U+FFFD). **/ - static vespalib::string convert(vespalib::stringref input); + static vespalib::string convert(vespalib::stringref input); }; diff --git a/vespalib/src/vespa/vespalib/text/stringtokenizer.cpp b/vespalib/src/vespa/vespalib/text/stringtokenizer.cpp index 0191fdf7929..619decdce02 100644 --- a/vespalib/src/vespa/vespalib/text/stringtokenizer.cpp +++ b/vespalib/src/vespa/vespalib/text/stringtokenizer.cpp @@ -7,7 +7,7 @@ namespace { class AsciiSet { public: - AsciiSet(vespalib::stringref s) { + AsciiSet(vespalib::stringref s) { memset(_set, 0, sizeof(_set)); for (size_t i(0), m(s.size()); i < m; i++) { add(s[i]); @@ -31,7 +31,7 @@ typedef vespalib::StringTokenizer::TokenList TokenList; * strip leading and trailing sequences * of characters contained in the strip set. **/ -Token stripString(vespalib::stringref source, +Token stripString(vespalib::stringref source, const AsciiSet & strip) { Token::size_type start = 0; @@ -66,7 +66,7 @@ void parse(TokenList& output, namespace vespalib { -StringTokenizer::StringTokenizer(vespalib::stringref source, +StringTokenizer::StringTokenizer(vespalib::stringref source, vespalib::stringref separators, vespalib::stringref strip) : _tokens() diff --git a/vespalib/src/vespa/vespalib/text/stringtokenizer.h b/vespalib/src/vespa/vespalib/text/stringtokenizer.h index 5375a251b1b..f1111eee7de 100644 --- a/vespalib/src/vespa/vespalib/text/stringtokenizer.h +++ b/vespalib/src/vespa/vespalib/text/stringtokenizer.h @@ -41,7 +41,7 @@ public: * @param separators The characters to be used as token separators * @param strip Characters to be stripped from both ends of each token **/ - StringTokenizer(vespalib::stringref source, + StringTokenizer(vespalib::stringref source, vespalib::stringref separators = ",", vespalib::stringref strip = " \t\f\r\n"); diff --git a/vespalib/src/vespa/vespalib/util/regexp.cpp b/vespalib/src/vespa/vespalib/util/regexp.cpp index 85079383c8c..684ed1b8fd8 100644 --- a/vespalib/src/vespa/vespalib/util/regexp.cpp +++ b/vespalib/src/vespa/vespalib/util/regexp.cpp @@ -24,7 +24,7 @@ Regexp::Flags::enableICASE() } bool -Regexp::compile(vespalib::stringref re, Flags flags) +Regexp::compile(vespalib::stringref re, Flags flags) { re_set_syntax(flags.flags()); regex_t *preg = (regex_t *)_data; @@ -45,7 +45,7 @@ Regexp::compile(vespalib::stringref re, Flags flags) } -Regexp::Regexp(vespalib::stringref re, Flags flags) +Regexp::Regexp(vespalib::stringref re, Flags flags) : _valid(false), _data(new regex_t) { @@ -53,7 +53,7 @@ Regexp::Regexp(vespalib::stringref re, Flags flags) } bool -Regexp::match(vespalib::stringref s) const +Regexp::match(vespalib::stringref s) const { if ( ! valid() ) { return false; } regex_t *preg = const_cast<regex_t *>(static_cast<const regex_t *>(_data)); @@ -64,7 +64,7 @@ Regexp::match(vespalib::stringref s) const return pos >= 0; } -vespalib::string Regexp::replace(vespalib::stringref s, vespalib::stringref replacement) const +vespalib::string Regexp::replace(vespalib::stringref s, vespalib::stringref replacement) const { if ( ! valid() ) { return s; } regex_t *preg = const_cast<regex_t *>(static_cast<const regex_t *>(_data)); @@ -92,7 +92,7 @@ Regexp::~Regexp() namespace { -bool has_option(vespalib::stringref re) { +bool has_option(vespalib::stringref re) { return (re.find('|') != re.npos); } @@ -119,7 +119,7 @@ vespalib::string escape(vespalib::stringref str) { } // namespace vespalib::<unnamed> vespalib::string -Regexp::get_prefix(vespalib::stringref re) +Regexp::get_prefix(vespalib::stringref re) { vespalib::string prefix; if ((re.size() > 0) && (re.data()[0] == '^') && !has_option(re)) { diff --git a/vespalib/src/vespa/vespalib/util/regexp.h b/vespalib/src/vespa/vespalib/util/regexp.h index c9500b39099..6a97b72cdda 100644 --- a/vespalib/src/vespa/vespalib/util/regexp.h +++ b/vespalib/src/vespa/vespalib/util/regexp.h @@ -38,7 +38,7 @@ public: * @throw IllegalArgumentException if the RE is invalid. * @param re Regular expression. **/ - Regexp(vespalib::stringref re, Flags=Flags()); + Regexp(vespalib::stringref re, Flags=Flags()); ~Regexp(); @@ -54,7 +54,7 @@ public: * @param s text to search for a match. * @return true if a match was found. **/ - bool match(vespalib::stringref s) const; + bool match(vespalib::stringref s) const; /** * Will replace all occurrences of this pattern is string 's' with 'replacement'. @@ -63,7 +63,7 @@ public: * @param replacement text to replace the pattern. * @return modified string. **/ - vespalib::string replace(vespalib::stringref s, vespalib::stringref replacement) const; + vespalib::string replace(vespalib::stringref s, vespalib::stringref replacement) const; /** * Look at the given regular expression and identify the prefix @@ -75,7 +75,7 @@ public: * @param re Regular expression. * @return prefix that must be present in matching strings **/ - static vespalib::string get_prefix(vespalib::stringref re); + static vespalib::string get_prefix(vespalib::stringref re); /** * Make a regexp matching strings with the given prefix. @@ -104,7 +104,7 @@ public: private: bool _valid; void *_data; - bool compile(vespalib::stringref re, Flags flags); + bool compile(vespalib::stringref re, Flags flags); }; } // namespace vespalib |