summaryrefslogtreecommitdiffstats
path: root/config/src/tests/frt/frt.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'config/src/tests/frt/frt.cpp')
-rw-r--r--config/src/tests/frt/frt.cpp10
1 files changed, 6 insertions, 4 deletions
diff --git a/config/src/tests/frt/frt.cpp b/config/src/tests/frt/frt.cpp
index 54adbf4d787..0a0c3262b84 100644
--- a/config/src/tests/frt/frt.cpp
+++ b/config/src/tests/frt/frt.cpp
@@ -16,6 +16,8 @@
#include <vespa/fnet/frt/error.h>
#include <vespa/fnet/frt/supervisor.h>
#include <vespa/config/frt/protocol.h>
+#include <vespa/config/common/configvalue.hpp>
+
#include <lz4.h>
#include <thread>
@@ -29,15 +31,15 @@ using namespace config::protocol::v3;
namespace {
struct UpdateFixture : public IConfigHolder {
- ConfigUpdate::UP update;
+ std::unique_ptr<ConfigUpdate> update;
bool notified;
UpdateFixture()
: update(),
notified(false)
{ }
- ConfigUpdate::UP provide() override { return ConfigUpdate::UP(); }
- void handle(ConfigUpdate::UP u) override { update = std::move(u); }
+ std::unique_ptr<ConfigUpdate> provide() override { return std::unique_ptr<ConfigUpdate>(); }
+ void handle(std::unique_ptr<ConfigUpdate> u) override { update = std::move(u); }
bool wait(milliseconds timeoutInMillis) override { (void) timeoutInMillis; return notified; }
bool poll() override { return notified; }
void interrupt() override { }
@@ -75,7 +77,7 @@ namespace {
const vespalib::string & configXxhash64="",
int changed=0,
long generation=0,
- const std::vector<vespalib::string> & payload = std::vector<vespalib::string>(),
+ const StringVector & payload = StringVector(),
const vespalib::string & ns = "")
{
FRT_RPCRequest * req = new FRT_RPCRequest();