From 8e563cbccda67e56578dbafd3df6f38c1d827ae4 Mon Sep 17 00:00:00 2001 From: Max Kellermann Date: Sat, 5 Mar 2016 18:55:39 +0100 Subject: Instance: use C++11 initializers --- src/Instance.hxx | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) (limited to 'src/Instance.hxx') diff --git a/src/Instance.hxx b/src/Instance.hxx index 35bc4f91c..57687ec1a 100644 --- a/src/Instance.hxx +++ b/src/Instance.hxx @@ -67,22 +67,15 @@ struct Instance final * This is really a #CompositeStorage. To avoid heavy include * dependencies, we declare it as just #Storage. */ - Storage *storage; + Storage *storage = nullptr; - UpdateService *update; + UpdateService *update = nullptr; #endif ClientList *client_list; Partition *partition; - Instance() { -#ifdef ENABLE_DATABASE - storage = nullptr; - update = nullptr; -#endif - } - #ifdef ENABLE_DATABASE /** * Returns the global #Database instance. May return nullptr -- cgit v1.2.3