summaryrefslogtreecommitdiffstats
path: root/metrics
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 /metrics
parent777726e51445f567809c1379d53e7da2bb6fa6db (diff)
use new input/output model in slime
Diffstat (limited to 'metrics')
-rw-r--r--metrics/src/tests/metricmanagertest.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/metrics/src/tests/metricmanagertest.cpp b/metrics/src/tests/metricmanagertest.cpp
index 8a36ed16cbf..72a4a287f2c 100644
--- a/metrics/src/tests/metricmanagertest.cpp
+++ b/metrics/src/tests/metricmanagertest.cpp
@@ -770,9 +770,9 @@ void MetricManagerTest::testJsonOutput()
// Parse it back
using namespace vespalib::slime;
vespalib::Slime slime;
- size_t parsed = JsonFormat::decode(Memory(jsonData), slime);
+ size_t parsed = JsonFormat::decode(vespalib::Memory(jsonData), slime);
if (jsonData.size() != parsed) {
- SimpleBuffer buffer;
+ vespalib::SimpleBuffer buffer;
JsonFormat::encode(slime, buffer, false);
std::ostringstream ost;
ost << "Failed to parse JSON: '\n"
@@ -902,7 +902,7 @@ public:
: _jsonText(jsonText)
{
vespalib::slime::JsonFormat::decode(
- vespalib::slime::Memory(jsonText), _tree);
+ vespalib::Memory(jsonText), _tree);
}
// XXX ideally all these should be const, but is not clear how/if it's