aboutsummaryrefslogtreecommitdiffstats
path: root/storageserver
diff options
context:
space:
mode:
authorHenning Baldersheim <balder@yahoo-inc.com>2020-08-20 14:47:39 +0200
committerGitHub <noreply@github.com>2020-08-20 14:47:39 +0200
commit2d68435a3261b3a70c472ab5138d39a5074cf9d5 (patch)
treea02190d11c90148a44c41964d412abbabed1d3d9 /storageserver
parentb214393ad98132794d6c7a09f00599541c6ed372 (diff)
Revert "Revert "Balder/use an actual fieldset repo""
Diffstat (limited to 'storageserver')
-rw-r--r--storageserver/src/vespa/storageserver/app/dummyservicelayerprocess.cpp4
-rw-r--r--storageserver/src/vespa/storageserver/app/dummyservicelayerprocess.h2
2 files changed, 3 insertions, 3 deletions
diff --git a/storageserver/src/vespa/storageserver/app/dummyservicelayerprocess.cpp b/storageserver/src/vespa/storageserver/app/dummyservicelayerprocess.cpp
index b642fa9dc8e..338ae45714e 100644
--- a/storageserver/src/vespa/storageserver/app/dummyservicelayerprocess.cpp
+++ b/storageserver/src/vespa/storageserver/app/dummyservicelayerprocess.cpp
@@ -15,13 +15,13 @@ void
DummyServiceLayerProcess::shutdown()
{
ServiceLayerProcess::shutdown();
- _provider.reset(0);
+ _provider.reset();
}
void
DummyServiceLayerProcess::setupProvider()
{
- _provider.reset(new spi::dummy::DummyPersistence(getTypeRepo()));
+ _provider = std::make_unique<spi::dummy::DummyPersistence>(getTypeRepo());
}
} // storage
diff --git a/storageserver/src/vespa/storageserver/app/dummyservicelayerprocess.h b/storageserver/src/vespa/storageserver/app/dummyservicelayerprocess.h
index 6eb774a131d..dc4e3286d0e 100644
--- a/storageserver/src/vespa/storageserver/app/dummyservicelayerprocess.h
+++ b/storageserver/src/vespa/storageserver/app/dummyservicelayerprocess.h
@@ -12,7 +12,7 @@
namespace storage {
class DummyServiceLayerProcess : public ServiceLayerProcess {
- spi::dummy::DummyPersistence::UP _provider;
+ std::unique_ptr<spi::PersistenceProvider> _provider;
public:
DummyServiceLayerProcess(const config::ConfigUri & configUri);