aboutsummaryrefslogtreecommitdiffstats
path: root/storageserver
diff options
context:
space:
mode:
authorTor Egge <Tor.Egge@broadpark.no>2019-07-30 12:54:18 +0200
committerTor Egge <Tor.Egge@broadpark.no>2019-07-30 13:00:40 +0200
commitfba625e9a06308364f0c0e6728a9d2195b9354a0 (patch)
treef26a1979f4c5733331c11832a0256234a4a8b38b /storageserver
parentb53df1fcba1dae72a6e78c7892bc7b51408d4348 (diff)
Use proper scope for enum constants.
Diffstat (limited to 'storageserver')
-rw-r--r--storageserver/src/apps/storaged/storage.cpp4
-rw-r--r--storageserver/src/vespa/storageserver/app/distributorprocess.cpp2
2 files changed, 3 insertions, 3 deletions
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<vespa::config::content::core::StorServerConfig> config =
config::ConfigGetter<vespa::config::content::core::StorServerConfig>::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;
}