From d475015ada2958c049d4571968d5394fe7cc7757 Mon Sep 17 00:00:00 2001 From: Piotr Tworek Date: Tue, 12 Jan 2021 01:31:57 +0100 Subject: [PATCH] launchpad: Fix _spacer member initialization. The Scout::Spacer constructor requires two arguments. The initialization of the type in Launchpad_window declaration does not specify them. The variable is however initialized a second time in class constructor. This is most likely why GCC accepts this code. Clang on the other hand complains about it. Fix this by properly initializing both _spacer and _docview only once at declaration time. Issue #3985 --- repos/demo/src/app/launchpad/launchpad_window.cc | 2 -- repos/demo/src/app/launchpad/launchpad_window.h | 4 ++-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/repos/demo/src/app/launchpad/launchpad_window.cc b/repos/demo/src/app/launchpad/launchpad_window.cc index f9d4b810bd..f50f5b15ec 100644 --- a/repos/demo/src/app/launchpad/launchpad_window.cc +++ b/repos/demo/src/app/launchpad/launchpad_window.cc @@ -42,8 +42,6 @@ Launchpad_window::Launchpad_window(Genode::Env &env, : Launchpad(env, initial_quota), Window(gfx_backend, position, size, max_size, false), - _docview(0), - _spacer(1, _TH), _info_section("Status", &subsection_font), _launch_section("Launcher", &subsection_font), _kiddy_section("Children", &subsection_font), diff --git a/repos/demo/src/app/launchpad/launchpad_window.h b/repos/demo/src/app/launchpad/launchpad_window.h index 213aec97bc..a7b69bb3d8 100644 --- a/repos/demo/src/app/launchpad/launchpad_window.h +++ b/repos/demo/src/app/launchpad/launchpad_window.h @@ -64,8 +64,8 @@ class Launchpad_window : public Scout::Scrollbar_listener, Scout::Fade_icon _sizer { }; Scout::Scrollbar _scrollbar { }; Genode::List > _child_entry_list { }; - Scout::Docview _docview { }; - Scout::Spacer _spacer { }; + Scout::Docview _docview { 0 }; + Scout::Spacer _spacer { 1, _TH }; Scout::Document _document { }; Section _info_section { };