From fba625e9a06308364f0c0e6728a9d2195b9354a0 Mon Sep 17 00:00:00 2001 From: Tor Egge Date: Tue, 30 Jul 2019 12:54:18 +0200 Subject: Use proper scope for enum constants. --- storageserver/src/apps/storaged/storage.cpp | 4 ++-- storageserver/src/vespa/storageserver/app/distributorprocess.cpp | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'storageserver/src') diff --git a/storageserver/src/apps/storaged/storage.cpp b/storageserver/src/apps/storaged/storage.cpp index 0261d8e587e..b1eafcbad93 100644 --- a/storageserver/src/apps/storaged/storage.cpp +++ b/storageserver/src/apps/storaged/storage.cpp @@ -37,8 +37,8 @@ Process::UP createProcess(vespalib::stringref configId) { if (serverConfig->isDistributor) { return Process::UP(new DistributorProcess(configId)); } else switch (serverConfig->persistenceProvider.type) { - case vespa::config::content::core::StorServerConfig::PersistenceProvider::STORAGE: - case vespa::config::content::core::StorServerConfig::PersistenceProvider::DUMMY: + case vespa::config::content::core::StorServerConfig::PersistenceProvider::Type::STORAGE: + case vespa::config::content::core::StorServerConfig::PersistenceProvider::Type::DUMMY: return Process::UP(new DummyServiceLayerProcess(configId)); default: throw vespalib::IllegalStateException("Unknown persistence provider.", VESPA_STRLOC); diff --git a/storageserver/src/vespa/storageserver/app/distributorprocess.cpp b/storageserver/src/vespa/storageserver/app/distributorprocess.cpp index 6ef391fa56a..57fdcdeb248 100644 --- a/storageserver/src/vespa/storageserver/app/distributorprocess.cpp +++ b/storageserver/src/vespa/storageserver/app/distributorprocess.cpp @@ -32,7 +32,7 @@ DistributorProcess::setupConfig(uint64_t subscribeTimeout) std::unique_ptr config = config::ConfigGetter::getConfig(_configUri.getConfigId(), _configUri.getContext(), subscribeTimeout); if (config->persistenceProvider.type - != vespa::config::content::core::StorServerConfig::PersistenceProvider::STORAGE) + != vespa::config::content::core::StorServerConfig::PersistenceProvider::Type::STORAGE) { _activeFlag = DistributorNode::NEED_ACTIVE_BUCKET_STATES_SET; } -- cgit v1.2.3