summaryrefslogtreecommitdiffstats
path: root/storageserver
diff options
context:
space:
mode:
authorGeir Storli <geirstorli@yahoo.no>2018-04-04 14:44:13 +0200
committerGitHub <noreply@github.com>2018-04-04 14:44:13 +0200
commita3d2dad8b01377a87754b714f54ff05c87bf1f8c (patch)
tree870e326f7d7f25b3caf4d029638c977f0c1712f3 /storageserver
parentf86708b7b67e38289384d03079f461f532b8763c (diff)
parent8cfeaeba255ccea54f8345724e72adf53280e33d (diff)
Merge pull request #5455 from vespa-engine/toregge/use-shared-ptr-to-const-document-type-repo
Use shared pointer to const DocumentTypeRepo.
Diffstat (limited to 'storageserver')
-rw-r--r--storageserver/src/tests/storageservertest.cpp4
-rw-r--r--storageserver/src/vespa/storageserver/app/process.h2
2 files changed, 3 insertions, 3 deletions
diff --git a/storageserver/src/tests/storageservertest.cpp b/storageserver/src/tests/storageservertest.cpp
index 03b4dfd80da..cf8c8f06330 100644
--- a/storageserver/src/tests/storageservertest.cpp
+++ b/storageserver/src/tests/storageservertest.cpp
@@ -298,7 +298,7 @@ namespace {
public mbus::IReplyHandler
{
const vdstestlib::DirConfig& _config;
- const document::DocumentTypeRepo::SP _repo;
+ const std::shared_ptr<const document::DocumentTypeRepo> _repo;
documentapi::LoadTypeSet _loadTypes;
std::unique_ptr<mbus::RPCMessageBus> _mbus;
mbus::SourceSession::UP _sourceSession;
@@ -309,7 +309,7 @@ namespace {
bool _startedShutdown;
LoadGiver(const vdstestlib::DirConfig& config,
- const document::DocumentTypeRepo::SP repo)
+ const std::shared_ptr<const document::DocumentTypeRepo> repo)
: _config(config), _repo(repo), _mbus(), _sourceSession(),
_maxPending(20), _currentPending(0), _processedOk(0),
_unexpectedErrors(0), _startedShutdown(false) {}
diff --git a/storageserver/src/vespa/storageserver/app/process.h b/storageserver/src/vespa/storageserver/app/process.h
index bbffca30593..f566671d1af 100644
--- a/storageserver/src/vespa/storageserver/app/process.h
+++ b/storageserver/src/vespa/storageserver/app/process.h
@@ -28,7 +28,7 @@ class StorageNodeContext;
class Process : public ApplicationGenerationFetcher {
protected:
- using DocumentTypeRepoSP = std::shared_ptr<document::DocumentTypeRepo>;
+ using DocumentTypeRepoSP = std::shared_ptr<const document::DocumentTypeRepo>;
config::ConfigUri _configUri;
DocumentTypeRepoSP getTypeRepo() { return _repos.back(); }
config::ConfigSubscriber _configSubscriber;