summaryrefslogtreecommitdiffstats
path: root/vespalib
diff options
context:
space:
mode:
authorHaavard <havardpe@yahoo-inc.com>2017-02-03 14:30:41 +0000
committerHaavard <havardpe@yahoo-inc.com>2017-02-03 18:16:46 +0000
commit289f313a92af8bc25e0e62a354ab55e64e3bda41 (patch)
tree4259a7a03b273f4f5053dd4c29d2a217518c62cd /vespalib
parent324c400925b1d8e4dfb700dd7253e467407e8db7 (diff)
added std::string implicit converting constructor
Diffstat (limited to 'vespalib')
-rw-r--r--vespalib/src/vespa/vespalib/data/memory.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/vespalib/src/vespa/vespalib/data/memory.h b/vespalib/src/vespa/vespalib/data/memory.h
index af4cf6d856b..a8a4760754a 100644
--- a/vespalib/src/vespa/vespalib/data/memory.h
+++ b/vespalib/src/vespa/vespalib/data/memory.h
@@ -18,6 +18,8 @@ struct Memory
Memory() : data(nullptr), size(0) {}
Memory(const char *d, size_t s) : data(d), size(s) {}
Memory(const char *str) : data(str), size(strlen(str)) {}
+ Memory(const std::string &str)
+ : data(str.data()), size(str.size()) {}
Memory(const vespalib::string &str)
: data(str.data()), size(str.size()) {}
Memory(const vespalib::stringref &str_ref)