use new input/output model in slime

5 files changed, 7 insertions, 7 deletions

diff --git a/storage/src/tests/common/hostreporter/hostinfotest.cpp b/storage/src/tests/common/hostreporter/hostinfotest.cpp
index a8157a4c250..96211f9b2cc 100644
--- a/storage/src/tests/common/hostreporter/hostinfotest.cpp
+++ b/storage/src/tests/common/hostreporter/hostinfotest.cpp
@@ -13,7 +13,7 @@ namespace {
 using Object = vespalib::JsonStream::Object;
 using End = vespalib::JsonStream::End;
 using JsonFormat = vespalib::slime::JsonFormat;
-using Memory = vespalib::slime::Memory;
+using Memory = vespalib::Memory;
 
 class DummyReporter: public HostReporter {
 public:
diff --git a/storage/src/tests/common/hostreporter/util.cpp b/storage/src/tests/common/hostreporter/util.cpp
index d4dc4fe01e5..d79455c1184 100644
--- a/storage/src/tests/common/hostreporter/util.cpp
+++ b/storage/src/tests/common/hostreporter/util.cpp
@@ -12,7 +12,7 @@ namespace {
 using Object = vespalib::JsonStream::Object;
 using End = vespalib::JsonStream::End;
 using JsonFormat = vespalib::slime::JsonFormat;
-using Memory = vespalib::slime::Memory;
+using Memory = vespalib::Memory;
 }
 
 void
diff --git a/storage/src/tests/distributor/distributor_host_info_reporter_test.cpp b/storage/src/tests/distributor/distributor_host_info_reporter_test.cpp
index 9804b1c17ba..c1b5487717e 100644
--- a/storage/src/tests/distributor/distributor_host_info_reporter_test.cpp
+++ b/storage/src/tests/distributor/distributor_host_info_reporter_test.cpp
@@ -191,11 +191,11 @@ DistributorHostInfoReporterTest::generateExampleJson()
     std::string path = TEST_PATH("../../../protocols/getnodestate/distributor.json");
     std::string goldenString = File::readAll(path);
 
-    vespalib::slime::Memory goldenMemory(goldenString);
+    vespalib::Memory goldenMemory(goldenString);
     vespalib::Slime goldenSlime;
     vespalib::slime::JsonFormat::decode(goldenMemory, goldenSlime);
 
-    vespalib::slime::Memory jsonMemory(jsonString);
+    vespalib::Memory jsonMemory(jsonString);
     vespalib::Slime jsonSlime;
     vespalib::slime::JsonFormat::decode(jsonMemory, jsonSlime);
 
diff --git a/storage/src/tests/storageserver/statemanagertest.cpp b/storage/src/tests/storageserver/statemanagertest.cpp
index dcbd20b2a75..83fad3a7484 100644
--- a/storage/src/tests/storageserver/statemanagertest.cpp
+++ b/storage/src/tests/storageserver/statemanagertest.cpp
@@ -234,7 +234,7 @@ StateManagerTest::testClusterStateVersion()
     _manager->setClusterState(state);
 
     std::string nodeInfoString(_manager->getNodeInfo());
-    vespalib::slime::Memory goldenMemory(nodeInfoString);
+    vespalib::Memory goldenMemory(nodeInfoString);
     vespalib::Slime nodeInfo;
     vespalib::slime::JsonFormat::decode(nodeInfoString, nodeInfo);
     
diff --git a/storage/src/tests/storageserver/statereportertest.cpp b/storage/src/tests/storageserver/statereportertest.cpp
index 08558b515c8..87686f06d6c 100644
--- a/storage/src/tests/storageserver/statereportertest.cpp
+++ b/storage/src/tests/storageserver/statereportertest.cpp
@@ -128,8 +128,8 @@ void StateReporterTest::tearDown() {
 vespalib::Slime slime; \
 { \
     using namespace vespalib::slime; \
-    size_t parsed = JsonFormat::decode(Memory(jsonData), slime); \
-    SimpleBuffer buffer; \
+    size_t parsed = JsonFormat::decode(vespalib::Memory(jsonData), slime); \
+    vespalib::SimpleBuffer buffer;                                      \
     JsonFormat::encode(slime, buffer, false); \
     if (jsonData.size() != parsed) { \
         std::ostringstream error; \