diff options
author | Henning Baldersheim <balder@yahoo-inc.com> | 2017-09-05 21:04:08 +0200 |
---|---|---|
committer | Henning Baldersheim <balder@yahoo-inc.com> | 2017-09-05 21:04:08 +0200 |
commit | cb2e7054e43ec84ea7181f67631602546f7cae33 (patch) | |
tree | de8015e7c6c9cb3aa914f7085b19db1999201045 /storageframework/src | |
parent | 8ae7332f3e4297121fb9f50972ded38ef94aa5ca (diff) |
WE must listen to everyone who wants to stop.
Diffstat (limited to 'storageframework/src')
3 files changed, 6 insertions, 17 deletions
diff --git a/storageframework/src/vespa/storageframework/defaultimplementation/component/componentregisterimpl.cpp b/storageframework/src/vespa/storageframework/defaultimplementation/component/componentregisterimpl.cpp index cda2fee4628..a03f79b008d 100644 --- a/storageframework/src/vespa/storageframework/defaultimplementation/component/componentregisterimpl.cpp +++ b/storageframework/src/vespa/storageframework/defaultimplementation/component/componentregisterimpl.cpp @@ -5,9 +5,7 @@ #include <vespa/metrics/metricmanager.h> #include <vespa/vespalib/util/exceptions.h> -namespace storage { -namespace framework { -namespace defaultimplementation { +namespace storage::framework::defaultimplementation { ComponentRegisterImpl::ComponentRegisterImpl() : _componentLock(), @@ -184,6 +182,4 @@ ComponentRegisterImpl::registerShutdownListener(ShutdownListener& listener) _shutdownListener = &listener; } -} // defaultimplementation -} // framework -} // storage +} diff --git a/storageframework/src/vespa/storageframework/generic/component/component.cpp b/storageframework/src/vespa/storageframework/generic/component/component.cpp index 6457ed73795..a35cad68b00 100644 --- a/storageframework/src/vespa/storageframework/generic/component/component.cpp +++ b/storageframework/src/vespa/storageframework/generic/component/component.cpp @@ -4,10 +4,8 @@ #include "componentregister.h" #include <vespa/storageframework/generic/metric/metricregistrator.h> #include <vespa/storageframework/generic/thread/threadpool.h> -#include <vespa/vespalib/util/sync.h> -namespace storage { -namespace framework { +namespace storage::framework { void Component::open() @@ -137,6 +135,4 @@ Component::requestShutdown(vespalib::stringref reason) _componentRegister->requestShutdown(reason); } -} // framework -} // storage - +} diff --git a/storageframework/src/vespa/storageframework/generic/component/componentregister.h b/storageframework/src/vespa/storageframework/generic/component/componentregister.h index 521e23ba1aa..3babd8b29bc 100644 --- a/storageframework/src/vespa/storageframework/generic/component/componentregister.h +++ b/storageframework/src/vespa/storageframework/generic/component/componentregister.h @@ -13,8 +13,7 @@ #include <vespa/vespalib/stllike/string.h> -namespace storage { -namespace framework { +namespace storage::framework { class ManagedComponent; @@ -25,6 +24,4 @@ struct ComponentRegister { virtual void requestShutdown(vespalib::stringref reason) = 0; }; -} // framework -} // storage - +} |