aboutsummaryrefslogtreecommitdiffstats
path: root/staging_vespalib
diff options
context:
space:
mode:
authorHaavard <havardpe@yahoo-inc.com>2017-02-03 18:15:54 +0000
committerHaavard <havardpe@yahoo-inc.com>2017-02-03 18:16:48 +0000
commit604b545f86b7c8dd7ade8d96e785f80701f16c58 (patch)
tree159b4858f855b549769cbdac962e0820eeb7fb64 /staging_vespalib
parent777726e51445f567809c1379d53e7da2bb6fa6db (diff)
use new input/output model in slime
Diffstat (limited to 'staging_vespalib')
-rw-r--r--staging_vespalib/src/vespa/vespalib/net/generic_state_handler.cpp2
-rw-r--r--staging_vespalib/src/vespa/vespalib/net/slime_explorer.cpp4
2 files changed, 3 insertions, 3 deletions
diff --git a/staging_vespalib/src/vespa/vespalib/net/generic_state_handler.cpp b/staging_vespalib/src/vespa/vespalib/net/generic_state_handler.cpp
index 4b02d586222..58f87ffa593 100644
--- a/staging_vespalib/src/vespa/vespalib/net/generic_state_handler.cpp
+++ b/staging_vespalib/src/vespa/vespalib/net/generic_state_handler.cpp
@@ -120,7 +120,7 @@ vespalib::string render(const StateExplorer &state, const Url &url) {
top.setObject();
}
inject_children(state, url, top.get());
- slime::SimpleBuffer buf;
+ SimpleBuffer buf;
slime::JsonFormat::encode(top, buf, true);
return buf.get().make_string();
}
diff --git a/staging_vespalib/src/vespa/vespalib/net/slime_explorer.cpp b/staging_vespalib/src/vespa/vespalib/net/slime_explorer.cpp
index a99ef240833..d6945064eb6 100644
--- a/staging_vespalib/src/vespa/vespalib/net/slime_explorer.cpp
+++ b/staging_vespalib/src/vespa/vespalib/net/slime_explorer.cpp
@@ -10,7 +10,7 @@ namespace {
struct SelfState : slime::ObjectTraverser {
Slime result;
SelfState() : result() { result.setObject(); }
- virtual void field(const slime::Memory &key, const slime::Inspector &value) {
+ virtual void field(const Memory &key, const slime::Inspector &value) {
if (value.type().getId() != slime::OBJECT::ID) {
slime::inject(value, slime::ObjectInserter(result.get(), key));
}
@@ -19,7 +19,7 @@ struct SelfState : slime::ObjectTraverser {
struct ChildrenNames : slime::ObjectTraverser {
std::vector<vespalib::string> result;
- virtual void field(const slime::Memory &key, const slime::Inspector &value) {
+ virtual void field(const Memory &key, const slime::Inspector &value) {
if (value.type().getId() == slime::OBJECT::ID) {
result.push_back(key.make_string());
}