1 files changed, 25 insertions, 25 deletions
diff --git a/searchcore/src/vespa/searchcore/proton/server/proton.h b/searchcore/src/vespa/searchcore/proton/server/proton.h
index 4396224fb01..0651e45bc49 100644
--- a/searchcore/src/vespa/searchcore/proton/server/proton.h
+++ b/searchcore/src/vespa/searchcore/proton/server/proton.h
@@ -78,31 +78,31 @@ private:
         void setClusterName(const vespalib::string &clusterName, const vespalib::string &baseDir);
     };
 
-    const config::ConfigUri              _configUri;
-    mutable std::shared_mutex            _mutex;
-    std::unique_ptr<metrics::UpdateHook> _metricsHook;
-    std::unique_ptr<MetricsEngine>       _metricsEngine;
-    ProtonFileHeaderContext              _fileHeaderContext;
-    std::unique_ptr<TLS>                 _tls;
-    std::unique_ptr<DiskMemUsageSampler> _diskMemUsageSampler;
-    std::unique_ptr<PersistenceEngine>   _persistenceEngine;
-    DocumentDBMap                   _documentDBMap;
-    std::unique_ptr<MatchEngine>    _matchEngine;
-    std::unique_ptr<SummaryEngine>  _summaryEngine;
-    std::unique_ptr<DocsumBySlime>  _docsumBySlime;
-    MemoryFlushConfigUpdater::UP    _memoryFlushConfigUpdater;
-    std::unique_ptr<FlushEngine>    _flushEngine;
+    const config::ConfigUri                _configUri;
+    mutable std::shared_mutex              _mutex;
+    std::unique_ptr<metrics::UpdateHook>   _metricsHook;
+    std::unique_ptr<MetricsEngine>         _metricsEngine;
+    ProtonFileHeaderContext                _fileHeaderContext;
+    std::unique_ptr<TLS>                   _tls;
+    std::unique_ptr<DiskMemUsageSampler>   _diskMemUsageSampler;
+    std::unique_ptr<PersistenceEngine>     _persistenceEngine;
+    DocumentDBMap                          _documentDBMap;
+    std::unique_ptr<MatchEngine>           _matchEngine;
+    std::unique_ptr<SummaryEngine>         _summaryEngine;
+    std::unique_ptr<DocsumBySlime>         _docsumBySlime;
+    MemoryFlushConfigUpdater::UP           _memoryFlushConfigUpdater;
+    std::unique_ptr<FlushEngine>           _flushEngine;
     std::unique_ptr<PrepareRestartHandler> _prepareRestartHandler;
-    RPCHooks::UP                    _rpcHooks;
-    HealthAdapter                   _healthAdapter;
-    vespalib::GenericStateHandler   _genericStateHandler;
-    vespalib::JsonHandlerRepo::Token::UP _customComponentBindToken;
-    vespalib::JsonHandlerRepo::Token::UP _customComponentRootToken;
-    std::unique_ptr<vespalib::StateServer>  _stateServer;
-    vespalib::ThreadStackExecutor   _executor;
-    std::unique_ptr<IProtonDiskLayout> _protonDiskLayout;
-    ProtonConfigurer                _protonConfigurer;
-    ProtonConfigFetcher             _protonConfigFetcher;
+    RPCHooks::UP                           _rpcHooks;
+    HealthAdapter                          _healthAdapter;
+    vespalib::GenericStateHandler          _genericStateHandler;
+    vespalib::JsonHandlerRepo::Token::UP   _customComponentBindToken;
+    vespalib::JsonHandlerRepo::Token::UP   _customComponentRootToken;
+    std::unique_ptr<vespalib::StateServer> _stateServer;
+    vespalib::ThreadStackExecutor          _executor;
+    std::unique_ptr<IProtonDiskLayout>     _protonDiskLayout;
+    ProtonConfigurer                       _protonConfigurer;
+    ProtonConfigFetcher                    _protonConfigFetcher;
     std::unique_ptr<vespalib::ThreadStackExecutorBase> _warmupExecutor;
     std::shared_ptr<vespalib::ThreadStackExecutorBase> _sharedExecutor;
     vespalib::eval::CompileCache::ExecutorBinding::UP _compile_cache_executor_binding;
@@ -128,7 +128,7 @@ private:
     void removeDocumentDB(const DocTypeName &docTypeName) override;
 
     void applyConfig(const BootstrapConfig::SP & configSnapshot) override;
-    MonitorReply::UP ping(MonitorRequest::UP request, MonitorClient &client) override;
+    std::unique_ptr<MonitorReply> ping(std::unique_ptr<MonitorRequest> request, MonitorClient &client) override;
 
     void waitForInitDone();
     void waitForOnlineState();