diff options
| author | Henning Baldersheim <balder@yahoo-inc.com> | 2017-09-05 22:18:00 +0200 |
|---|---|---|
| committer | Henning Baldersheim <balder@yahoo-inc.com> | 2017-09-05 22:18:00 +0200 |
| commit | d223330caeb49a458748fc6dfed719bc17688809 (patch) | |
| tree | 66d2ea27205fab67716e58aca31bf278a9ad8ad2 | |
| parent | cb2e7054e43ec84ea7181f67631602546f7cae33 (diff) | |
Align members
| -rw-r--r-- | searchcore/src/apps/proton/proton.cpp | 2 | ||||
| -rw-r--r-- | storage/src/vespa/storage/storageserver/storagenode.h | 5 | ||||
| -rw-r--r-- | storageserver/src/vespa/storageserver/app/process.h | 1 |
3 files changed, 2 insertions, 6 deletions
diff --git a/searchcore/src/apps/proton/proton.cpp b/searchcore/src/apps/proton/proton.cpp index 6fab53204c3..5cdc8e04eb4 100644 --- a/searchcore/src/apps/proton/proton.cpp +++ b/searchcore/src/apps/proton/proton.cpp @@ -11,8 +11,6 @@ #include <vespa/vespalib/io/fileutil.h> #include <vespa/config/common/exceptions.h> #include <vespa/fastos/app.h> - -#include <string> #include <iostream> #include <vespa/log/log.h> diff --git a/storage/src/vespa/storage/storageserver/storagenode.h b/storage/src/vespa/storage/storageserver/storagenode.h index 4c4918e6977..753f3c85330 100644 --- a/storage/src/vespa/storage/storageserver/storagenode.h +++ b/storage/src/vespa/storage/storageserver/storagenode.h @@ -111,7 +111,7 @@ private: // First components that doesn't depend on others std::unique_ptr<StatusWebServer> _statusWebServer; - std::shared_ptr<StorageMetricSet> _metrics; + std::shared_ptr<StorageMetricSet> _metrics; std::unique_ptr<metrics::MetricManager> _metricManager; // Depends on bucket databases and stop() functionality @@ -122,8 +122,7 @@ private: std::unique_ptr<StatusMetricConsumer> _statusMetrics; // Depends on metric manager std::unique_ptr<StateReporter> _stateReporter; - - std::unique_ptr<StateManager> _stateManager; + std::unique_ptr<StateManager> _stateManager; // The storage chain can depend on anything. std::unique_ptr<StorageLink> _chain; diff --git a/storageserver/src/vespa/storageserver/app/process.h b/storageserver/src/vespa/storageserver/app/process.h index 030b51f929e..bbffca30593 100644 --- a/storageserver/src/vespa/storageserver/app/process.h +++ b/storageserver/src/vespa/storageserver/app/process.h @@ -19,7 +19,6 @@ #include <vespa/config/subscription/configuri.h> #include <vespa/config/subscription/configsubscriber.h> - namespace document { class DocumentTypeRepo; } namespace storage { |