From b3727a9b46dbaaadc3845e2d431ea649a253060d Mon Sep 17 00:00:00 2001 From: Norman Feske Date: Thu, 14 Feb 2019 22:39:08 +0100 Subject: [PATCH] Add missing override annotations Issue #3159 --- repos/base-fiasco/src/core/include/platform.h | 8 ++--- repos/base-foc/src/core/include/platform.h | 6 ++-- .../src/core/irq_session_component.cc | 2 +- .../src/include/base/internal/cap_alloc.h | 14 ++++---- .../src/include/signal_source/client.h | 2 +- repos/base-hw/src/core/kernel/cpu.h | 2 +- repos/base-hw/src/core/kernel/irq.h | 2 +- repos/base-hw/src/core/kernel/thread.h | 30 ++++++++-------- repos/base-hw/src/core/kernel/vm.h | 6 ++-- repos/base-hw/src/core/native_pd_component.h | 2 +- repos/base-hw/src/core/pager.h | 2 +- repos/base-hw/src/core/platform.h | 2 +- .../arm_v7/trustzone/vm_session_component.h | 6 ++-- .../spec/arm_v7/virtualization/kernel/vm.cc | 2 +- .../virtualization/vm_session_component.h | 6 ++-- .../spec/x86_64/muen/vm_session_component.h | 8 ++--- .../base-hw/src/lib/hw/page_table_allocator.h | 4 +-- repos/base-hw/src/test/cpu_quota/main.cc | 2 +- .../src/core/include/dataspace_component.h | 4 +-- .../core/include/io_mem_session_component.h | 2 +- repos/base-linux/src/core/include/platform.h | 8 ++--- .../src/core/include/region_map_component.h | 10 +++--- .../include/base/internal/local_pd_session.h | 6 ++-- .../include/base/internal/local_rm_session.h | 4 +-- .../src/include/linux_dataspace/client.h | 10 +++--- .../src/include/linux_native_cpu/client.h | 6 ++-- .../base-linux/src/lib/lx_hybrid/lx_hybrid.cc | 24 ++++++------- .../src/test/lx_hybrid_errno/main.cc | 2 +- .../include/nova_native_cpu/client.h | 2 +- repos/base-nova/src/core/include/pager.h | 2 +- .../core/include/signal_source_component.h | 2 +- repos/base-nova/src/test/platform/main.cc | 8 ++--- repos/base-nova/src/timer/nova/time_source.h | 2 +- repos/base-okl4/src/core/include/platform.h | 4 +-- .../src/core/include/platform.h | 8 ++--- repos/base-sel4/src/core/include/pager.h | 2 +- repos/base-sel4/src/core/include/platform.h | 22 ++++++------ repos/base/include/base/allocator.h | 2 +- repos/base/include/base/allocator_avl.h | 2 +- repos/base/include/base/child.h | 2 +- repos/base/include/base/heap.h | 10 +++--- repos/base/include/base/rpc_server.h | 4 +-- repos/base/include/pd_session/client.h | 4 +-- repos/base/include/timer_session/connection.h | 4 +-- repos/base/include/util/avl_tree.h | 4 +-- repos/base/include/vm_session/client.h | 6 ++-- repos/base/src/core/include/core_mem_alloc.h | 8 ++--- repos/base/src/core/include/core_region_map.h | 2 +- repos/base/src/core/include/cpu_root.h | 2 +- .../src/core/include/cpu_thread_component.h | 2 +- repos/base/src/core/include/io_mem_root.h | 2 +- .../core/include/io_mem_session_component.h | 2 +- repos/base/src/core/include/io_port_root.h | 2 +- .../core/include/io_port_session_component.h | 12 +++---- repos/base/src/core/include/irq_root.h | 2 +- repos/base/src/core/include/log_root.h | 2 +- .../src/core/include/log_session_component.h | 2 +- repos/base/src/core/include/pager.h | 2 +- repos/base/src/core/include/pd_root.h | 2 +- .../src/core/include/pd_session_component.h | 6 ++-- .../src/core/include/region_map_component.h | 2 +- repos/base/src/core/include/rm_root.h | 2 +- repos/base/src/core/include/trace/root.h | 2 +- .../core/include/trace/session_component.h | 20 +++++------ repos/base/src/core/include/vm_root.h | 2 +- repos/base/src/core/main.cc | 2 +- repos/base/src/lib/base/signal.cc | 2 +- .../base/src/lib/startup/init_main_thread.cc | 2 +- repos/base/src/test/rm_fault/main.cc | 2 +- repos/base/src/test/smp/main.cc | 4 +-- repos/base/src/test/thread/main.cc | 14 ++++---- repos/base/src/timer/include/root_component.h | 2 +- .../src/timer/include/session_component.h | 2 +- .../src/timer/include/threaded_time_source.h | 2 +- repos/base/src/timer/periodic/time_source.h | 2 +- repos/demo/include/scout/canvas.h | 30 ++++++++-------- repos/demo/include/scout/fader.h | 2 +- .../scout/nitpicker_graphics_backend.h | 10 +++--- repos/demo/include/scout/parent_element.h | 12 +++---- repos/demo/include/scout/user_state.h | 2 +- repos/demo/include/scout/window.h | 10 +++--- .../include/scout_gfx/sky_texture_painter.h | 6 ++-- repos/demo/src/app/launchpad/child_entry.h | 2 +- repos/demo/src/app/launchpad/launch_entry.h | 4 +-- .../demo/src/app/launchpad/launchpad_window.h | 10 +++--- repos/demo/src/app/launchpad/loadbar.h | 6 ++-- repos/demo/src/app/launchpad/main.cc | 2 +- repos/demo/src/app/launchpad/section.h | 4 +-- repos/demo/src/app/launchpad/status_entry.h | 2 +- repos/demo/src/app/scout/browser_window.cc | 4 +-- repos/demo/src/app/scout/browser_window.h | 14 ++++---- repos/demo/src/app/scout/elements.h | 36 +++++++++---------- repos/demo/src/app/scout/fade_icon.h | 6 ++-- repos/demo/src/app/scout/refracted_icon.h | 2 +- repos/demo/src/app/scout/scrollbar.cc | 2 +- repos/demo/src/app/scout/scrollbar.h | 4 +-- repos/demo/src/app/scout/sky_texture.h | 2 +- repos/demo/src/app/scout/titlebar.h | 4 +-- repos/demo/src/app/scout/widgets.h | 23 ++++++------ .../liquid_framebuffer/framebuffer_window.h | 6 ++-- .../src/server/liquid_framebuffer/main.cc | 2 +- .../src/server/liquid_framebuffer/services.cc | 4 +-- repos/demo/src/server/nitlog/main.cc | 8 ++--- repos/gems/src/app/decorator/canvas.h | 2 +- repos/gems/src/app/depot_autopilot/main.cc | 2 +- .../src/app/depot_download_manager/main.cc | 2 +- .../src/app/menu_view/box_layout_widget.h | 2 +- repos/gems/src/app/menu_view/button_widget.h | 4 +-- .../gems/src/app/menu_view/depgraph_widget.h | 2 +- repos/gems/src/app/menu_view/float_widget.h | 2 +- repos/gems/src/app/menu_view/frame_widget.h | 2 +- repos/gems/src/app/menu_view/label_widget.h | 4 +-- repos/gems/src/app/menu_view/root_widget.h | 2 +- .../app/sculpt_manager/view/storage_dialog.h | 2 +- repos/gems/src/server/file_terminal/main.cc | 2 +- .../gems/src/server/wm/decorator_nitpicker.h | 2 +- repos/gems/src/server/wm/direct_nitpicker.h | 2 +- repos/gems/src/server/wm/layouter_nitpicker.h | 2 +- repos/gems/src/server/wm/nitpicker.h | 2 +- repos/hello_tutorial/doc/hello_tutorial.txt | 10 +++--- .../include/hello_session/client.h | 4 +-- repos/hello_tutorial/src/hello/server/main.cc | 6 ++-- repos/libports/src/lib/vfs/lwip/vfs.cc | 4 +-- .../libports/src/test/timed_semaphore/main.cc | 2 +- repos/os/include/audio_out_session/client.h | 10 +++--- .../os/include/audio_out_session/rpc_object.h | 10 +++--- repos/os/include/block/component.h | 8 ++--- repos/os/include/block_session/client.h | 4 +-- repos/os/include/cli_monitor/child.h | 4 +-- repos/os/include/file_system_session/client.h | 2 +- repos/os/include/gpio/component.h | 12 +++---- repos/os/include/nic/component.h | 6 ++-- repos/os/include/nic/root.h | 2 +- repos/os/include/nic_session/client.h | 8 ++--- .../os/include/nitpicker_session/connection.h | 2 +- .../os/include/os/child_policy_dynamic_rom.h | 4 +-- repos/os/include/packet_stream_rx/client.h | 6 ++-- .../os/include/packet_stream_rx/rpc_object.h | 4 +-- repos/os/include/packet_stream_tx/client.h | 6 ++-- .../os/include/packet_stream_tx/rpc_object.h | 8 ++--- repos/os/include/regulator/component.h | 10 +++--- repos/os/include/rtc_session/client.h | 2 +- .../spec/rpi/platform_session/client.h | 2 +- .../char_cell_array_character_screen.h | 10 +++--- repos/os/include/terminal_session/client.h | 14 ++++---- repos/os/include/uart_session/client.h | 16 ++++----- repos/os/include/usb_session/client.h | 6 ++-- repos/os/include/vfs/single_file_system.h | 2 +- .../os/src/app/block_tester/test_ping_pong.h | 2 +- repos/os/src/app/block_tester/test_random.h | 2 +- repos/os/src/app/block_tester/test_replay.h | 2 +- .../os/src/app/block_tester/test_sequential.h | 2 +- repos/os/src/app/cli_monitor/help_command.h | 2 +- repos/os/src/app/cli_monitor/kill_command.h | 2 +- repos/os/src/app/cli_monitor/ram_command.h | 2 +- repos/os/src/app/cli_monitor/start_command.h | 2 +- repos/os/src/app/cli_monitor/status_command.h | 2 +- repos/os/src/app/cli_monitor/yield_command.h | 2 +- repos/os/src/drivers/ahci/ahci.cc | 2 +- repos/os/src/drivers/ahci/ata_driver.h | 2 +- repos/os/src/drivers/ahci/atapi_driver.h | 2 +- repos/os/src/drivers/ahci/main.cc | 8 ++--- .../src/drivers/ahci/spec/exynos5/platform.cc | 2 +- .../os/src/drivers/ahci/spec/x86/platform.cc | 2 +- repos/os/src/drivers/audio/spec/linux/main.cc | 2 +- .../drivers/framebuffer/spec/imx53/main.cc | 2 +- .../os/src/drivers/gpio/spec/exynos4/driver.h | 28 +++++++-------- repos/os/src/drivers/gpio/spec/imx/driver.h | 28 +++++++-------- repos/os/src/drivers/gpio/spec/omap4/driver.h | 28 +++++++-------- repos/os/src/drivers/gpio/spec/rpi/driver.h | 28 +++++++-------- repos/os/src/drivers/gpio/spec/rpi/gpio.h | 2 +- repos/os/src/drivers/gpu/intel/main.cc | 13 +++---- .../src/drivers/gpu/intel/ppgtt_allocator.h | 8 ++--- repos/os/src/drivers/input/dummy/main.cc | 2 +- .../src/drivers/input/spec/ps2/pbxa9/pl050.h | 8 ++--- .../src/drivers/input/spec/ps2/ps2_keyboard.h | 24 ++++++------- .../os/src/drivers/input/spec/ps2/ps2_mouse.h | 4 +-- .../os/src/drivers/input/spec/ps2/x86/i8042.h | 6 ++-- .../os/src/drivers/nic/spec/gem/cadence_gem.h | 8 ++--- repos/os/src/drivers/nic/spec/linux/main.cc | 2 +- repos/os/src/drivers/nic/spec/pbxa9/main.cc | 2 +- repos/os/src/drivers/nvme/main.cc | 7 ++-- .../src/drivers/platform/spec/arndale/cmu.h | 8 ++--- .../src/drivers/platform/spec/arndale/pmu.h | 8 ++--- .../src/drivers/platform/spec/imx53/main.cc | 10 +++--- .../src/drivers/platform/spec/odroid_x2/cmu.h | 8 ++--- .../src/drivers/platform/spec/odroid_x2/pmu.h | 8 ++--- .../os/src/drivers/platform/spec/rpi/main.cc | 10 +++--- repos/os/src/drivers/platform/spec/rpi/mbox.h | 2 +- .../platform/spec/x86/pci_session_component.h | 2 +- repos/os/src/drivers/rtc/spec/x86/main.cc | 2 +- repos/os/src/drivers/sd_card/main.cc | 4 +-- .../src/drivers/sd_card/spec/exynos5/driver.h | 2 +- .../os/src/drivers/sd_card/spec/imx/driver.h | 2 +- .../src/drivers/sd_card/spec/omap4/driver.h | 2 +- .../src/drivers/sd_card/spec/pbxa9/driver.h | 6 ++-- .../os/src/drivers/sd_card/spec/rpi/driver.h | 2 +- repos/os/src/drivers/uart/uart_component.h | 4 +-- repos/os/src/drivers/usb_block/main.cc | 4 +-- repos/os/src/init/main.cc | 2 +- repos/os/src/lib/vfs/block_file_system.h | 2 +- repos/os/src/lib/vfs/fs_file_system.h | 2 +- repos/os/src/lib/vfs/inline_file_system.h | 2 +- repos/os/src/lib/vfs/null_file_system.h | 2 +- repos/os/src/lib/vfs/ram_file_system.h | 6 ++-- repos/os/src/lib/vfs/rom_file_system.h | 2 +- repos/os/src/lib/vfs/rtc_file_system.h | 2 +- repos/os/src/lib/vfs/tar_file_system.h | 2 +- repos/os/src/lib/vfs/zero_file_system.h | 2 +- repos/os/src/server/dynamic_rom/main.cc | 2 +- repos/os/src/server/fs_log/main.cc | 2 +- repos/os/src/server/fs_log/session.h | 2 +- repos/os/src/server/iso9660/main.cc | 6 ++-- repos/os/src/server/loader/main.cc | 2 +- repos/os/src/server/loader/rom.h | 4 +-- repos/os/src/server/log_terminal/main.cc | 4 +-- repos/os/src/server/lx_block/main.cc | 6 ++-- repos/os/src/server/lx_fs/main.cc | 22 ++++++------ repos/os/src/server/mixer/mixer.cc | 8 ++--- repos/os/src/server/nic_bridge/component.h | 8 ++--- repos/os/src/server/nic_dump/component.h | 12 +++---- repos/os/src/server/nic_dump/uplink.h | 4 +-- repos/os/src/server/nic_loopback/main.cc | 2 +- repos/os/src/server/nic_router/permit_rule.h | 4 +-- repos/os/src/server/nitpicker/canvas.h | 14 ++++---- repos/os/src/server/nitpicker/main.cc | 6 ++-- repos/os/src/server/part_block/component.h | 6 ++-- repos/os/src/server/part_block/gpt.h | 4 +-- repos/os/src/server/part_block/mbr.h | 4 +-- repos/os/src/server/ram_block/main.cc | 14 ++++---- repos/os/src/server/ram_fs/directory.h | 2 +- repos/os/src/server/ram_fs/main.cc | 22 ++++++------ repos/os/src/server/rom_block/main.cc | 12 +++---- repos/os/src/server/rom_filter/main.cc | 4 +-- repos/os/src/server/rom_prefetcher/main.cc | 6 ++-- repos/os/src/server/tar_rom/main.cc | 6 ++-- .../server/terminal_crosslink/terminal_root.h | 6 ++-- repos/os/src/server/terminal_log/main.cc | 4 +-- repos/os/src/server/vfs/node.h | 4 +-- repos/os/src/test/audio_out/main.cc | 2 +- repos/os/src/test/block/client/main.cc | 26 +++++++------- repos/os/src/test/block/server/main.cc | 12 +++---- repos/os/src/test/init/main.cc | 4 +-- repos/os/src/test/input_filter/main.cc | 2 +- repos/os/src/test/sd_card_bench/main.cc | 2 +- repos/os/src/test/signal/main.cc | 10 +++--- repos/os/src/test/terminal_crosslink/main.cc | 4 +-- repos/os/src/test/trace/main.cc | 4 +-- repos/os/src/test/weak_ptr/main.cc | 2 +- repos/ports/include/vmm/vcpu_dispatcher.h | 2 +- repos/ports/include/vmm/vcpu_thread.h | 10 +++--- repos/ports/src/app/seoul/target.inc | 1 + repos/ports/src/noux/child.h | 18 +++++----- repos/ports/src/noux/destruct_queue.h | 2 +- .../src/noux/empty_rom_session_component.h | 4 +-- repos/ports/src/noux/family_member.h | 4 +-- repos/ports/src/noux/main.cc | 2 +- repos/ports/src/noux/pd_session_component.h | 4 +-- repos/ports/src/noux/rom_session_component.h | 4 +-- 259 files changed, 747 insertions(+), 743 deletions(-) diff --git a/repos/base-fiasco/src/core/include/platform.h b/repos/base-fiasco/src/core/include/platform.h index ffb163cf4..17e2b3f6a 100644 --- a/repos/base-fiasco/src/core/include/platform.h +++ b/repos/base-fiasco/src/core/include/platform.h @@ -108,7 +108,7 @@ namespace Genode { */ Sigma0(); - int pager(Ipc_pager &) { /* never called */ return -1; } + int pager(Ipc_pager &) override { /* never called */ return -1; } }; /** @@ -126,7 +126,7 @@ namespace Genode { */ Core_pager(Platform_pd &core_pd); - int pager(Ipc_pager &) { /* never called */ return -1; } + int pager(Ipc_pager &) override { /* never called */ return -1; } }; /** @@ -165,9 +165,9 @@ namespace Genode { size_t vm_size() const override { return _vm_size; } Rom_fs &rom_fs() override { return _rom_fs; } - size_t max_caps() const { return Capability_space::max_caps(); } + size_t max_caps() const override { return Capability_space::max_caps(); } - void wait_for_exit(); + void wait_for_exit() override; }; } diff --git a/repos/base-foc/src/core/include/platform.h b/repos/base-foc/src/core/include/platform.h index 709c89d22..5faf355d1 100644 --- a/repos/base-foc/src/core/include/platform.h +++ b/repos/base-foc/src/core/include/platform.h @@ -51,7 +51,7 @@ namespace Genode { */ Sigma0(Cap_index*); - int pager(Ipc_pager &) { /* never called */ return -1; } + int pager(Ipc_pager &) override { /* never called */ return -1; } }; /* @@ -126,7 +126,7 @@ namespace Genode { */ Core_pager(Platform_pd &core_pd, Sigma0 &); - int pager(Ipc_pager &) { /* never called */ return -1; } + int pager(Ipc_pager &) override { /* never called */ return -1; } }; /** @@ -176,7 +176,7 @@ namespace Genode { Cap_id_allocator &cap_id_alloc() { return _cap_id_alloc; } - void wait_for_exit(); + void wait_for_exit() override; }; } diff --git a/repos/base-foc/src/core/irq_session_component.cc b/repos/base-foc/src/core/irq_session_component.cc index 7766c822d..33eab759d 100644 --- a/repos/base-foc/src/core/irq_session_component.cc +++ b/repos/base-foc/src/core/irq_session_component.cc @@ -52,7 +52,7 @@ class Genode::Interrupt_handler : public Thread_deprecated<2048*sizeof(long)> public: - void entry(); + void entry() override; static Fiasco::l4_cap_idx_t handler_cap() { diff --git a/repos/base-foc/src/include/base/internal/cap_alloc.h b/repos/base-foc/src/include/base/internal/cap_alloc.h index 52b36e154..e7e575163 100644 --- a/repos/base-foc/src/include/base/internal/cap_alloc.h +++ b/repos/base-foc/src/include/base/internal/cap_alloc.h @@ -70,7 +70,7 @@ namespace Genode { ** Cap_index_allocator interface ** ***********************************/ - Cap_index* alloc_range(size_t cnt) + Cap_index* alloc_range(size_t cnt) override { Lock_guard guard(_lock); @@ -93,7 +93,7 @@ namespace Genode { return 0; } - Cap_index* alloc(addr_t addr) + Cap_index* alloc(addr_t addr) override { Lock_guard guard(_lock); @@ -111,7 +111,7 @@ namespace Genode { return new (obj) T(); } - void free(Cap_index* idx, size_t cnt) + void free(Cap_index* idx, size_t cnt) override { Lock_guard guard(_lock); @@ -126,17 +126,17 @@ namespace Genode { } } - addr_t idx_to_kcap(Cap_index const *idx) const { + addr_t idx_to_kcap(Cap_index const *idx) const override { return ((T const *)idx - &_indices[0]) << Fiasco::L4_CAP_SHIFT; } - Cap_index* kcap_to_idx(addr_t kcap) { + Cap_index* kcap_to_idx(addr_t kcap) override { return &_indices[kcap >> Fiasco::L4_CAP_SHIFT]; } - bool static_idx(Cap_index *idx) { + bool static_idx(Cap_index *idx) override { return ((T*)idx) < &_indices[START_IDX]; } - void reinit() + void reinit() override { construct_at >(this); } diff --git a/repos/base-foc/src/include/signal_source/client.h b/repos/base-foc/src/include/signal_source/client.h index 64e470945..74f0fae80 100644 --- a/repos/base-foc/src/include/signal_source/client.h +++ b/repos/base-foc/src/include/signal_source/client.h @@ -60,7 +60,7 @@ class Genode::Signal_source_client : public Rpc_client * Build with frame pointer to make GDB backtraces work. See issue #1061. */ __attribute__((optimize("-fno-omit-frame-pointer"))) - Signal wait_for_signal(); + Signal wait_for_signal() override; }; #endif /* _INCLUDE__SIGNAL_SOURCE__CLIENT_H_ */ diff --git a/repos/base-hw/src/core/kernel/cpu.h b/repos/base-hw/src/core/kernel/cpu.h index ca9f8267a..f32dfeb3a 100644 --- a/repos/base-hw/src/core/kernel/cpu.h +++ b/repos/base-hw/src/core/kernel/cpu.h @@ -96,7 +96,7 @@ class Kernel::Cpu : public Genode::Cpu, private Irq::Pool, private Timeout ** Irq interface ** *********************/ - void occurred(); + void occurred() override; }; friend void Ipi::occurred(void); diff --git a/repos/base-hw/src/core/kernel/irq.h b/repos/base-hw/src/core/kernel/irq.h index d77e65a78..519db1024 100644 --- a/repos/base-hw/src/core/kernel/irq.h +++ b/repos/base-hw/src/core/kernel/irq.h @@ -146,7 +146,7 @@ class Kernel::User_irq : public Kernel::Irq, public Kernel::Object /** * Handle occurence of the interrupt */ - void occurred() + void occurred() override { _context.submit(1); disable(); diff --git a/repos/base-hw/src/core/kernel/thread.h b/repos/base-hw/src/core/kernel/thread.h index 0583a2500..fe351147e 100644 --- a/repos/base-hw/src/core/kernel/thread.h +++ b/repos/base-hw/src/core/kernel/thread.h @@ -79,7 +79,7 @@ class Kernel::Thread ** Inter_processor_work interface ** ************************************/ - void execute(); + void execute() override; }; /** @@ -97,7 +97,7 @@ class Kernel::Thread ** Inter_processor_work interface ** ************************************/ - void execute(); + void execute() override; }; friend void Pd_update::execute(); @@ -257,27 +257,27 @@ class Kernel::Thread ** Signal_context_killer ** ***************************/ - void _signal_context_kill_pending(); - void _signal_context_kill_failed(); - void _signal_context_kill_done(); + void _signal_context_kill_pending() override; + void _signal_context_kill_failed() override; + void _signal_context_kill_done() override; /******************** ** Signal_handler ** ********************/ - void _await_signal(Signal_receiver * const receiver); - void _receive_signal(void * const base, size_t const size); + void _await_signal(Signal_receiver * const receiver) override; + void _receive_signal(void * const base, size_t const size) override; /************** ** Ipc_node ** **************/ - void _send_request_succeeded(); - void _send_request_failed(); - void _await_request_succeeded(); - void _await_request_failed(); + void _send_request_succeeded() override; + void _send_request_failed() override; + void _await_request_succeeded() override; + void _await_request_failed() override; public: @@ -366,16 +366,16 @@ class Kernel::Thread ** Cpu_job ** *************/ - void exception(Cpu & cpu); - void proceed(Cpu & cpu); - Cpu_job * helping_sink(); + void exception(Cpu & cpu) override; + void proceed(Cpu & cpu) override; + Cpu_job * helping_sink() override; /************* ** Timeout ** *************/ - void timeout_triggered(); + void timeout_triggered() override; /*************** diff --git a/repos/base-hw/src/core/kernel/vm.h b/repos/base-hw/src/core/kernel/vm.h index d13caa4fe..57a820408 100644 --- a/repos/base-hw/src/core/kernel/vm.h +++ b/repos/base-hw/src/core/kernel/vm.h @@ -124,9 +124,9 @@ class Kernel::Vm : public Cpu_job, ** Cpu_job ** *************/ - void exception(Cpu & cpu); - void proceed(Cpu & cpu); - Cpu_job * helping_sink() { return this; } + void exception(Cpu & cpu) override; + void proceed(Cpu & cpu) override; + Cpu_job * helping_sink() override { return this; } }; #endif /* _CORE__KERNEL__VM_H_ */ diff --git a/repos/base-hw/src/core/native_pd_component.h b/repos/base-hw/src/core/native_pd_component.h index c0a136e82..d03d033f4 100644 --- a/repos/base-hw/src/core/native_pd_component.h +++ b/repos/base-hw/src/core/native_pd_component.h @@ -40,7 +40,7 @@ class Genode::Native_pd_component : public Rpc_object ~Native_pd_component(); - void upgrade_cap_slab(); + void upgrade_cap_slab() override; }; #endif /* _CORE__INCLUDE__NATIVE_PD_COMPONENT_H_ */ diff --git a/repos/base-hw/src/core/pager.h b/repos/base-hw/src/core/pager.h index 2375e139a..6b10efdf3 100644 --- a/repos/base-hw/src/core/pager.h +++ b/repos/base-hw/src/core/pager.h @@ -220,7 +220,7 @@ class Genode::Pager_entrypoint : public Object_pool, ** Thread interface ** **********************/ - void entry(); + void entry() override; }; #endif /* _CORE__PAGER_H_ */ diff --git a/repos/base-hw/src/core/platform.h b/repos/base-hw/src/core/platform.h index 59119b64c..07b82d13a 100644 --- a/repos/base-hw/src/core/platform.h +++ b/repos/base-hw/src/core/platform.h @@ -131,7 +131,7 @@ class Genode::Platform : public Genode::Platform_generic size_t vm_size() const override { return Hw::Mm::user().size; } Rom_fs &rom_fs() override { return _rom_fs; } - inline void wait_for_exit() { + void wait_for_exit() override { while (1) { Kernel::stop_thread(); } }; bool supports_direct_unmap() const override { return true; } diff --git a/repos/base-hw/src/core/spec/arm_v7/trustzone/vm_session_component.h b/repos/base-hw/src/core/spec/arm_v7/trustzone/vm_session_component.h index 3459262b8..b772897f3 100644 --- a/repos/base-hw/src/core/spec/arm_v7/trustzone/vm_session_component.h +++ b/repos/base-hw/src/core/spec/arm_v7/trustzone/vm_session_component.h @@ -79,13 +79,13 @@ class Genode::Vm_session_component void _run(Vcpu_id); void _pause(Vcpu_id); - void attach(Dataspace_capability, addr_t /* vm_addr */) { + void attach(Dataspace_capability, addr_t /* vm_addr */) override { warning("Not implemented for TrustZone case"); } - void attach_pic(addr_t /* vm_addr */) { + void attach_pic(addr_t /* vm_addr */) override { warning("Not implemented for TrustZone case"); } - void detach(addr_t /* vm_addr */, size_t /* size */) { + void detach(addr_t /* vm_addr */, size_t /* size */) override { warning("Not implemented for TrustZone case"); } void _create_vcpu(Thread_capability) {} }; diff --git a/repos/base-hw/src/core/spec/arm_v7/virtualization/kernel/vm.cc b/repos/base-hw/src/core/spec/arm_v7/virtualization/kernel/vm.cc index 7c26ea262..214541312 100644 --- a/repos/base-hw/src/core/spec/arm_v7/virtualization/kernel/vm.cc +++ b/repos/base-hw/src/core/spec/arm_v7/virtualization/kernel/vm.cc @@ -64,7 +64,7 @@ struct Kernel::Vm_irq : Kernel::Irq /** * A VM interrupt gets injected into the VM scheduled on the current CPU */ - void occurred() + void occurred() override { Cpu_job & job = cpu_pool().executing_cpu().scheduled_job(); Vm *vm = dynamic_cast(&job); diff --git a/repos/base-hw/src/core/spec/arm_v7/virtualization/vm_session_component.h b/repos/base-hw/src/core/spec/arm_v7/virtualization/vm_session_component.h index f52844094..28c11c590 100644 --- a/repos/base-hw/src/core/spec/arm_v7/virtualization/vm_session_component.h +++ b/repos/base-hw/src/core/spec/arm_v7/virtualization/vm_session_component.h @@ -88,9 +88,9 @@ class Genode::Vm_session_component void _exception_handler(Signal_context_capability, Vcpu_id); void _run(Vcpu_id); void _pause(Vcpu_id); - void attach(Dataspace_capability ds_cap, addr_t vm_addr); - void attach_pic(addr_t vm_addr); - void detach(addr_t vm_addr, size_t size); + void attach(Dataspace_capability, addr_t) override; + void attach_pic(addr_t) override; + void detach(addr_t, size_t) override; void _create_vcpu(Thread_capability) {} }; diff --git a/repos/base-hw/src/core/spec/x86_64/muen/vm_session_component.h b/repos/base-hw/src/core/spec/x86_64/muen/vm_session_component.h index 937ec57aa..287e5bc50 100644 --- a/repos/base-hw/src/core/spec/x86_64/muen/vm_session_component.h +++ b/repos/base-hw/src/core/spec/x86_64/muen/vm_session_component.h @@ -81,10 +81,10 @@ class Genode::Vm_session_component Kernel::pause_vm(kernel_object()); } - void attach(Dataspace_capability, addr_t) {} - void attach_pic(addr_t) {} - void detach(addr_t, size_t) {} - void _create_vcpu(Thread_capability) {} + void attach(Dataspace_capability, addr_t) override { } + void attach_pic(addr_t) override { } + void detach(addr_t, size_t) override { } + void _create_vcpu(Thread_capability) { } }; #endif /* _CORE__SPEC__X86_64__MUEN__VM_SESSION_COMPONENT_H_ */ diff --git a/repos/base-hw/src/lib/hw/page_table_allocator.h b/repos/base-hw/src/lib/hw/page_table_allocator.h index 72cc9cab6..db80a2912 100644 --- a/repos/base-hw/src/lib/hw/page_table_allocator.h +++ b/repos/base-hw/src/lib/hw/page_table_allocator.h @@ -110,7 +110,7 @@ class Hw::Page_table_allocator::Array::Allocator Bit_allocator _free_tables { }; - unsigned _alloc() + unsigned _alloc() override { try { return _free_tables.alloc(); @@ -118,7 +118,7 @@ class Hw::Page_table_allocator::Array::Allocator throw Out_of_tables(); } - void _free(unsigned idx) { _free_tables.free(idx); } + void _free(unsigned idx) override { _free_tables.free(idx); } public: diff --git a/repos/base-hw/src/test/cpu_quota/main.cc b/repos/base-hw/src/test/cpu_quota/main.cc index f550ccdcc..05365e69b 100644 --- a/repos/base-hw/src/test/cpu_quota/main.cc +++ b/repos/base-hw/src/test/cpu_quota/main.cc @@ -69,7 +69,7 @@ class Counter : public Thread Single_signal _start_destruction { }; Synchronizer _synchronizer; - void entry() + void entry() override { unsigned long long volatile value = 0; while (_stage == PAUSE) { diff --git a/repos/base-linux/src/core/include/dataspace_component.h b/repos/base-linux/src/core/include/dataspace_component.h index 524c440f2..7503e2252 100644 --- a/repos/base-linux/src/core/include/dataspace_component.h +++ b/repos/base-linux/src/core/include/dataspace_component.h @@ -127,9 +127,9 @@ namespace Genode { ** Linux-specific dataspace interface ** ****************************************/ - Filename fname() { return _fname; } + Filename fname() override { return _fname; } - Untyped_capability fd() + Untyped_capability fd() override { Untyped_capability fd_cap = Capability_space::import(Rpc_destination(_fd), Rpc_obj_key()); diff --git a/repos/base-linux/src/core/include/io_mem_session_component.h b/repos/base-linux/src/core/include/io_mem_session_component.h index 648d5a164..67846f325 100644 --- a/repos/base-linux/src/core/include/io_mem_session_component.h +++ b/repos/base-linux/src/core/include/io_mem_session_component.h @@ -55,7 +55,7 @@ namespace Genode { ** Io-mem session interface ** *****************************/ - Io_mem_dataspace_capability dataspace() { + Io_mem_dataspace_capability dataspace() override { return Io_mem_dataspace_capability(); } }; } diff --git a/repos/base-linux/src/core/include/platform.h b/repos/base-linux/src/core/include/platform.h index d187f2980..e952ade6e 100644 --- a/repos/base-linux/src/core/include/platform.h +++ b/repos/base-linux/src/core/include/platform.h @@ -65,20 +65,20 @@ namespace Genode { */ struct Pseudo_ram_allocator : Range_allocator { - bool alloc(size_t, void **out_addr) + bool alloc(size_t, void **out_addr) override { *out_addr = 0; return true; } Alloc_return alloc_aligned(size_t, void **out_addr, int, - addr_t, addr_t) + addr_t, addr_t) override { *out_addr = 0; return Alloc_return::OK; } - Alloc_return alloc_addr(size_t, addr_t) + Alloc_return alloc_addr(size_t, addr_t) override { return Alloc_return::OK; } @@ -129,7 +129,7 @@ namespace Genode { */ size_t max_caps() const override { return 10000; } - void wait_for_exit(); + void wait_for_exit() override; }; } diff --git a/repos/base-linux/src/core/include/region_map_component.h b/repos/base-linux/src/core/include/region_map_component.h index 28d51d82c..efdedd90d 100644 --- a/repos/base-linux/src/core/include/region_map_component.h +++ b/repos/base-linux/src/core/include/region_map_component.h @@ -54,16 +54,16 @@ class Genode::Region_map_component : public Rpc_object, void remove_client(Rm_client &) { } Local_addr attach(Dataspace_capability, size_t, off_t, bool, - Local_addr, bool, bool) { + Local_addr, bool, bool) override { return (addr_t)0; } - void detach(Local_addr) { } + void detach(Local_addr) override { } - void fault_handler(Signal_context_capability) { } + void fault_handler(Signal_context_capability) override { } - State state() { return State(); } + State state() override { return State(); } - Dataspace_capability dataspace() { return Dataspace_capability(); } + Dataspace_capability dataspace() override { return Dataspace_capability(); } Rm_dataspace_component *dataspace_component() { return nullptr; } diff --git a/repos/base-linux/src/include/base/internal/local_pd_session.h b/repos/base-linux/src/include/base/internal/local_pd_session.h index 600cd55c1..e593f0f0b 100644 --- a/repos/base-linux/src/include/base/internal/local_pd_session.h +++ b/repos/base-linux/src/include/base/internal/local_pd_session.h @@ -36,17 +36,17 @@ struct Genode::Local_pd_session : Expanding_pd_session_client Local_pd_session(Parent &parent, Pd_session_capability pd) : Expanding_pd_session_client(parent, pd) { } - Capability address_space() + Capability address_space() override { return Local_capability::local_cap(&_address_space); } - Capability stack_area() + Capability stack_area() override { return Local_capability::local_cap(&_stack_area); } - Capability linker_area() + Capability linker_area() override { return Local_capability::local_cap(&_linker_area); } diff --git a/repos/base-linux/src/include/base/internal/local_rm_session.h b/repos/base-linux/src/include/base/internal/local_rm_session.h index 1085204f2..bbfec0208 100644 --- a/repos/base-linux/src/include/base/internal/local_rm_session.h +++ b/repos/base-linux/src/include/base/internal/local_rm_session.h @@ -36,13 +36,13 @@ struct Genode::Local_rm_session : Rm_session, Local_session Local_session(id_space, id, *this), md_alloc(md_alloc) { } - Capability create(size_t size) + Capability create(size_t size) override { Region_map *rm = new (md_alloc) Region_map_mmap(true, size); return Local_capability::local_cap(rm); } - void destroy(Capability cap) + void destroy(Capability cap) override { Region_map *rm = Local_capability::deref(cap); Genode::destroy(md_alloc, rm); diff --git a/repos/base-linux/src/include/linux_dataspace/client.h b/repos/base-linux/src/include/linux_dataspace/client.h index 004cf71ea..84c678e4f 100644 --- a/repos/base-linux/src/include/linux_dataspace/client.h +++ b/repos/base-linux/src/include/linux_dataspace/client.h @@ -31,17 +31,17 @@ namespace Genode { ** Generic dataspace interface ** *********************************/ - size_t size() { return call(); } - addr_t phys_addr() { return call(); } - bool writable() { return call(); } + size_t size() override { return call(); } + addr_t phys_addr() override { return call(); } + bool writable() override { return call(); } /**************************************** ** Linux-specific dataspace interface ** ****************************************/ - Filename fname() { return call(); } - Untyped_capability fd() { return call(); } + Filename fname() override { return call(); } + Untyped_capability fd() override { return call(); } }; } diff --git a/repos/base-linux/src/include/linux_native_cpu/client.h b/repos/base-linux/src/include/linux_native_cpu/client.h index bf57e9ea1..af9cbaa66 100644 --- a/repos/base-linux/src/include/linux_native_cpu/client.h +++ b/repos/base-linux/src/include/linux_native_cpu/client.h @@ -24,13 +24,13 @@ struct Genode::Linux_native_cpu_client : Rpc_client explicit Linux_native_cpu_client(Capability cap) : Rpc_client(static_cap_cast(cap)) { } - void thread_id(Thread_capability thread, int pid, int tid) { + void thread_id(Thread_capability thread, int pid, int tid) override { call(thread, pid, tid); } - Untyped_capability server_sd(Thread_capability thread) { + Untyped_capability server_sd(Thread_capability thread) override { return call(thread); } - Untyped_capability client_sd(Thread_capability thread) { + Untyped_capability client_sd(Thread_capability thread) override { return call(thread); } }; diff --git a/repos/base-linux/src/lib/lx_hybrid/lx_hybrid.cc b/repos/base-linux/src/lib/lx_hybrid/lx_hybrid.cc index 69d9a88a0..085f43766 100644 --- a/repos/base-linux/src/lib/lx_hybrid/lx_hybrid.cc +++ b/repos/base-linux/src/lib/lx_hybrid/lx_hybrid.cc @@ -276,32 +276,32 @@ namespace Genode { Thread_meta_data_created(Thread *thread) : Native_thread::Meta_data(thread) { } - void wait_for_construction() + void wait_for_construction() override { _construct_lock.lock(); } - void constructed() + void constructed() override { _construct_lock.unlock(); } - void wait_for_start() + void wait_for_start() override { _start_lock.lock(); } - void started() + void started() override { _start_lock.unlock(); } - void wait_for_join() + void wait_for_join() override { _join_lock.lock(); } - void joined() + void joined() override { _join_lock.unlock(); } @@ -317,32 +317,32 @@ namespace Genode { Thread_meta_data_adopted(Thread *thread) : Native_thread::Meta_data(thread) { } - void wait_for_construction() + void wait_for_construction() override { error("wait_for_construction() called for an adopted thread"); } - void constructed() + void constructed() override { error("constructed() called for an adopted thread"); } - void wait_for_start() + void wait_for_start() override { error("wait_for_start() called for an adopted thread"); } - void started() + void started() override { error("started() called for an adopted thread"); } - void wait_for_join() + void wait_for_join() override { error("wait_for_join() called for an adopted thread"); } - void joined() + void joined() override { error("joined() called for an adopted thread"); } diff --git a/repos/base-linux/src/test/lx_hybrid_errno/main.cc b/repos/base-linux/src/test/lx_hybrid_errno/main.cc index b4417326b..2976dd89b 100644 --- a/repos/base-linux/src/test/lx_hybrid_errno/main.cc +++ b/repos/base-linux/src/test/lx_hybrid_errno/main.cc @@ -24,7 +24,7 @@ struct Thread : Genode::Thread_deprecated Thread(Genode::Lock &barrier) : Genode::Thread_deprecated("stat"), _barrier(barrier) { start(); } - void entry() + void entry() override { /* * Stat syscall should return with errno ENOENT diff --git a/repos/base-nova/include/nova_native_cpu/client.h b/repos/base-nova/include/nova_native_cpu/client.h index 65ebe6c83..338571805 100644 --- a/repos/base-nova/include/nova_native_cpu/client.h +++ b/repos/base-nova/include/nova_native_cpu/client.h @@ -26,7 +26,7 @@ struct Genode::Nova_native_cpu_client : Rpc_client : Rpc_client(static_cap_cast(cap)) { } void thread_type(Thread_capability thread_cap, Thread_type thread_type, - Exception_base exception_base) { + Exception_base exception_base) override { call(thread_cap, thread_type, exception_base); } }; diff --git a/repos/base-nova/src/core/include/pager.h b/repos/base-nova/src/core/include/pager.h index f672203b8..cd8daa15f 100644 --- a/repos/base-nova/src/core/include/pager.h +++ b/repos/base-nova/src/core/include/pager.h @@ -400,7 +400,7 @@ namespace Genode { /** * Thread interface */ - void entry(); + void entry() override; /** * Return capability to this activation diff --git a/repos/base-nova/src/core/include/signal_source_component.h b/repos/base-nova/src/core/include/signal_source_component.h index ea360a197..5eccabb9e 100644 --- a/repos/base-nova/src/core/include/signal_source_component.h +++ b/repos/base-nova/src/core/include/signal_source_component.h @@ -52,7 +52,7 @@ class Genode::Signal_source_component : public Rpc_object(utcb()); @@ -580,7 +580,7 @@ class Greedy : public Genode::Thread { _env(env) { } - void entry() + void entry() override { log("starting"); diff --git a/repos/base-nova/src/timer/nova/time_source.h b/repos/base-nova/src/timer/nova/time_source.h index 5f1b90706..c05732cf3 100644 --- a/repos/base-nova/src/timer/nova/time_source.h +++ b/repos/base-nova/src/timer/nova/time_source.h @@ -64,7 +64,7 @@ class Timer::Time_source : public Threaded_time_source ** Threaded_time_source ** **************************/ - void _wait_for_irq(); + void _wait_for_irq() override; public: diff --git a/repos/base-okl4/src/core/include/platform.h b/repos/base-okl4/src/core/include/platform.h index 4d340d660..2c61bb262 100644 --- a/repos/base-okl4/src/core/include/platform.h +++ b/repos/base-okl4/src/core/include/platform.h @@ -139,9 +139,9 @@ namespace Genode { Rom_fs &rom_fs() override { return _rom_fs; } size_t max_caps() const override { return Capability_space::max_caps(); } - void wait_for_exit(); + void wait_for_exit() override; - bool supports_direct_unmap() const { return true; } + bool supports_direct_unmap() const override { return true; } /************************************** diff --git a/repos/base-pistachio/src/core/include/platform.h b/repos/base-pistachio/src/core/include/platform.h index 4efb93c2b..1edd4c9b1 100644 --- a/repos/base-pistachio/src/core/include/platform.h +++ b/repos/base-pistachio/src/core/include/platform.h @@ -101,7 +101,7 @@ namespace Genode { */ Sigma0(); - int pager(Ipc_pager &) { /* never called */ return -1; } + int pager(Ipc_pager &) override { /* never called */ return -1; } }; /** @@ -119,7 +119,7 @@ namespace Genode { */ Core_pager(Platform_pd &core_pd); - int pager(Ipc_pager &) { /* never called */ return -1; } + int pager(Ipc_pager &) override { /* never called */ return -1; } }; /** @@ -153,9 +153,9 @@ namespace Genode { Rom_fs &rom_fs() override { return _rom_fs; } size_t max_caps() const override { return Capability_space::max_caps(); } - void wait_for_exit(); + void wait_for_exit() override; - Affinity::Space affinity_space() const + Affinity::Space affinity_space() const override { /* * Ignore topology of CPU nodes, just return a one-dimensional diff --git a/repos/base-sel4/src/core/include/pager.h b/repos/base-sel4/src/core/include/pager.h index c1c48aa77..e8a5e832e 100644 --- a/repos/base-sel4/src/core/include/pager.h +++ b/repos/base-sel4/src/core/include/pager.h @@ -195,7 +195,7 @@ class Genode::Pager_entrypoint : public Object_pool, ** Thread interface ** **********************/ - void entry(); + void entry() override; }; #endif /* _CORE__INCLUDE__PAGER_H_ */ diff --git a/repos/base-sel4/src/core/include/platform.h b/repos/base-sel4/src/core/include/platform.h index 2134a8f46..acd250f26 100644 --- a/repos/base-sel4/src/core/include/platform.h +++ b/repos/base-sel4/src/core/include/platform.h @@ -77,7 +77,7 @@ class Genode::Static_allocator : public Allocator _used.free(index); } - bool need_size_for_free() const { return false; } + bool need_size_for_free() const override { return false; } }; class Genode::Platform : public Platform_generic @@ -239,15 +239,15 @@ class Genode::Platform : public Platform_generic ** Generic platform interface ** ********************************/ - Range_allocator &ram_alloc() { return _core_mem_alloc.phys_alloc(); } - Range_allocator &io_mem_alloc() { return _io_mem_alloc; } - Range_allocator &io_port_alloc() { return _io_port_alloc; } - Range_allocator &irq_alloc() { return _irq_alloc; } - Range_allocator ®ion_alloc() { return _core_mem_alloc.virt_alloc(); } - Range_allocator &core_mem_alloc() { return _core_mem_alloc; } - addr_t vm_start() const { return _vm_base; } - size_t vm_size() const { return _vm_size; } - Rom_fs &rom_fs() { return _rom_fs; } + Range_allocator &ram_alloc() override { return _core_mem_alloc.phys_alloc(); } + Range_allocator &io_mem_alloc() override { return _io_mem_alloc; } + Range_allocator &io_port_alloc() override { return _io_port_alloc; } + Range_allocator &irq_alloc() override { return _irq_alloc; } + Range_allocator ®ion_alloc() override { return _core_mem_alloc.virt_alloc(); } + Range_allocator &core_mem_alloc() override { return _core_mem_alloc; } + addr_t vm_start() const override { return _vm_base; } + size_t vm_size() const override { return _vm_size; } + Rom_fs &rom_fs() override { return _rom_fs; } Affinity::Space affinity_space() const override { return sel4_boot_info().numNodes; } @@ -274,7 +274,7 @@ class Genode::Platform : public Platform_generic Cap_sel asid_pool() const { return _asid_pool_sel; } - void wait_for_exit(); + void wait_for_exit() override; /** * Determine size of a core local mapping required for a diff --git a/repos/base/include/base/allocator.h b/repos/base/include/base/allocator.h index 1d1fde518..97ca0b42c 100644 --- a/repos/base/include/base/allocator.h +++ b/repos/base/include/base/allocator.h @@ -203,7 +203,7 @@ struct Genode::Range_allocator : Allocator * overload resolution would not find 'Allocator::free(void *)'. */ virtual void free(void *addr) = 0; - virtual void free(void *addr, size_t size) = 0; + virtual void free(void *addr, size_t size) override = 0; /** * Return the sum of available memory diff --git a/repos/base/include/base/allocator_avl.h b/repos/base/include/base/allocator_avl.h index bce9fead3..af50f6eb6 100644 --- a/repos/base/include/base/allocator_avl.h +++ b/repos/base/include/base/allocator_avl.h @@ -381,7 +381,7 @@ class Genode::Allocator_avl_tpl : public Allocator_avl_base return b && b->used() ? b : 0; } - int add_range(addr_t base, size_t size) + int add_range(addr_t base, size_t size) override { /* * We disable the slab block allocation while diff --git a/repos/base/include/base/child.h b/repos/base/include/base/child.h index a78ca2a9a..110de9abd 100644 --- a/repos/base/include/base/child.h +++ b/repos/base/include/base/child.h @@ -294,7 +294,7 @@ class Genode::Child : protected Rpc_object, void start(addr_t) override; - Capability cap() const { return _cap; } + Capability cap() const override { return _cap; } }; /* child policy */ diff --git a/repos/base/include/base/heap.h b/repos/base/include/base/heap.h index 7088505af..b7e2f87e5 100644 --- a/repos/base/include/base/heap.h +++ b/repos/base/include/base/heap.h @@ -220,11 +220,11 @@ class Genode::Sliced_heap : public Allocator ** Allocator interface ** *************************/ - bool alloc(size_t, void **); - void free(void *, size_t); - size_t consumed() const { return _consumed; } - size_t overhead(size_t size) const; - bool need_size_for_free() const override { return false; } + bool alloc(size_t, void **) override; + void free(void *, size_t) override; + size_t consumed() const override { return _consumed; } + size_t overhead(size_t size) const override; + bool need_size_for_free() const override { return false; } }; #endif /* _INCLUDE__BASE__HEAP_H_ */ diff --git a/repos/base/include/base/rpc_server.h b/repos/base/include/base/rpc_server.h index 2ebb8e8fc..c5766acd0 100644 --- a/repos/base/include/base/rpc_server.h +++ b/repos/base/include/base/rpc_server.h @@ -267,7 +267,7 @@ struct Genode::Rpc_object : Rpc_object_base, Rpc_dispatcher::dispatch(opcode, in, out); } @@ -397,7 +397,7 @@ class Genode::Rpc_entrypoint : Thread, public Object_pool * * \noapi */ - void entry(); + void entry() override; public: diff --git a/repos/base/include/pd_session/client.h b/repos/base/include/pd_session/client.h index 0b6e27363..9492c62e3 100644 --- a/repos/base/include/pd_session/client.h +++ b/repos/base/include/pd_session/client.h @@ -70,8 +70,8 @@ struct Genode::Pd_session_client : Rpc_client void transfer_quota(Capability pd, Cap_quota amount) override { call(pd, amount); } - Cap_quota cap_quota() const { return call(); } - Cap_quota used_caps() const { return call(); } + Cap_quota cap_quota() const override { return call(); } + Cap_quota used_caps() const override { return call(); } Ram_dataspace_capability alloc(size_t size, Cache_attribute cached = CACHED) override diff --git a/repos/base/include/timer_session/connection.h b/repos/base/include/timer_session/connection.h index cb879a710..6346efb5f 100644 --- a/repos/base/include/timer_session/connection.h +++ b/repos/base/include/timer_session/connection.h @@ -293,7 +293,7 @@ class Timer::Connection : public Genode::Connection, * \noapi * \deprecated Use One_shot_timeout (or Periodic_timeout) instead */ - void usleep(unsigned us) + void usleep(unsigned us) override { if (_mode == MODERN) { throw Cannot_use_both_legacy_and_modern_interface(); @@ -331,7 +331,7 @@ class Timer::Connection : public Genode::Connection, * \noapi * \deprecated Use One_shot_timeout (or Periodic_timeout) instead */ - void msleep(unsigned ms) + void msleep(unsigned ms) override { if (_mode == MODERN) { throw Cannot_use_both_legacy_and_modern_interface(); diff --git a/repos/base/include/util/avl_tree.h b/repos/base/include/util/avl_tree.h index d239afd4e..f128219ce 100644 --- a/repos/base/include/util/avl_tree.h +++ b/repos/base/include/util/avl_tree.h @@ -195,12 +195,12 @@ class Genode::Avl_tree : Avl_node */ class Policy : public Avl_node_base::Policy { - bool higher(Avl_node_base *n1, Avl_node_base *n2) const + bool higher(Avl_node_base *n1, Avl_node_base *n2) const override { return static_cast(n1)->higher(static_cast(n2)); } - void recompute(Avl_node_base *node) + void recompute(Avl_node_base *node) override { static_cast(node)->recompute(); } diff --git a/repos/base/include/vm_session/client.h b/repos/base/include/vm_session/client.h index afa491151..925e8a841 100644 --- a/repos/base/include/vm_session/client.h +++ b/repos/base/include/vm_session/client.h @@ -42,13 +42,13 @@ struct Genode::Vm_session_client : Rpc_client void run(Vcpu_id); void pause(Vcpu_id); - void attach(Dataspace_capability ds,addr_t vm_addr) { + void attach(Dataspace_capability ds,addr_t vm_addr) override { call(ds, vm_addr); } - void detach(addr_t vm_addr, size_t size) { + void detach(addr_t vm_addr, size_t size) override { call(vm_addr, size); } - void attach_pic(addr_t vm_addr) { + void attach_pic(addr_t vm_addr) override { call(vm_addr); } Vcpu_id create_vcpu(Allocator &, Env &, Vm_handler_base &); diff --git a/repos/base/src/core/include/core_mem_alloc.h b/repos/base/src/core/include/core_mem_alloc.h index aeaa30549..c873dda8d 100644 --- a/repos/base/src/core/include/core_mem_alloc.h +++ b/repos/base/src/core/include/core_mem_alloc.h @@ -152,10 +152,10 @@ class Genode::Mapped_mem_allocator : public Genode::Core_mem_translator ** Core_mem_translator interface ** ***********************************/ - void * phys_addr(void * addr) { + void * phys_addr(void * addr) override { return _virt_alloc->map_addr(addr); } - void * virt_addr(void * addr) { + void * virt_addr(void * addr) override { return _phys_alloc->map_addr(addr); } @@ -260,12 +260,12 @@ class Genode::Core_mem_allocator : public Genode::Core_mem_translator ** Core_mem_translator interface ** ***********************************/ - void * phys_addr(void * addr) + void * phys_addr(void * addr) override { return _virt_alloc()->map_addr(addr); } - void * virt_addr(void * addr) + void * virt_addr(void * addr) override { return _phys_alloc()->map_addr(addr); } diff --git a/repos/base/src/core/include/core_region_map.h b/repos/base/src/core/include/core_region_map.h index ffbb8bb71..d322a0f35 100644 --- a/repos/base/src/core/include/core_region_map.h +++ b/repos/base/src/core/include/core_region_map.h @@ -40,7 +40,7 @@ class Genode::Core_region_map : public Region_map bool executable = false, bool writeable = true) override; - void detach(Local_addr); + void detach(Local_addr) override; void fault_handler (Signal_context_capability) override { } State state () override { return State(); } diff --git a/repos/base/src/core/include/cpu_root.h b/repos/base/src/core/include/cpu_root.h index ea7ec32d9..c1b9f96e6 100644 --- a/repos/base/src/core/include/cpu_root.h +++ b/repos/base/src/core/include/cpu_root.h @@ -36,7 +36,7 @@ namespace Genode { protected: Cpu_session_component *_create_session(char const *args, - Affinity const &affinity) { + Affinity const &affinity) override { size_t ram_quota = Arg_string::find_arg(args, "ram_quota").ulong_value(0); diff --git a/repos/base/src/core/include/cpu_thread_component.h b/repos/base/src/core/include/cpu_thread_component.h index 11498073d..37cd62603 100644 --- a/repos/base/src/core/include/cpu_thread_component.h +++ b/repos/base/src/core/include/cpu_thread_component.h @@ -185,7 +185,7 @@ class Genode::Cpu_thread_component : public Rpc_object, ** Trace::Source::Info_accessor interface ** ********************************************/ - Trace::Source::Info trace_source_info() const + Trace::Source::Info trace_source_info() const override { return { _session_label, _name, _platform_thread.execution_time(), diff --git a/repos/base/src/core/include/io_mem_root.h b/repos/base/src/core/include/io_mem_root.h index b758b4342..ad17f12f6 100644 --- a/repos/base/src/core/include/io_mem_root.h +++ b/repos/base/src/core/include/io_mem_root.h @@ -31,7 +31,7 @@ namespace Genode { protected: - Io_mem_session_component *_create_session(const char *args) + Io_mem_session_component *_create_session(const char *args) override { return new (md_alloc()) Io_mem_session_component(_io_mem_alloc, _ram_alloc, diff --git a/repos/base/src/core/include/io_mem_session_component.h b/repos/base/src/core/include/io_mem_session_component.h index ef52dae0d..153d7e010 100644 --- a/repos/base/src/core/include/io_mem_session_component.h +++ b/repos/base/src/core/include/io_mem_session_component.h @@ -142,7 +142,7 @@ namespace Genode { ** Io-mem session interface ** ******************************/ - Io_mem_dataspace_capability dataspace() { return _ds_cap; } + Io_mem_dataspace_capability dataspace() override { return _ds_cap; } }; } diff --git a/repos/base/src/core/include/io_port_root.h b/repos/base/src/core/include/io_port_root.h index 30a17365a..c5474eb43 100644 --- a/repos/base/src/core/include/io_port_root.h +++ b/repos/base/src/core/include/io_port_root.h @@ -46,7 +46,7 @@ namespace Genode { protected: - Io_port_session_component *_create_session(const char *args) { + Io_port_session_component *_create_session(const char *args) override { return new (md_alloc()) Io_port_session_component(_io_port_alloc, args); } public: diff --git a/repos/base/src/core/include/io_port_session_component.h b/repos/base/src/core/include/io_port_session_component.h index ba75df0e7..f2679cb59 100644 --- a/repos/base/src/core/include/io_port_session_component.h +++ b/repos/base/src/core/include/io_port_session_component.h @@ -63,13 +63,13 @@ namespace Genode { ** Io-port session interface ** *******************************/ - unsigned char inb(unsigned short); - unsigned short inw(unsigned short); - unsigned inl(unsigned short); + unsigned char inb(unsigned short) override; + unsigned short inw(unsigned short) override; + unsigned inl(unsigned short) override; - void outb(unsigned short, unsigned char); - void outw(unsigned short, unsigned short); - void outl(unsigned short, unsigned); + void outb(unsigned short, unsigned char) override; + void outw(unsigned short, unsigned short) override; + void outl(unsigned short, unsigned) override; }; } diff --git a/repos/base/src/core/include/irq_root.h b/repos/base/src/core/include/irq_root.h index fbaa87be2..3ee982f96 100644 --- a/repos/base/src/core/include/irq_root.h +++ b/repos/base/src/core/include/irq_root.h @@ -39,7 +39,7 @@ class Genode::Irq_root : public Root_component protected: - Irq_session_component *_create_session(const char *args) { + Irq_session_component *_create_session(const char *args) override { return new (md_alloc()) Irq_session_component(_irq_alloc, args); } public: diff --git a/repos/base/src/core/include/log_root.h b/repos/base/src/core/include/log_root.h index 206e30904..db98ebfc5 100644 --- a/repos/base/src/core/include/log_root.h +++ b/repos/base/src/core/include/log_root.h @@ -28,7 +28,7 @@ namespace Genode { /** * Root component interface */ - Log_session_component *_create_session(const char *args) + Log_session_component *_create_session(const char *args) override { char label_buf[Log_session_component::LABEL_LEN]; diff --git a/repos/base/src/core/include/log_session_component.h b/repos/base/src/core/include/log_session_component.h index 812bdd786..7b6ddab81 100644 --- a/repos/base/src/core/include/log_session_component.h +++ b/repos/base/src/core/include/log_session_component.h @@ -44,7 +44,7 @@ namespace Genode { ** Log session ** *****************/ - size_t write(String const &string_buf) + size_t write(String const &string_buf) override { if (!(string_buf.valid_string())) { error("corrupted string"); diff --git a/repos/base/src/core/include/pager.h b/repos/base/src/core/include/pager.h index 4ee2afabe..09ba51d63 100644 --- a/repos/base/src/core/include/pager.h +++ b/repos/base/src/core/include/pager.h @@ -202,7 +202,7 @@ class Genode::Pager_entrypoint : public Object_pool, ** Thread interface ** **********************/ - void entry(); + void entry() override; }; #endif /* _CORE__INCLUDE__PAGER_H_ */ diff --git a/repos/base/src/core/include/pd_root.h b/repos/base/src/core/include/pd_root.h index 824cbcf89..3b78c551b 100644 --- a/repos/base/src/core/include/pd_root.h +++ b/repos/base/src/core/include/pd_root.h @@ -59,7 +59,7 @@ class Genode::Pd_root : public Genode::Root_component void transfer_quota(Capability, Cap_quota) override; void transfer_quota(Capability, Ram_quota) override; - Cap_quota cap_quota() const + Cap_quota cap_quota() const override { return _cap_account.constructed() ? _cap_account->limit() : Cap_quota { 0 }; } - Cap_quota used_caps() const + Cap_quota used_caps() const override { return _cap_account.constructed() ? _cap_account->used() : Cap_quota { 0 }; } @@ -319,7 +319,7 @@ class Genode::Pd_session_component : public Session_object ** Platform-specific interface extension ** *******************************************/ - Capability native_pd() { return _native_pd.cap(); } + Capability native_pd() override { return _native_pd.cap(); } }; #endif /* _CORE__INCLUDE__PD_SESSION_COMPONENT_H_ */ diff --git a/repos/base/src/core/include/region_map_component.h b/repos/base/src/core/include/region_map_component.h index c13168a63..922c31ea2 100644 --- a/repos/base/src/core/include/region_map_component.h +++ b/repos/base/src/core/include/region_map_component.h @@ -199,7 +199,7 @@ class Genode::Rm_client : public Pager_object, public Rm_faulter, Rm_faulter(static_cast(*this)), _region_map(rm) { } - int pager(Ipc_pager &pager); + int pager(Ipc_pager &pager) override; /** * Return region map that the RM client is member of diff --git a/repos/base/src/core/include/rm_root.h b/repos/base/src/core/include/rm_root.h index 2adaaa3f7..80e2162e0 100644 --- a/repos/base/src/core/include/rm_root.h +++ b/repos/base/src/core/include/rm_root.h @@ -32,7 +32,7 @@ class Genode::Rm_root : public Root_component protected: - Rm_session_component *_create_session(const char *args) + Rm_session_component *_create_session(const char *args) override { size_t ram_quota = Arg_string::find_arg(args, "ram_quota").ulong_value(0); diff --git a/repos/base/src/core/include/trace/root.h b/repos/base/src/core/include/trace/root.h index 349ddc087..1ae13dc61 100644 --- a/repos/base/src/core/include/trace/root.h +++ b/repos/base/src/core/include/trace/root.h @@ -34,7 +34,7 @@ class Genode::Trace::Root : public Genode::Root_component protected: - Session_component *_create_session(const char *args) + Session_component *_create_session(const char *args) override { size_t ram_quota = Arg_string::find_arg(args, "ram_quota").ulong_value(0); size_t arg_buffer_size = Arg_string::find_arg(args, "arg_buffer_size").ulong_value(0); diff --git a/repos/base/src/core/include/trace/session_component.h b/repos/base/src/core/include/trace/session_component.h index 156ed17a2..d0d5049e8 100644 --- a/repos/base/src/core/include/trace/session_component.h +++ b/repos/base/src/core/include/trace/session_component.h @@ -75,16 +75,16 @@ class Genode::Trace::Session_component Dataspace_capability dataspace(); size_t subjects(); - Policy_id alloc_policy(size_t); - Dataspace_capability policy(Policy_id); - void unload_policy(Policy_id); - void trace(Subject_id, Policy_id, size_t); - void rule(Session_label const &, Thread_name const &, Policy_id, size_t); - void pause(Subject_id); - void resume(Subject_id); - Subject_info subject_info(Subject_id); - Dataspace_capability buffer(Subject_id); - void free(Subject_id); + Policy_id alloc_policy(size_t) override; + Dataspace_capability policy(Policy_id) override; + void unload_policy(Policy_id) override; + void trace(Subject_id, Policy_id, size_t) override; + void rule(Session_label const &, Thread_name const &, Policy_id, size_t) override; + void pause(Subject_id) override; + void resume(Subject_id) override; + Subject_info subject_info(Subject_id) override; + Dataspace_capability buffer(Subject_id) override; + void free(Subject_id) override; }; #endif /* _CORE__INCLUDE__TRACE__SESSION_COMPONENT_H_ */ diff --git a/repos/base/src/core/include/vm_root.h b/repos/base/src/core/include/vm_root.h index 598db12eb..a4e2ad63d 100644 --- a/repos/base/src/core/include/vm_root.h +++ b/repos/base/src/core/include/vm_root.h @@ -32,7 +32,7 @@ class Genode::Vm_root : public Root_component protected: - Vm_session_component *_create_session(const char *args) + Vm_session_component *_create_session(const char *args) override { return new (md_alloc()) Vm_session_component(*ep(), diff --git a/repos/base/src/core/main.cc b/repos/base/src/core/main.cc index ae5870ffd..834ebb35d 100644 --- a/repos/base/src/core/main.cc +++ b/repos/base/src/core/main.cc @@ -143,7 +143,7 @@ class Core_child : public Child_policy ** Child-policy interface ** ****************************/ - Name name() const { return "init"; } + Name name() const override { return "init"; } Route resolve_session_request(Service::Name const &name, Session_label const &label) override diff --git a/repos/base/src/lib/base/signal.cc b/repos/base/src/lib/base/signal.cc index 525b6ed4a..24974ffbd 100644 --- a/repos/base/src/lib/base/signal.cc +++ b/repos/base/src/lib/base/signal.cc @@ -40,7 +40,7 @@ class Signal_handler_thread : Thread, Lock */ Constructible _signal_source { }; - void entry() + void entry() override { _signal_source.construct(env_deprecated()->pd_session()->alloc_signal_source()); unlock(); diff --git a/repos/base/src/lib/startup/init_main_thread.cc b/repos/base/src/lib/startup/init_main_thread.cc index f2aa8d2c4..c8e7a8bc9 100644 --- a/repos/base/src/lib/startup/init_main_thread.cc +++ b/repos/base/src/lib/startup/init_main_thread.cc @@ -68,7 +68,7 @@ class Main_thread : public Thread_deprecated ** Thread interface ** **********************/ - void entry() { } + void entry() override { } }; diff --git a/repos/base/src/test/rm_fault/main.cc b/repos/base/src/test/rm_fault/main.cc index 339b550c9..123a138fe 100644 --- a/repos/base/src/test/rm_fault/main.cc +++ b/repos/base/src/test/rm_fault/main.cc @@ -92,7 +92,7 @@ struct Exec_faulter : Thread : Thread(env, "exec_fault", 1024 * sizeof(addr_t)), _fault_test(test) { } - void entry() + void entry() override { if (_fault_test == FAULT_ON_ADDR) { addr_t volatile * value = (addr_t volatile *)MANAGED_ADDR; diff --git a/repos/base/src/test/smp/main.cc b/repos/base/src/test/smp/main.cc index d3e56e253..b04e48f41 100644 --- a/repos/base/src/test/smp/main.cc +++ b/repos/base/src/test/smp/main.cc @@ -158,7 +158,7 @@ namespace Affinity_test { Genode::uint64_t volatile cnt; Genode::Lock barrier; - void entry() + void entry() override { barrier.unlock(); Genode::log("Affinity: thread started on CPU ", @@ -254,7 +254,7 @@ namespace Tlb_shootdown_test { volatile unsigned * values; Genode::Lock barrier; - void entry() + void entry() override { Genode::log("TLB: thread started on CPU ", cpu_idx); values[cpu_idx] = 1; diff --git a/repos/base/src/test/thread/main.cc b/repos/base/src/test/thread/main.cc index 9840cce7b..b79c40e6f 100644 --- a/repos/base/src/test/thread/main.cc +++ b/repos/base/src/test/thread/main.cc @@ -56,7 +56,7 @@ class Helper : Thread void *stack() const { return _stack; } - void entry() + void entry() override { Constructible helper[CHILDREN]; @@ -126,7 +126,7 @@ struct Stack_helper : Thread Stack_helper(Env &env) : Thread(env, "stack_helper", STACK_SIZE) { } - void entry() + void entry() override { log_stack_address("helper"); test_stack_alignment_varargs("%f\n%g\n", 3.142, 2.718); @@ -202,7 +202,7 @@ struct Cpu_helper : Thread _env(env) { } - void entry() + void entry() override { log(Thread::name().string(), " : _cpu_session=", _cpu_session, " env.cpu()=", &_env.cpu()); @@ -240,7 +240,7 @@ struct Pause_helper : Thread Pause_helper(Env &env, const char * name, Cpu_session &cpu) : Thread(env, name, STACK_SIZE, Thread::Location(), Thread::Weight(), cpu) { } - void entry() + void entry() override { while (1) { /* @@ -367,7 +367,7 @@ struct Lock_helper : Thread lock(lock), lock_is_free(lock_is_free), unlock(unlock) { } - void entry() + void entry() override { log(" thread '", name(), "' started"); @@ -465,7 +465,7 @@ struct Cxa_helper : Thread in_cxa(cxa), sync_startup(startup), test(test), sync(sync) { } - void entry() + void entry() override { log(" thread '", name(), "' started"); @@ -674,7 +674,7 @@ struct Create_destroy_helper : Thread result_value(result_value) { } - void entry() + void entry() override { result = result_value; } diff --git a/repos/base/src/timer/include/root_component.h b/repos/base/src/timer/include/root_component.h index c9f85e881..d2f89c033 100644 --- a/repos/base/src/timer/include/root_component.h +++ b/repos/base/src/timer/include/root_component.h @@ -39,7 +39,7 @@ class Timer::Root_component : public Genode::Root_component ** Root_component ** ********************/ - Session_component *_create_session(const char *args) + Session_component *_create_session(const char *args) override { using namespace Genode; size_t const ram_quota = diff --git a/repos/base/src/timer/include/session_component.h b/repos/base/src/timer/include/session_component.h index b63a2e784..6fd53b1fb 100644 --- a/repos/base/src/timer/include/session_component.h +++ b/repos/base/src/timer/include/session_component.h @@ -46,7 +46,7 @@ class Timer::Session_component : public Genode::Rpc_object, unsigned long const _init_time_us = _timeout_scheduler.curr_time().trunc_to_plain_us().value; - void handle_timeout(Duration) { + void handle_timeout(Duration) override { Genode::Signal_transmitter(_sigh).submit(); } public: diff --git a/repos/base/src/timer/include/threaded_time_source.h b/repos/base/src/timer/include/threaded_time_source.h index 15725a6e4..1314fb3ea 100644 --- a/repos/base/src/timer/include/threaded_time_source.h +++ b/repos/base/src/timer/include/threaded_time_source.h @@ -82,7 +82,7 @@ class Timer::Threaded_time_source : public Genode::Time_source, ** Thread_deprecated ** ***********************/ - void entry() + void entry() override { while (true) { _wait_for_irq(); diff --git a/repos/base/src/timer/periodic/time_source.h b/repos/base/src/timer/periodic/time_source.h index ee5f0bb7b..646d45487 100644 --- a/repos/base/src/timer/periodic/time_source.h +++ b/repos/base/src/timer/periodic/time_source.h @@ -38,7 +38,7 @@ class Timer::Time_source : public Threaded_time_source ** Threaded_time_source ** **************************/ - void _wait_for_irq(); + void _wait_for_irq() override; public: diff --git a/repos/demo/include/scout/canvas.h b/repos/demo/include/scout/canvas.h index a3383fbc3..3fa5f19a1 100644 --- a/repos/demo/include/scout/canvas.h +++ b/repos/demo/include/scout/canvas.h @@ -93,30 +93,30 @@ class Scout::Canvas : public Canvas_base Canvas(PT *base, Area size, Genode::Allocator &alloc) : _alloc(alloc), _surface(base, size) { } - Area size() const { return _surface.size(); } + Area size() const override { return _surface.size(); } - Rect clip() const { return _surface.clip(); } + Rect clip() const override { return _surface.clip(); } - void clip(Rect rect) { _surface.clip(rect); } + void clip(Rect rect) override { _surface.clip(rect); } - void draw_string(int x, int y, Font *font, Color color, char const *str, int len) + void draw_string(int x, int y, Font *font, Color color, char const *str, int len) override { char buf[len + 1]; Genode::strncpy(buf, str, len + 1); Text_painter::paint(_surface, Text_painter::Position(x, y), *font, color, buf); } - void draw_box(int x, int y, int w, int h, Color c) + void draw_box(int x, int y, int w, int h, Color c) override { Box_painter::paint(_surface, Rect(Point(x, y), Area(w, h)), c); } - void draw_horizontal_shadow(Rect rect, int intensity) + void draw_horizontal_shadow(Rect rect, int intensity) override { Horizontal_shadow_painter::paint(_surface, rect, intensity); } - void draw_icon(Rect rect, Texture_base const &icon, unsigned alpha) + void draw_icon(Rect rect, Texture_base const &icon, unsigned alpha) override { Icon_painter::paint(_surface, rect, static_cast const &>(icon), alpha); @@ -124,7 +124,7 @@ class Scout::Canvas : public Canvas_base void draw_sky_texture(int py, Sky_texture_painter::Sky_texture_base const &texture, - bool detail) + bool detail) override { Sky_texture_painter::paint(_surface, py, texture, detail); } @@ -132,7 +132,7 @@ class Scout::Canvas : public Canvas_base void draw_refracted_icon(Point pos, Scout::Refracted_icon_painter::Distmap const &distmap, Texture_base &tmp, Texture_base const &foreground, - bool detail, bool filter_backbuf) + bool detail, bool filter_backbuf) override { using namespace Scout; Refracted_icon_painter::paint(_surface, pos, distmap, @@ -141,7 +141,7 @@ class Scout::Canvas : public Canvas_base detail, filter_backbuf); } - void draw_texture(Point pos, Texture_base const &texture_base) + void draw_texture(Point pos, Texture_base const &texture_base) override { Texture const &texture = static_cast const &>(texture_base); @@ -149,7 +149,7 @@ class Scout::Canvas : public Canvas_base Texture_painter::SOLID, true); } - Texture_base *alloc_texture(Area size, bool has_alpha) + Texture_base *alloc_texture(Area size, bool has_alpha) override { using namespace Genode; @@ -163,7 +163,7 @@ class Scout::Canvas : public Canvas_base return new (_alloc) Genode::Texture(pixel, alpha, size); } - virtual void free_texture(Texture_base *texture_base) + void free_texture(Texture_base *texture_base) override { using namespace Genode; @@ -179,9 +179,9 @@ class Scout::Canvas : public Canvas_base destroy(_alloc, texture); } - virtual void set_rgba_texture(Texture_base *texture_base, - unsigned char const *rgba, - unsigned len, int y) + void set_rgba_texture(Texture_base *texture_base, + unsigned char const *rgba, + unsigned len, int y) override { Texture *texture = static_cast *>(texture_base); diff --git a/repos/demo/include/scout/fader.h b/repos/demo/include/scout/fader.h index 31bc3610d..a9c99ceb2 100644 --- a/repos/demo/include/scout/fader.h +++ b/repos/demo/include/scout/fader.h @@ -63,7 +63,7 @@ class Scout::Fader : public Tick /** * Tick interface */ - int on_tick() + int on_tick() override { if (_curr_value == _dst_value) return 0; diff --git a/repos/demo/include/scout/nitpicker_graphics_backend.h b/repos/demo/include/scout/nitpicker_graphics_backend.h index e64c04615..849066e29 100644 --- a/repos/demo/include/scout/nitpicker_graphics_backend.h +++ b/repos/demo/include/scout/nitpicker_graphics_backend.h @@ -127,7 +127,7 @@ class Scout::Nitpicker_graphics_backend : public Graphics_backend Canvas_base &front() override { return *_canvas[_front_idx()]; } Canvas_base &back() override { return *_canvas[ _back_idx()]; } - void copy_back_to_front(Rect rect) + void copy_back_to_front(Rect rect) override { typedef Genode::Pixel_rgb565 PT; @@ -146,19 +146,19 @@ class Scout::Nitpicker_graphics_backend : public Graphics_backend _refresh_view(rect); } - void swap_back_and_front() + void swap_back_and_front() override { _flip_state = !_flip_state; _update_viewport(); } - void position(Point p) + void position(Point p) override { _position = p; _update_viewport(); } - void bring_to_front() + void bring_to_front() override { typedef Nitpicker::Session::Command Command; typedef Nitpicker::Session::View_handle View_handle; @@ -166,7 +166,7 @@ class Scout::Nitpicker_graphics_backend : public Graphics_backend _nitpicker.execute(); } - void view_area(Area area) + void view_area(Area area) override { _view_size = area; } diff --git a/repos/demo/include/scout/parent_element.h b/repos/demo/include/scout/parent_element.h index 626b3c09c..1b8756b93 100644 --- a/repos/demo/include/scout/parent_element.h +++ b/repos/demo/include/scout/parent_element.h @@ -71,12 +71,12 @@ class Scout::Parent_element : public Element /** * Element interface */ - void draw(Canvas_base &, Point); - Element *find(Point); - Element *find_by_y(int); - void fill_cache(Canvas_base &); - void flush_cache(Canvas_base &); - void geometry(Rect); + void draw(Canvas_base &, Point) override; + Element *find(Point) override; + Element *find_by_y(int) override; + void fill_cache(Canvas_base &) override; + void flush_cache(Canvas_base &) override; + void geometry(Rect) override; /** * Execute function on each child diff --git a/repos/demo/include/scout/user_state.h b/repos/demo/include/scout/user_state.h index 223a853fa..bf4232dcc 100644 --- a/repos/demo/include/scout/user_state.h +++ b/repos/demo/include/scout/user_state.h @@ -148,7 +148,7 @@ class Scout::User_state : public Parent_element ** Parent element ** ********************/ - void forget(Element const *e) + void forget(Element const *e) override { if (_mfocus == e) _mfocus = 0; if (_active == e) _active = 0; diff --git a/repos/demo/include/scout/window.h b/repos/demo/include/scout/window.h index 231c97233..3e8b2c8f2 100644 --- a/repos/demo/include/scout/window.h +++ b/repos/demo/include/scout/window.h @@ -107,7 +107,7 @@ class Scout::Window : public Parent_element * does not perform any immediate drawing operation. The actual drawing * must be initiated by calling the process_redraw function. */ - void redraw_area(int x, int y, int w, int h) + void redraw_area(int x, int y, int w, int h) override { /* * Scout redraw quirk @@ -253,13 +253,13 @@ class Scout::Sizer_event_handler : public Drag_event_handler /** * Event handler interface */ - void start_drag() + void start_drag() override { _obw = _window->view_w(); _obh = _window->view_h(); } - void do_drag() + void do_drag() override { /* calculate new window size */ int nbw = _obw + _current_mouse_position.x() - _old_mouse_position.x(); @@ -292,14 +292,14 @@ class Scout::Mover_event_handler : public Drag_event_handler Window *_window; int _obx = 0, _oby = 0; /* original launchpad position */ - void start_drag() + void start_drag() override { _obx = _window->view_x(); _oby = _window->view_y(); _window->top(); } - void do_drag() + void do_drag() override { int nbx = _obx + _current_mouse_position.x() - _old_mouse_position.x(); int nby = _oby + _current_mouse_position.y() - _old_mouse_position.y(); diff --git a/repos/demo/include/scout_gfx/sky_texture_painter.h b/repos/demo/include/scout_gfx/sky_texture_painter.h index 4d8c342f2..b239bd150 100644 --- a/repos/demo/include/scout_gfx/sky_texture_painter.h +++ b/repos/demo/include/scout_gfx/sky_texture_painter.h @@ -193,9 +193,9 @@ struct Sky_texture_painter TW, TH, _coltab); } - PT const *fallback() const { return _fallback[0]; } + PT const *fallback() const override { return _fallback[0]; } - short const *buf(unsigned i) const + short const *buf(unsigned i) const override { if (i >= 3) return 0; @@ -203,7 +203,7 @@ struct Sky_texture_painter return _bufs[i][0]; } - PT const *coltab() const { return _coltab; } + PT const *coltab() const override { return _coltab; } }; diff --git a/repos/demo/src/app/launchpad/child_entry.h b/repos/demo/src/app/launchpad/child_entry.h index f13dac69a..e308dd5bb 100644 --- a/repos/demo/src/app/launchpad/child_entry.h +++ b/repos/demo/src/app/launchpad/child_entry.h @@ -129,7 +129,7 @@ class Child_entry : public Scout::Parent_element, ** Parent element interface ** ******************************/ - void format_fixed_width(int w) + void format_fixed_width(int w) override { using namespace Scout; diff --git a/repos/demo/src/app/launchpad/launch_entry.h b/repos/demo/src/app/launchpad/launch_entry.h index 524903449..a7d6fab27 100644 --- a/repos/demo/src/app/launchpad/launch_entry.h +++ b/repos/demo/src/app/launchpad/launch_entry.h @@ -63,7 +63,7 @@ class Launch_entry : public Scout::Parent_element, public Loadbar_listener ** Loadbar listener interface ** ********************************/ - void loadbar_changed(int mx) + void loadbar_changed(int mx) override { int value = _loadbar.value_by_xpos(mx - _loadbar.abs_position().x()); _loadbar.value(value); @@ -76,7 +76,7 @@ class Launch_entry : public Scout::Parent_element, public Loadbar_listener ** Parent element interface ** ******************************/ - void format_fixed_width(int w) + void format_fixed_width(int w) override { using namespace Scout; diff --git a/repos/demo/src/app/launchpad/launchpad_window.h b/repos/demo/src/app/launchpad/launchpad_window.h index c5816ff1f..213aec97b 100644 --- a/repos/demo/src/app/launchpad/launchpad_window.h +++ b/repos/demo/src/app/launchpad/launchpad_window.h @@ -97,13 +97,13 @@ class Launchpad_window : public Scout::Scrollbar_listener, /** * Window interface */ - void format(Scout::Area); - void ypos(int ypos) { ypos_sb(ypos, 1); } + void format(Scout::Area) override; + void ypos(int ypos) override { ypos_sb(ypos, 1); } /** * Element interface */ - void draw(Scout::Canvas_base &canvas, Scout::Point abs_position) + void draw(Scout::Canvas_base &canvas, Scout::Point abs_position) override { using namespace Scout; @@ -120,12 +120,12 @@ class Launchpad_window : public Scout::Scrollbar_listener, /** * Scrollbar listener interface */ - void handle_scroll(int view_pos); + void handle_scroll(int view_pos) override; /** * Launchpad interface */ - void quota(unsigned long quota) + void quota(unsigned long quota) override { _status_entry.max_value(initial_quota() / 1024); _status_entry.value(quota / 1024); diff --git a/repos/demo/src/app/launchpad/loadbar.h b/repos/demo/src/app/launchpad/loadbar.h index 086a8e157..106550648 100644 --- a/repos/demo/src/app/launchpad/loadbar.h +++ b/repos/demo/src/app/launchpad/loadbar.h @@ -172,7 +172,7 @@ class Loadbar : public Scout::Parent_element /** * Element interface */ - void format_fixed_width(int w) + void format_fixed_width(int w) override { using namespace Scout; _cover.geometry(Rect(Point(0, 0), Area(w, _LH))); @@ -180,7 +180,7 @@ class Loadbar : public Scout::Parent_element _min_size = Scout::Area(w, _min_size.h()); } - void draw(Scout::Canvas_base &canvas, Scout::Point abs_position) + void draw(Scout::Canvas_base &canvas, Scout::Point abs_position) override { Parent_element::draw(canvas, abs_position); @@ -207,7 +207,7 @@ class Loadbar : public Scout::Parent_element canvas.clip(Rect(Point(cx1, cy1), Area(cx2 - cx1 + 1, cy2 - cy1 + 1))); } - void mfocus(int flag) + void mfocus(int flag) override { if (!_active) return; diff --git a/repos/demo/src/app/launchpad/main.cc b/repos/demo/src/app/launchpad/main.cc index b3cc48e43..20e88070d 100644 --- a/repos/demo/src/app/launchpad/main.cc +++ b/repos/demo/src/app/launchpad/main.cc @@ -60,7 +60,7 @@ class Avail_quota_update : public Scout::Tick /** * Tick interface */ - int on_tick() + int on_tick() override { size_t new_avail = _pd.avail_ram().value; diff --git a/repos/demo/src/app/launchpad/section.h b/repos/demo/src/app/launchpad/section.h index b5726b5ce..f4741da1d 100644 --- a/repos/demo/src/app/launchpad/section.h +++ b/repos/demo/src/app/launchpad/section.h @@ -54,7 +54,7 @@ class Section : public Scout::Parent_element /** * Element interface */ - void format_fixed_width(int w) + void format_fixed_width(int w) override { using namespace Scout; @@ -68,7 +68,7 @@ class Section : public Scout::Parent_element _shadow.size().h()))); } - void draw(Scout::Canvas_base &canvas, Scout::Point abs_position) + void draw(Scout::Canvas_base &canvas, Scout::Point abs_position) override { using namespace Scout; diff --git a/repos/demo/src/app/launchpad/status_entry.h b/repos/demo/src/app/launchpad/status_entry.h index 05776d4d5..1fe7c9988 100644 --- a/repos/demo/src/app/launchpad/status_entry.h +++ b/repos/demo/src/app/launchpad/status_entry.h @@ -48,7 +48,7 @@ class Status_entry : public Scout::Parent_element _min_size = Scout::Area(_PTW + 100, _min_size.h()); } - void format_fixed_width(int w) + void format_fixed_width(int w) override { using namespace Scout; diff --git a/repos/demo/src/app/scout/browser_window.cc b/repos/demo/src/app/scout/browser_window.cc index 0532b14c5..6712e2183 100644 --- a/repos/demo/src/app/scout/browser_window.cc +++ b/repos/demo/src/app/scout/browser_window.cc @@ -209,13 +209,13 @@ class Browser_sizer_event_handler : public Scout::Sizer_event_handler /** * Event handler interface */ - void start_drag() + void start_drag() override { Sizer_event_handler::start_drag(); _ca = _browser_win->curr_anchor(); } - void do_drag() + void do_drag() override { Sizer_event_handler::do_drag(); _browser_win->go_to(_ca, 0); diff --git a/repos/demo/src/app/scout/browser_window.h b/repos/demo/src/app/scout/browser_window.h index ca5ee78ee..749039903 100644 --- a/repos/demo/src/app/scout/browser_window.h +++ b/repos/demo/src/app/scout/browser_window.h @@ -95,8 +95,8 @@ class Scout::Browser_window : public Scrollbar_listener, /** * Browser interface */ - void _content(Element *content); - Element *_content(); + void _content(Element *content) override; + Element *_content() override; public: @@ -132,15 +132,15 @@ class Scout::Browser_window : public Scrollbar_listener, /** * Browser interface */ - void format(Area); - void ypos(int ypos) { ypos_sb(ypos, 1); } - Anchor *curr_anchor(); + void format(Area) override; + void ypos(int ypos) override { ypos_sb(ypos, 1); } + Anchor *curr_anchor() override; Browser *browser() { return this; } /** * Element interface */ - void draw(Canvas_base &canvas, Point abs_position) + void draw(Canvas_base &canvas, Point abs_position) override { Parent_element::draw(canvas, abs_position); @@ -156,7 +156,7 @@ class Scout::Browser_window : public Scrollbar_listener, /** * Scrollbar listener interface */ - void handle_scroll(int view_pos); + void handle_scroll(int view_pos) override; }; #endif /* _BROWSER_WINDOW_H_ */ diff --git a/repos/demo/src/app/scout/elements.h b/repos/demo/src/app/scout/elements.h index ed658f533..9cbb5cf97 100644 --- a/repos/demo/src/app/scout/elements.h +++ b/repos/demo/src/app/scout/elements.h @@ -104,7 +104,7 @@ class Scout::Token : public Element /** * Element interface */ - void draw(Canvas_base &, Point); + void draw(Canvas_base &, Point) override; void refresh() { redraw_area(-1, 0, _size.w() + 1, _size.h()); } }; @@ -165,7 +165,7 @@ class Scout::Link_token : public Token, private Link, public Event_handler, /** * Element interface */ - void draw(Canvas_base &canvas, Point abs_position) + void draw(Canvas_base &canvas, Point abs_position) override { _outline = Color(_style->color.r, _style->color.g, @@ -178,7 +178,7 @@ class Scout::Link_token : public Token, private Link, public Event_handler, _size.w(), 1, Color(0,0,255)); } - void mfocus(int flag) + void mfocus(int flag) override { /* * highlight link of all siblings that point to the same link. @@ -214,7 +214,7 @@ class Scout::Link_token : public Token, private Link, public Event_handler, /** * Tick interface */ - int on_tick() + int on_tick() override { /* call on_tick function of the fader */ if (Fader::on_tick() == 0) return 0; @@ -383,7 +383,7 @@ class Scout::Block : public Parent_element /** * Element interface */ - void format_fixed_width(int w); + void format_fixed_width(int w) override; }; @@ -405,7 +405,7 @@ class Scout::Center : public Parent_element /** * Element interface */ - void format_fixed_width(int w); + void format_fixed_width(int w) override; }; @@ -442,9 +442,9 @@ class Scout::Png_image : public Element /** * Element interface */ - void fill_cache(Canvas_base &); - void flush_cache(Canvas_base &); - void draw(Canvas_base &, Point); + void fill_cache(Canvas_base &) override; + void flush_cache(Canvas_base &) override; + void draw(Canvas_base &, Point) override; }; @@ -474,7 +474,7 @@ class Scout::Document : public Parent_element /** * Element interface */ - void format_fixed_width(int w) + void format_fixed_width(int w) override { _min_size = Area(w, _format_children(0, w)); } @@ -528,8 +528,8 @@ class Scout::Verbatim : public Parent_element /** * Element interface */ - void draw(Canvas_base &, Point); - void format_fixed_width(int); + void draw(Canvas_base &, Point) override; + void format_fixed_width(int) override; }; @@ -561,12 +561,12 @@ class Scout::Item : public Parent_element /** * Element interface */ - void format_fixed_width(int w) + void format_fixed_width(int w) override { _min_size = Area(w, _format_children(_tag_ident, w - _tag_ident)); } - void draw(Canvas_base &canvas, Point abs_position) + void draw(Canvas_base &canvas, Point abs_position) override { canvas.draw_string(_position.x() + abs_position.x(), _position.y() + abs_position.y(), @@ -621,14 +621,14 @@ class Scout::Navbar : public Parent_element, public Fader /** * Element interface */ - void format_fixed_width(int); - void draw(Canvas_base &, Point); - Element *find(Point); + void format_fixed_width(int) override; + void draw(Canvas_base &, Point) override; + Element *find(Point) override; /** * Tick interface */ - int on_tick(); + int on_tick() override; }; #endif /* _ELEMENTS_H_ */ diff --git a/repos/demo/src/app/scout/fade_icon.h b/repos/demo/src/app/scout/fade_icon.h index e989290f9..8163d7818 100644 --- a/repos/demo/src/app/scout/fade_icon.h +++ b/repos/demo/src/app/scout/fade_icon.h @@ -62,7 +62,7 @@ class Scout::Fade_icon : public Fader, public Icon /** * Tick interface */ - int on_tick() + int on_tick() override { /* call on_tick function of the fader */ if (Fader::on_tick() == 0) return 0; @@ -74,7 +74,7 @@ class Scout::Fade_icon : public Fader, public Icon /** * Icon interface */ - void alpha(int alpha) + void alpha(int alpha) override { _curr_value = alpha; Icon::alpha(alpha); @@ -83,7 +83,7 @@ class Scout::Fade_icon : public Fader, public Icon /** * Element interface */ - void mfocus(int flag) + void mfocus(int flag) override { Icon::mfocus(flag); int step = _focus_alpha - _default_alpha; diff --git a/repos/demo/src/app/scout/refracted_icon.h b/repos/demo/src/app/scout/refracted_icon.h index ab286a6a2..a8c0292d4 100644 --- a/repos/demo/src/app/scout/refracted_icon.h +++ b/repos/demo/src/app/scout/refracted_icon.h @@ -106,7 +106,7 @@ class Scout::Refracted_icon : public Element _fg_alpha = fg_alpha; } - void draw(Canvas_base &canvas, Point abs_position) + void draw(Canvas_base &canvas, Point abs_position) override { Scout::Refracted_icon_painter::Distmap distmap(_distmap, Area(_distmap_w, _distmap_h)); diff --git a/repos/demo/src/app/scout/scrollbar.cc b/repos/demo/src/app/scout/scrollbar.cc index 7dc874e2c..cb94bad48 100644 --- a/repos/demo/src/app/scout/scrollbar.cc +++ b/repos/demo/src/app/scout/scrollbar.cc @@ -106,7 +106,7 @@ class Arrow_event_handler : public Event_handler, public Tick /** * Tick interface */ - int on_tick() + int on_tick() override { /* accelerate */ if (_curr_speed < _dst_speed) diff --git a/repos/demo/src/app/scout/scrollbar.h b/repos/demo/src/app/scout/scrollbar.h index ebf9707fb..06b5cec68 100644 --- a/repos/demo/src/app/scout/scrollbar.h +++ b/repos/demo/src/app/scout/scrollbar.h @@ -105,12 +105,12 @@ class Scout::Scrollbar : public Parent_element /** * Set geometry of scrollbar and layout scrollbar elements */ - void geometry(Rect); + void geometry(Rect) override; /** * Element interface */ - Element *find(Point); + Element *find(Point) override; }; diff --git a/repos/demo/src/app/scout/sky_texture.h b/repos/demo/src/app/scout/sky_texture.h index 79bb2e8e9..1ce179ce5 100644 --- a/repos/demo/src/app/scout/sky_texture.h +++ b/repos/demo/src/app/scout/sky_texture.h @@ -40,7 +40,7 @@ class Scout::Sky_texture : public Element Sky_texture(bool detailed = true) : _detailed(detailed) { } - void draw(Canvas_base &canvas, Point abs_position) + void draw(Canvas_base &canvas, Point abs_position) override { canvas.draw_sky_texture(abs_position.y(), _sky_texture, _detailed); diff --git a/repos/demo/src/app/scout/titlebar.h b/repos/demo/src/app/scout/titlebar.h index bf5c4321d..d8aa55f09 100644 --- a/repos/demo/src/app/scout/titlebar.h +++ b/repos/demo/src/app/scout/titlebar.h @@ -69,13 +69,13 @@ class Scout::Titlebar : public Parent_element * Element interface */ - void format_fixed_width(int w) + void format_fixed_width(int w) override { _min_size = Area(w, 32); _fg.geometry(Rect(Point(0, 0), _min_size)); } - void draw(Canvas_base &canvas, Point abs_position) + void draw(Canvas_base &canvas, Point abs_position) override { const int b = 180, a = 200; canvas.draw_box(abs_position.x() + _position.x(), diff --git a/repos/demo/src/app/scout/widgets.h b/repos/demo/src/app/scout/widgets.h index e6224145a..710471bb6 100644 --- a/repos/demo/src/app/scout/widgets.h +++ b/repos/demo/src/app/scout/widgets.h @@ -78,10 +78,10 @@ class Scout::Docview : public Parent_element /** * Element interface */ - void format_fixed_width(int); - void draw(Canvas_base &, Point); - Element *find(Point); - void geometry(Rect); + void format_fixed_width(int) override; + void draw(Canvas_base &, Point) override; + Element *find(Point) override; + void geometry(Rect) override; }; @@ -96,9 +96,9 @@ struct Scout::Horizontal_shadow : Element /** * Element interface */ - void draw(Canvas_base &, Point); - Element *find(Point) { return 0; } - void format_fixed_width(int w) { _min_size = Area(w, _min_size.h()); } + void draw(Canvas_base &, Point) override; + Element *find(Point) override { return 0; } + void format_fixed_width(int w) override { _min_size = Area(w, _min_size.h()); } }; @@ -158,8 +158,9 @@ class Scout::Icon : public Generic_icon /** * Generic_icon interface */ - int alpha() { return _icon_alpha; } - virtual void alpha(int alpha) + int alpha() override { return _icon_alpha; } + + void alpha(int alpha) override { _icon_alpha = alpha; refresh(); @@ -168,8 +169,8 @@ class Scout::Icon : public Generic_icon /** * Element interface */ - void draw(Canvas_base &, Point); - Element *find(Point); + void draw(Canvas_base &, Point) override; + Element *find(Point) override; }; diff --git a/repos/demo/src/server/liquid_framebuffer/framebuffer_window.h b/repos/demo/src/server/liquid_framebuffer/framebuffer_window.h index 06cb44a2b..c6ca959e3 100644 --- a/repos/demo/src/server/liquid_framebuffer/framebuffer_window.h +++ b/repos/demo/src/server/liquid_framebuffer/framebuffer_window.h @@ -141,7 +141,7 @@ class Framebuffer_window : public Scout::Window /** * Move window to new position */ - void vpos(int x, int y) + void vpos(int x, int y) override { Window::vpos(x, y); format(_size); @@ -163,7 +163,7 @@ class Framebuffer_window : public Scout::Window /** * Window interface */ - void format(Scout::Area size) + void format(Scout::Area size) override { using namespace Scout; @@ -214,7 +214,7 @@ class Framebuffer_window : public Scout::Window /** * Element interface */ - void draw(Scout::Canvas_base &canvas, Scout::Point abs_position) + void draw(Scout::Canvas_base &canvas, Scout::Point abs_position) override { using namespace Scout; diff --git a/repos/demo/src/server/liquid_framebuffer/main.cc b/repos/demo/src/server/liquid_framebuffer/main.cc index 20916a126..22b63a71d 100644 --- a/repos/demo/src/server/liquid_framebuffer/main.cc +++ b/repos/demo/src/server/liquid_framebuffer/main.cc @@ -50,7 +50,7 @@ class Background_animator : public Scout::Tick /** * Tick interface */ - int on_tick() + int on_tick() override { _fb_win.bg_offset(_bg_offset); _bg_offset += 2; diff --git a/repos/demo/src/server/liquid_framebuffer/services.cc b/repos/demo/src/server/liquid_framebuffer/services.cc index 5df023a9b..15f782675 100644 --- a/repos/demo/src/server/liquid_framebuffer/services.cc +++ b/repos/demo/src/server/liquid_framebuffer/services.cc @@ -202,12 +202,12 @@ class Window_content : public Scout::Element /** * Element interface */ - void draw(Scout::Canvas_base &canvas, Scout::Point abs_position) + void draw(Scout::Canvas_base &canvas, Scout::Point abs_position) override { canvas.draw_texture(abs_position + _position, _fb->texture); } - void format_fixed_size(Scout::Area size) + void format_fixed_size(Scout::Area size) override { _designated_size = size; diff --git a/repos/demo/src/server/nitlog/main.cc b/repos/demo/src/server/nitlog/main.cc index e609137fa..77c52539d 100644 --- a/repos/demo/src/server/nitlog/main.cc +++ b/repos/demo/src/server/nitlog/main.cc @@ -86,13 +86,13 @@ class Canvas : public Canvas_base void clip(Rect rect) { _surface.clip(rect); } void draw_string(Point p, Font const &font, Color color, - char const *sstr) + char const *sstr) override { Text_painter::paint(_surface, Text_painter::Position(p.x(), p.y()), font, color, sstr); } - void draw_box(Rect rect, Color color) + void draw_box(Rect rect, Color color) override { Box_painter::paint(_surface, rect, color); } @@ -302,7 +302,7 @@ class Nitlog::Session_component : public Rpc_object ** Log session interface ** ***************************/ - size_t write(String const &log_text) + size_t write(String const &log_text) override { if (!log_text.valid_string()) { error("corrupted string"); @@ -326,7 +326,7 @@ class Nitlog::Root : public Root_component protected: - Session_component *_create_session(const char *args) + Session_component *_create_session(const char *args) override { log("create log session args: ", args); diff --git a/repos/gems/src/app/decorator/canvas.h b/repos/gems/src/app/decorator/canvas.h index 67f5bcb3c..f0d2bd93a 100644 --- a/repos/gems/src/app/decorator/canvas.h +++ b/repos/gems/src/app/decorator/canvas.h @@ -87,7 +87,7 @@ class Decorator::Canvas : public Decorator::Canvas_base font, color, string); } - void draw_texture(Point pos, Texture_id id) + void draw_texture(Point pos, Texture_id id) override { Genode::Texture const &texture = static_cast const &>(texture_by_id(id, _ram, _rm)); diff --git a/repos/gems/src/app/depot_autopilot/main.cc b/repos/gems/src/app/depot_autopilot/main.cc index dbbc38e81..76bd74695 100644 --- a/repos/gems/src/app/depot_autopilot/main.cc +++ b/repos/gems/src/app/depot_autopilot/main.cc @@ -75,7 +75,7 @@ class Depot_deploy::Log_root : public Root_component _children_label_prefix { children_label_prefix } { } - Log_session_component *_create_session(const char *args, Affinity const &) + Log_session_component *_create_session(const char *args, Affinity const &) override { using Name_delimiter = String<5>; diff --git a/repos/gems/src/app/depot_download_manager/main.cc b/repos/gems/src/app/depot_download_manager/main.cc index 15801bdc6..d65a9a569 100644 --- a/repos/gems/src/app/depot_download_manager/main.cc +++ b/repos/gems/src/app/depot_download_manager/main.cc @@ -109,7 +109,7 @@ struct Depot_download_manager::Main : Import::Download_progress /** * Download_progress interface */ - Info download_progress(Archive::Path const &path) const + Info download_progress(Archive::Path const &path) const override { Info result { Info::Bytes(), Info::Bytes() }; try { diff --git a/repos/gems/src/app/menu_view/box_layout_widget.h b/repos/gems/src/app/menu_view/box_layout_widget.h index ce2d68679..7af362885 100644 --- a/repos/gems/src/app/menu_view/box_layout_widget.h +++ b/repos/gems/src/app/menu_view/box_layout_widget.h @@ -128,7 +128,7 @@ struct Menu_view::Box_layout_widget : Widget void draw(Surface &pixel_surface, Surface &alpha_surface, - Point at) const + Point at) const override { _draw_children(pixel_surface, alpha_surface, at); } diff --git a/repos/gems/src/app/menu_view/button_widget.h b/repos/gems/src/app/menu_view/button_widget.h index a0a7c0b33..38cb19970 100644 --- a/repos/gems/src/app/menu_view/button_widget.h +++ b/repos/gems/src/app/menu_view/button_widget.h @@ -55,7 +55,7 @@ struct Menu_view::Button_widget : Widget, Animator::Item margin = { 4, 4, 4, 4 }; } - void update(Xml_node node) + void update(Xml_node node) override { bool const new_hovered = _enabled(node, "hovered"); bool const new_selected = _enabled(node, "selected"); @@ -105,7 +105,7 @@ struct Menu_view::Button_widget : Widget, Animator::Item void draw(Surface &pixel_surface, Surface &alpha_surface, - Point at) const + Point at) const override { static Scratch_surface scratch(_factory.alloc); diff --git a/repos/gems/src/app/menu_view/depgraph_widget.h b/repos/gems/src/app/menu_view/depgraph_widget.h index 4d5f31ec5..c360ecb24 100644 --- a/repos/gems/src/app/menu_view/depgraph_widget.h +++ b/repos/gems/src/app/menu_view/depgraph_widget.h @@ -642,7 +642,7 @@ struct Menu_view::Depgraph_widget : Widget void draw(Surface &pixel_surface, Surface &alpha_surface, - Point at) const + Point at) const override { /* draw connections twice, for the shadow and actual color */ _draw_connections(pixel_surface, alpha_surface, at + Point(0, 1), true); diff --git a/repos/gems/src/app/menu_view/float_widget.h b/repos/gems/src/app/menu_view/float_widget.h index b1afa0eda..8b6baa87d 100644 --- a/repos/gems/src/app/menu_view/float_widget.h +++ b/repos/gems/src/app/menu_view/float_widget.h @@ -69,7 +69,7 @@ struct Menu_view::Float_widget : Widget void draw(Surface &pixel_surface, Surface &alpha_surface, - Point at) const + Point at) const override { _draw_children(pixel_surface, alpha_surface, at); } diff --git a/repos/gems/src/app/menu_view/frame_widget.h b/repos/gems/src/app/menu_view/frame_widget.h index 8cc8a9c68..bfc82b4df 100644 --- a/repos/gems/src/app/menu_view/frame_widget.h +++ b/repos/gems/src/app/menu_view/frame_widget.h @@ -69,7 +69,7 @@ struct Menu_view::Frame_widget : Widget void draw(Surface &pixel_surface, Surface &alpha_surface, - Point at) const + Point at) const override { Icon_painter::paint(pixel_surface, Rect(at, _animated_geometry.area()), *texture, 255); diff --git a/repos/gems/src/app/menu_view/label_widget.h b/repos/gems/src/app/menu_view/label_widget.h index 662748167..422b52167 100644 --- a/repos/gems/src/app/menu_view/label_widget.h +++ b/repos/gems/src/app/menu_view/label_widget.h @@ -33,7 +33,7 @@ struct Menu_view::Label_widget : Widget Widget(factory, node, unique_id) { } - void update(Xml_node node) + void update(Xml_node node) override { font = _factory.styles.font(node); text = node.attribute_value("text", Text("")); @@ -50,7 +50,7 @@ struct Menu_view::Label_widget : Widget void draw(Surface &pixel_surface, Surface &alpha_surface, - Point at) const + Point at) const override { if (!font) return; diff --git a/repos/gems/src/app/menu_view/root_widget.h b/repos/gems/src/app/menu_view/root_widget.h index 030477f81..729f76684 100644 --- a/repos/gems/src/app/menu_view/root_widget.h +++ b/repos/gems/src/app/menu_view/root_widget.h @@ -66,7 +66,7 @@ struct Menu_view::Root_widget : Widget void draw(Surface &pixel_surface, Surface &alpha_surface, - Point at) const + Point at) const override { _draw_children(pixel_surface, alpha_surface, at); } diff --git a/repos/gems/src/app/sculpt_manager/view/storage_dialog.h b/repos/gems/src/app/sculpt_manager/view/storage_dialog.h index 7731a2364..24c5639d1 100644 --- a/repos/gems/src/app/sculpt_manager/view/storage_dialog.h +++ b/repos/gems/src/app/sculpt_manager/view/storage_dialog.h @@ -55,7 +55,7 @@ struct Sculpt::Storage_dialog : Dialog void _gen_ram_fs(Xml_generator &) const; - void hover(Xml_node hover); + void hover(Xml_node hover) override; Storage_target const &_used_target; diff --git a/repos/gems/src/server/file_terminal/main.cc b/repos/gems/src/server/file_terminal/main.cc index 96cce00ef..e36002b03 100644 --- a/repos/gems/src/server/file_terminal/main.cc +++ b/repos/gems/src/server/file_terminal/main.cc @@ -235,7 +235,7 @@ namespace Terminal { protected: - Session_component *_create_session(const char *args) + Session_component *_create_session(const char *args) override { using namespace Genode; diff --git a/repos/gems/src/server/wm/decorator_nitpicker.h b/repos/gems/src/server/wm/decorator_nitpicker.h index 8c306577b..a3fc0a4d2 100644 --- a/repos/gems/src/server/wm/decorator_nitpicker.h +++ b/repos/gems/src/server/wm/decorator_nitpicker.h @@ -489,7 +489,7 @@ struct Wm::Decorator_nitpicker_session : Genode::Rpc_object, Nitpicker::Session_client(_env.rm(), _nitpicker_session.cap()).buffer(mode, use_alpha); } - void focus(Genode::Capability) { } + void focus(Genode::Capability) override { } }; #endif /* _DECORATOR_NITPICKER_H_ */ diff --git a/repos/gems/src/server/wm/direct_nitpicker.h b/repos/gems/src/server/wm/direct_nitpicker.h index b8788afcf..77f602bfa 100644 --- a/repos/gems/src/server/wm/direct_nitpicker.h +++ b/repos/gems/src/server/wm/direct_nitpicker.h @@ -110,7 +110,7 @@ class Wm::Direct_nitpicker_session : public Genode::Rpc_object session) + void focus(Genode::Capability session) override { _session.focus(session); } diff --git a/repos/gems/src/server/wm/layouter_nitpicker.h b/repos/gems/src/server/wm/layouter_nitpicker.h index 59f12ee19..3768fe8f9 100644 --- a/repos/gems/src/server/wm/layouter_nitpicker.h +++ b/repos/gems/src/server/wm/layouter_nitpicker.h @@ -101,7 +101,7 @@ struct Wm::Layouter_nitpicker_session : Genode::Rpc_object void buffer(Framebuffer::Mode, bool) override { } - void focus(Genode::Capability) { } + void focus(Genode::Capability) override { } }; #endif /* _LAYOUTER_NITPICKER_H_ */ diff --git a/repos/gems/src/server/wm/nitpicker.h b/repos/gems/src/server/wm/nitpicker.h index 188e69c87..a64b002f9 100644 --- a/repos/gems/src/server/wm/nitpicker.h +++ b/repos/gems/src/server/wm/nitpicker.h @@ -989,7 +989,7 @@ class Wm::Nitpicker::Session_component : public Rpc_object, _has_alpha = has_alpha; } - void focus(Genode::Capability) { } + void focus(Genode::Capability) override { } void session_control(Label suffix, Session_control operation) override { diff --git a/repos/hello_tutorial/doc/hello_tutorial.txt b/repos/hello_tutorial/doc/hello_tutorial.txt index 8c7050ddf..0ae6d2c40 100644 --- a/repos/hello_tutorial/doc/hello_tutorial.txt +++ b/repos/hello_tutorial/doc/hello_tutorial.txt @@ -136,10 +136,10 @@ will make the server's functions accessible via RPC. ! !struct Hello::Session_component : Genode::Rpc_object !{ -! void say_hello() { +! void say_hello() override { ! Genode::log("I am here... Hello."); } ! -! int add(int a, int b) { +! int add(int a, int b) override { ! return a + b; } !}; @@ -172,7 +172,7 @@ parameters. !{ ! protected: ! -! Session_component *_create_session(const char *) +! Session_component *_create_session(const char *) override ! { ! Genode::log("creating hello session"); ! return new (md_alloc()) Session_component(); @@ -297,14 +297,14 @@ Therefore edit 'include/hello_session/client.h': ! Session_client(Genode::Capability cap) ! : Genode::Rpc_client(cap) { } ! -! void say_hello() +! void say_hello() override ! { ! Genode::log("issue RPC for saying hello"); ! call(); ! Genode::log("returned from 'say_hello' RPC call"); ! } ! -! int add(int a, int b) +! int add(int a, int b) override ! { ! return call(a, b); ! } diff --git a/repos/hello_tutorial/include/hello_session/client.h b/repos/hello_tutorial/include/hello_session/client.h index 4ccd7813b..3ce4abade 100644 --- a/repos/hello_tutorial/include/hello_session/client.h +++ b/repos/hello_tutorial/include/hello_session/client.h @@ -26,14 +26,14 @@ struct Hello::Session_client : Genode::Rpc_client Session_client(Genode::Capability cap) : Genode::Rpc_client(cap) { } - void say_hello() + void say_hello() override { Genode::log("issue RPC for saying hello"); call(); Genode::log("returned from 'say_hello' RPC call"); } - int add(int a, int b) + int add(int a, int b) override { return call(a, b); } diff --git a/repos/hello_tutorial/src/hello/server/main.cc b/repos/hello_tutorial/src/hello/server/main.cc index 7106784de..267a8491b 100644 --- a/repos/hello_tutorial/src/hello/server/main.cc +++ b/repos/hello_tutorial/src/hello/server/main.cc @@ -28,10 +28,10 @@ namespace Hello { struct Hello::Session_component : Genode::Rpc_object { - void say_hello() { + void say_hello() override { Genode::log("I am here... Hello."); } - int add(int a, int b) { + int add(int a, int b) override { return a + b; } }; @@ -42,7 +42,7 @@ class Hello::Root_component { protected: - Session_component *_create_session(const char *) + Session_component *_create_session(const char *) override { Genode::log("creating hello session"); return new (md_alloc()) Session_component(); diff --git a/repos/libports/src/lib/vfs/lwip/vfs.cc b/repos/libports/src/lib/vfs/lwip/vfs.cc index 43a2c2295..f16d8be33 100644 --- a/repos/libports/src/lib/vfs/lwip/vfs.cc +++ b/repos/libports/src/lib/vfs/lwip/vfs.cc @@ -1810,7 +1810,7 @@ class Lwip::File_system final : public Vfs::File_system return Read_result::READ_ERR_INVALID; } - bool queue_read(Vfs_handle *, file_size) { + bool queue_read(Vfs_handle *, file_size) override { return _netif.ready(); } bool read_ready(Vfs_handle *vfs_handle) override @@ -1837,7 +1837,7 @@ class Lwip::File_system final : public Vfs::File_system return false; } - bool check_unblock(Vfs_handle*, bool, bool, bool) + bool check_unblock(Vfs_handle*, bool, bool, bool) override { Genode::error("VFS lwIP: ",__func__," not implemented"); return true; diff --git a/repos/libports/src/test/timed_semaphore/main.cc b/repos/libports/src/test/timed_semaphore/main.cc index 0bcd84b46..1c823e23e 100644 --- a/repos/libports/src/test/timed_semaphore/main.cc +++ b/repos/libports/src/test/timed_semaphore/main.cc @@ -37,7 +37,7 @@ struct Test : Thread Lock wakeup_stopped { Lock::LOCKED }; bool got_timeouts { false }; - void entry() + void entry() override { do { wakeup_timer.msleep(wakeup_period); diff --git a/repos/os/include/audio_out_session/client.h b/repos/os/include/audio_out_session/client.h index d816bea96..1ebab1369 100644 --- a/repos/os/include/audio_out_session/client.h +++ b/repos/os/include/audio_out_session/client.h @@ -81,13 +81,13 @@ class Audio_out::Session_client : public Genode::Rpc_client ** Signals ** *************/ - void progress_sigh(Genode::Signal_context_capability sigh) { + void progress_sigh(Genode::Signal_context_capability sigh) override { call(sigh); } - void alloc_sigh(Genode::Signal_context_capability sigh) { + void alloc_sigh(Genode::Signal_context_capability sigh) override { call(sigh); } - Genode::Signal_context_capability data_avail_sigh() { + Genode::Signal_context_capability data_avail_sigh() override { return Genode::Signal_context_capability(); } @@ -95,7 +95,7 @@ class Audio_out::Session_client : public Genode::Rpc_client ** Session interface ** ***********************/ - void start() + void start() override { call(); @@ -103,7 +103,7 @@ class Audio_out::Session_client : public Genode::Rpc_client stream()->reset(); } - void stop() { call(); } + void stop() override { call(); } /********************************** diff --git a/repos/os/include/audio_out_session/rpc_object.h b/repos/os/include/audio_out_session/rpc_object.h index 85f7c66fd..214a06f72 100644 --- a/repos/os/include/audio_out_session/rpc_object.h +++ b/repos/os/include/audio_out_session/rpc_object.h @@ -54,16 +54,16 @@ class Audio_out::Session_rpc_object : public Genode::Rpc_object call(blk_count, blk_size, ops); } - Tx *tx_channel() { return &_tx; } + Tx *tx_channel() override { return &_tx; } - Tx::Source *tx() { return _tx.source(); } + Tx::Source *tx() override { return _tx.source(); } void sync() override { call(); } diff --git a/repos/os/include/cli_monitor/child.h b/repos/os/include/cli_monitor/child.h index c963cb791..3550871d0 100644 --- a/repos/os/include/cli_monitor/child.h +++ b/repos/os/include/cli_monitor/child.h @@ -319,7 +319,7 @@ class Cli_monitor::Child_base : public Genode::Child_policy .diag = Genode::Session::Diag() }; } - void yield_response() + void yield_response() override { if (_withdraw_on_yield_response) { enum { RESERVE = 4*1024*1024 }; @@ -336,7 +336,7 @@ class Cli_monitor::Child_base : public Genode::Child_policy Genode::Signal_transmitter(_yield_response_sigh_cap).submit(); } - void resource_request(Genode::Parent::Resource_args const &args) + void resource_request(Genode::Parent::Resource_args const &args) override { _resource_args = args; try_response_to_resource_request(); diff --git a/repos/os/include/file_system_session/client.h b/repos/os/include/file_system_session/client.h index cdb2e0b13..c5388f132 100644 --- a/repos/os/include/file_system_session/client.h +++ b/repos/os/include/file_system_session/client.h @@ -49,7 +49,7 @@ class File_system::Session_client : public Genode::Rpc_client ** File-system session interface ** ***********************************/ - Tx::Source *tx() { return _tx.source(); } + Tx::Source *tx() override { return _tx.source(); } void sigh_ready_to_submit(Genode::Signal_context_capability sigh) { diff --git a/repos/os/include/gpio/component.h b/repos/os/include/gpio/component.h index da78602aa..9bbbf4e7b 100644 --- a/repos/os/include/gpio/component.h +++ b/repos/os/include/gpio/component.h @@ -74,11 +74,11 @@ class Gpio::Session_component : public Genode::Rpc_object ** Gpio::Session interface ** *****************************/ - void direction(Direction d) { _driver.direction(_pin, (d == IN)); } - void write(bool level) { _driver.write(_pin, level); } - bool read() { return _driver.read(_pin); } + void direction(Direction d) override { _driver.direction(_pin, (d == IN)); } + void write(bool level) override { _driver.write(_pin, level); } + bool read() override { return _driver.read(_pin); } - void debouncing(unsigned int us) + void debouncing(unsigned int us) override { if (us) { _driver.debounce_time(_pin, us); @@ -87,7 +87,7 @@ class Gpio::Session_component : public Genode::Rpc_object _driver.debounce_enable(_pin, false); } - Genode::Irq_session_capability irq_session(Irq_type type) + Genode::Irq_session_capability irq_session(Irq_type type) override { switch (type) { case HIGH_LEVEL: @@ -119,7 +119,7 @@ class Gpio::Root : public Genode::Root_component protected: - Session_component *_create_session(const char *args) + Session_component *_create_session(const char *args) override { unsigned long pin = Genode::Arg_string::find_arg(args, "gpio").ulong_value(0); diff --git a/repos/os/include/nic/component.h b/repos/os/include/nic/component.h index 4f6a59b42..f272e3aed 100644 --- a/repos/os/include/nic/component.h +++ b/repos/os/include/nic/component.h @@ -141,7 +141,7 @@ class Nic::Session_component : Communication_buffers, public Session_rpc_object _rx.sigh_ack_avail(_packet_stream_dispatcher); } - void link_state_sigh(Genode::Signal_context_capability sigh) + void link_state_sigh(Genode::Signal_context_capability sigh) override { _link_state_sigh = sigh; } @@ -149,12 +149,12 @@ class Nic::Session_component : Communication_buffers, public Session_rpc_object /** * Return the current link state */ - virtual bool link_state() = 0; + bool link_state() override = 0; /** * Return the MAC address of the device */ - virtual Mac_address mac_address() = 0; + Mac_address mac_address() override = 0; }; diff --git a/repos/os/include/nic/root.h b/repos/os/include/nic/root.h index 3494c496e..e8dc23b5b 100644 --- a/repos/os/include/nic/root.h +++ b/repos/os/include/nic/root.h @@ -35,7 +35,7 @@ class Nic::Root : public Genode::Root_component Mac_address mac_address() override { return call(); } - Tx *tx_channel() { return &_tx; } - Rx *rx_channel() { return &_rx; } - Tx::Source *tx() { return _tx.source(); } - Rx::Sink *rx() { return _rx.sink(); } + Tx *tx_channel() override { return &_tx; } + Rx *rx_channel() override { return &_rx; } + Tx::Source *tx() override { return _tx.source(); } + Rx::Sink *rx() override { return _rx.sink(); } void link_state_sigh(Genode::Signal_context_capability sigh) override { diff --git a/repos/os/include/nitpicker_session/connection.h b/repos/os/include/nitpicker_session/connection.h index e91826801..c4072dc55 100644 --- a/repos/os/include/nitpicker_session/connection.h +++ b/repos/os/include/nitpicker_session/connection.h @@ -92,7 +92,7 @@ class Nitpicker::Connection : public Genode::Connection, _input(*Genode::env_deprecated()->rm_session(), input_session()) { } - void buffer(Framebuffer::Mode mode, bool use_alpha) + void buffer(Framebuffer::Mode mode, bool use_alpha) override { Genode::size_t const needed = ram_quota(mode, use_alpha); Genode::size_t const upgrade = needed > _session_quota diff --git a/repos/os/include/os/child_policy_dynamic_rom.h b/repos/os/include/os/child_policy_dynamic_rom.h index 2a305eef2..1b0db25a6 100644 --- a/repos/os/include/os/child_policy_dynamic_rom.h +++ b/repos/os/include/os/child_policy_dynamic_rom.h @@ -134,7 +134,7 @@ class Genode::Child_policy_dynamic_rom_file : public Rpc_object, ** ROM session interface ** ***************************/ - Rom_dataspace_capability dataspace() + Rom_dataspace_capability dataspace() override { Lock::Guard guard(_lock); @@ -156,7 +156,7 @@ class Genode::Child_policy_dynamic_rom_file : public Rpc_object, return static_cap_cast(ds_cap); } - void sigh(Signal_context_capability cap) { _sigh_cap = cap; } + void sigh(Signal_context_capability cap) override { _sigh_cap = cap; } /*********************** diff --git a/repos/os/include/packet_stream_rx/client.h b/repos/os/include/packet_stream_rx/client.h index 6c5cd417c..1d5c3134d 100644 --- a/repos/os/include/packet_stream_rx/client.h +++ b/repos/os/include/packet_stream_rx/client.h @@ -56,13 +56,13 @@ class Packet_stream_rx::Client : public Genode::Rpc_client sigh_packet_avail(_sink.sigh_packet_avail()); } - void sigh_ready_to_ack(Genode::Signal_context_capability sigh) { + void sigh_ready_to_ack(Genode::Signal_context_capability sigh) override { Base::template call(sigh); } - void sigh_packet_avail(Genode::Signal_context_capability sigh) { + void sigh_packet_avail(Genode::Signal_context_capability sigh) override { Base::template call(sigh); } - typename CHANNEL::Sink *sink() { return &_sink; } + typename CHANNEL::Sink *sink() override { return &_sink; } }; #endif /* _INCLUDE__PACKET_STREAM_RX__CLIENT_H_ */ diff --git a/repos/os/include/packet_stream_rx/rpc_object.h b/repos/os/include/packet_stream_rx/rpc_object.h index 0ebeadca8..8366689ad 100644 --- a/repos/os/include/packet_stream_rx/rpc_object.h +++ b/repos/os/include/packet_stream_rx/rpc_object.h @@ -100,10 +100,10 @@ class Packet_stream_rx::Rpc_object : public Genode::Rpc_object sigh_ack_avail(_source.sigh_ack_avail()); } - void sigh_ready_to_submit(Genode::Signal_context_capability sigh) { + void sigh_ready_to_submit(Genode::Signal_context_capability sigh) override { Base::template call(sigh); } - void sigh_ack_avail(Genode::Signal_context_capability sigh) { + void sigh_ack_avail(Genode::Signal_context_capability sigh) override { Base::template call(sigh); } - typename CHANNEL::Source *source() { return &_source; } + typename CHANNEL::Source *source() override { return &_source; } }; #endif /* _INCLUDE__PACKET_STREAM_TX__CLIENT_H_ */ diff --git a/repos/os/include/packet_stream_tx/rpc_object.h b/repos/os/include/packet_stream_tx/rpc_object.h index 719741aa6..02fdf4bbe 100644 --- a/repos/os/include/packet_stream_tx/rpc_object.h +++ b/repos/os/include/packet_stream_tx/rpc_object.h @@ -97,16 +97,16 @@ class Packet_stream_tx::Rpc_object : public Genode::Rpc_object Session_client(Genode::Capability cap) : Genode::Rpc_client(cap) {} - Timestamp current_time() { return call(); } + Timestamp current_time() override { return call(); } }; #endif /* _INCLUDE__RTC_SESSION__CLIENT_H_ */ diff --git a/repos/os/include/spec/rpi/platform_session/client.h b/repos/os/include/spec/rpi/platform_session/client.h index 846126373..9e998385d 100644 --- a/repos/os/include/spec/rpi/platform_session/client.h +++ b/repos/os/include/spec/rpi/platform_session/client.h @@ -34,7 +34,7 @@ struct Platform::Client : Genode::Rpc_client void power_state(Power power, bool enable) override { call(power, enable); } - uint32_t clock_rate(Clock clock) { + uint32_t clock_rate(Clock clock) override { return call(clock); } }; diff --git a/repos/os/include/terminal/char_cell_array_character_screen.h b/repos/os/include/terminal/char_cell_array_character_screen.h index 7d067623f..53b589764 100644 --- a/repos/os/include/terminal/char_cell_array_character_screen.h +++ b/repos/os/include/terminal/char_cell_array_character_screen.h @@ -183,7 +183,7 @@ class Char_cell_array_character_screen : public Terminal::Character_screen _cursor_pos.y = Genode::min(_boundary.height - 1, pos.y); } - void output(Terminal::Character c) + void output(Terminal::Character c) override { if (_irm == INSERT) _missing("insert mode"); @@ -346,7 +346,7 @@ class Char_cell_array_character_screen : public Terminal::Character_screen /** * Erase character */ - void ech(int pn) + void ech(int pn) override { int y = _cursor_pos.y; int x = _cursor_pos.x; @@ -562,13 +562,13 @@ class Char_cell_array_character_screen : public Terminal::Character_screen */ } - void vpa(int pn) + void vpa(int pn) override { Cursor_guard guard(*this); _cursor_pos.x = pn; } - void vpb(int pn) + void vpb(int pn) override { Cursor_guard guard(*this); _cursor_pos.x = Genode::min(0, _cursor_pos.x - pn); @@ -621,7 +621,7 @@ class Char_cell_array_character_screen : public Terminal::Character_screen void scs_g1(int charset) override { _missing(__func__, charset); } - void reverse_index() + void reverse_index() override { Cursor_guard guard(*this); if (_cursor_pos.y) { diff --git a/repos/os/include/terminal_session/client.h b/repos/os/include/terminal_session/client.h index 733198b12..4b9372de2 100644 --- a/repos/os/include/terminal_session/client.h +++ b/repos/os/include/terminal_session/client.h @@ -52,11 +52,11 @@ class Terminal::Session_client : public Genode::Rpc_client _io_buffer(*Genode::env_deprecated()->rm_session(), call()) { } - Size size() { return call(); } + Size size() override { return call(); } - bool avail() { return call(); } + bool avail() override { return call(); } - Genode::size_t read(void *buf, Genode::size_t buf_size) + Genode::size_t read(void *buf, Genode::size_t buf_size) override { Genode::Lock::Guard _guard(_lock); @@ -70,7 +70,7 @@ class Terminal::Session_client : public Genode::Rpc_client return num_bytes; } - Genode::size_t write(void const *buf, Genode::size_t num_bytes) + Genode::size_t write(void const *buf, Genode::size_t num_bytes) override { Genode::Lock::Guard _guard(_lock); @@ -97,17 +97,17 @@ class Terminal::Session_client : public Genode::Rpc_client return written_bytes; } - void connected_sigh(Genode::Signal_context_capability cap) + void connected_sigh(Genode::Signal_context_capability cap) override { call(cap); } - void read_avail_sigh(Genode::Signal_context_capability cap) + void read_avail_sigh(Genode::Signal_context_capability cap) override { call(cap); } - void size_changed_sigh(Genode::Signal_context_capability cap) + void size_changed_sigh(Genode::Signal_context_capability cap) override { call(cap); } diff --git a/repos/os/include/uart_session/client.h b/repos/os/include/uart_session/client.h index 2d11d341e..92b2c0948 100644 --- a/repos/os/include/uart_session/client.h +++ b/repos/os/include/uart_session/client.h @@ -44,7 +44,7 @@ class Uart::Session_client : public Genode::Rpc_client ** UART interface ** ********************/ - void baud_rate(Genode::size_t bits_per_second) + void baud_rate(Genode::size_t bits_per_second) override { call(bits_per_second); } @@ -54,31 +54,31 @@ class Uart::Session_client : public Genode::Rpc_client ** Terminal interface ** ************************/ - Size size() { return _terminal.size(); } + Size size() override { return _terminal.size(); } - bool avail() { return _terminal.avail(); } + bool avail() override { return _terminal.avail(); } - Genode::size_t read(void *buf, Genode::size_t buf_size) + Genode::size_t read(void *buf, Genode::size_t buf_size) override { return _terminal.read(buf, buf_size); } - Genode::size_t write(void const *buf, Genode::size_t num_bytes) + Genode::size_t write(void const *buf, Genode::size_t num_bytes) override { return _terminal.write(buf, num_bytes); } - void connected_sigh(Genode::Signal_context_capability cap) + void connected_sigh(Genode::Signal_context_capability cap) override { _terminal.connected_sigh(cap); } - void read_avail_sigh(Genode::Signal_context_capability cap) + void read_avail_sigh(Genode::Signal_context_capability cap) override { _terminal.read_avail_sigh(cap); } - void size_changed_sigh(Genode::Signal_context_capability cap) + void size_changed_sigh(Genode::Signal_context_capability cap) override { _terminal.size_changed_sigh(cap); } diff --git a/repos/os/include/usb_session/client.h b/repos/os/include/usb_session/client.h index a2b639290..110c3ae14 100644 --- a/repos/os/include/usb_session/client.h +++ b/repos/os/include/usb_session/client.h @@ -69,7 +69,7 @@ class Usb::Session_client : public Genode::Rpc_client call(device_descr, config_descr); } - unsigned alt_settings(unsigned index) + unsigned alt_settings(unsigned index) override { return call(index); } @@ -88,12 +88,12 @@ class Usb::Session_client : public Genode::Rpc_client call(interface_num, alt_setting, endpoint_num, endpoint_descr); } - void claim_interface(unsigned interface_num) + void claim_interface(unsigned interface_num) override { call(interface_num); } - void release_interface(unsigned interface_num) + void release_interface(unsigned interface_num) override { call(interface_num); } diff --git a/repos/os/include/vfs/single_file_system.h b/repos/os/include/vfs/single_file_system.h index d44674720..a06a6856b 100644 --- a/repos/os/include/vfs/single_file_system.h +++ b/repos/os/include/vfs/single_file_system.h @@ -279,7 +279,7 @@ class Vfs::Single_file_system : public File_system return FTRUNCATE_ERR_NO_PERM; } - Sync_result complete_sync(Vfs_handle *vfs_handle) + Sync_result complete_sync(Vfs_handle *vfs_handle) override { Single_vfs_handle *handle = static_cast(vfs_handle); diff --git a/repos/os/src/app/block_tester/test_ping_pong.h b/repos/os/src/app/block_tester/test_ping_pong.h index 811b747c3..40a805803 100644 --- a/repos/os/src/app/block_tester/test_ping_pong.h +++ b/repos/os/src/app/block_tester/test_ping_pong.h @@ -218,7 +218,7 @@ struct Test::Ping_pong : Test_base _bytes, _rx, _tx, _size, _block_size); } - char const *name() const { return "ping_pong"; } + char const *name() const override { return "ping_pong"; } }; diff --git a/repos/os/src/app/block_tester/test_random.h b/repos/os/src/app/block_tester/test_random.h index 0c4209f44..5599e074d 100644 --- a/repos/os/src/app/block_tester/test_random.h +++ b/repos/os/src/app/block_tester/test_random.h @@ -310,7 +310,7 @@ struct Test::Random : Test_base _bytes, _rx, _tx, _size, _block_size); } - char const *name() const { return "random"; } + char const *name() const override { return "random"; } }; #endif /* _TEST_RANDOM_H_ */ diff --git a/repos/os/src/app/block_tester/test_replay.h b/repos/os/src/app/block_tester/test_replay.h index 757ba58a3..85b89f778 100644 --- a/repos/os/src/app/block_tester/test_replay.h +++ b/repos/os/src/app/block_tester/test_replay.h @@ -199,7 +199,7 @@ struct Test::Replay : Test_base _bytes, _rx, _tx, 0u, _block_size); } - char const *name() const { return "replay"; } + char const *name() const override { return "replay"; } }; diff --git a/repos/os/src/app/block_tester/test_sequential.h b/repos/os/src/app/block_tester/test_sequential.h index bd52bfd07..71ed7fe4b 100644 --- a/repos/os/src/app/block_tester/test_sequential.h +++ b/repos/os/src/app/block_tester/test_sequential.h @@ -239,7 +239,7 @@ struct Test::Sequential : Test_base _bytes, _rx, _tx, _size, _block_size); } - char const *name() const { return "sequential"; } + char const *name() const override { return "sequential"; } }; #endif /* _TEST_SEQUENTIAL_H_ */ diff --git a/repos/os/src/app/cli_monitor/help_command.h b/repos/os/src/app/cli_monitor/help_command.h index 2e2848deb..691ed30cd 100644 --- a/repos/os/src/app/cli_monitor/help_command.h +++ b/repos/os/src/app/cli_monitor/help_command.h @@ -21,7 +21,7 @@ struct Cli_monitor::Help_command : Command { Help_command() : Command("help", "brief help information") { } - void execute(Command_line &, Terminal::Session &terminal) + void execute(Command_line &, Terminal::Session &terminal) override { tprintf(terminal, " Press [tab] for a list of commands.\n"); tprintf(terminal, " When given a command, press [tab] for a list of arguments.\n"); diff --git a/repos/os/src/app/cli_monitor/kill_command.h b/repos/os/src/app/cli_monitor/kill_command.h index 865830c9b..bd8875625 100644 --- a/repos/os/src/app/cli_monitor/kill_command.h +++ b/repos/os/src/app/cli_monitor/kill_command.h @@ -52,7 +52,7 @@ struct Cli_monitor::Kill_command : Command _children.for_each_child_name(child_name_fn); } - void execute(Command_line &cmd, Terminal::Session &terminal) + void execute(Command_line &cmd, Terminal::Session &terminal) override { bool const kill_all = cmd.parameter_exists("--all"); diff --git a/repos/os/src/app/cli_monitor/ram_command.h b/repos/os/src/app/cli_monitor/ram_command.h index 1bf7387ef..a080db7df 100644 --- a/repos/os/src/app/cli_monitor/ram_command.h +++ b/repos/os/src/app/cli_monitor/ram_command.h @@ -97,7 +97,7 @@ struct Cli_monitor::Ram_command : Command _children.for_each_child_name(child_name_fn); } - void execute(Command_line &cmd, Terminal::Session &terminal) + void execute(Command_line &cmd, Terminal::Session &terminal) override { char label[128]; label[0] = 0; diff --git a/repos/os/src/app/cli_monitor/start_command.h b/repos/os/src/app/cli_monitor/start_command.h index ccdac8774..e217c59ee 100644 --- a/repos/os/src/app/cli_monitor/start_command.h +++ b/repos/os/src/app/cli_monitor/start_command.h @@ -223,7 +223,7 @@ class Cli_monitor::Start_command : public Command _subsystem_configs.for_each_config(process_subsystem_config_fn); } - void execute(Command_line &cmd, Terminal::Session &terminal) + void execute(Command_line &cmd, Terminal::Session &terminal) override { char name[128]; name[0] = 0; diff --git a/repos/os/src/app/cli_monitor/status_command.h b/repos/os/src/app/cli_monitor/status_command.h index 98c2bdb0e..929a56d6f 100644 --- a/repos/os/src/app/cli_monitor/status_command.h +++ b/repos/os/src/app/cli_monitor/status_command.h @@ -32,7 +32,7 @@ struct Cli_monitor::Status_command : Command _children(children), _ram(ram) { } - void execute(Command_line &, Terminal::Session &terminal) + void execute(Command_line &, Terminal::Session &terminal) override { using Terminal::tprintf; diff --git a/repos/os/src/app/cli_monitor/yield_command.h b/repos/os/src/app/cli_monitor/yield_command.h index ee382c7bc..bc0e2ebdf 100644 --- a/repos/os/src/app/cli_monitor/yield_command.h +++ b/repos/os/src/app/cli_monitor/yield_command.h @@ -46,7 +46,7 @@ struct Cli_monitor::Yield_command : Command _children.for_each_child_name(child_name_fn); } - void execute(Command_line &cmd, Terminal::Session &terminal) + void execute(Command_line &cmd, Terminal::Session &terminal) override { char label[128]; label[0] = 0; diff --git a/repos/os/src/drivers/ahci/ahci.cc b/repos/os/src/drivers/ahci/ahci.cc index fdb16017c..e77321adf 100644 --- a/repos/os/src/drivers/ahci/ahci.cc +++ b/repos/os/src/drivers/ahci/ahci.cc @@ -37,7 +37,7 @@ struct Ahci Timer_delayer(Genode::Env &env) : Timer::Connection(env) { } - void usleep(unsigned us) { Timer::Connection::usleep(us); } + void usleep(unsigned us) override { Timer::Connection::usleep(us); } } _delayer { env }; Ahci_root &root; diff --git a/repos/os/src/drivers/ahci/ata_driver.h b/repos/os/src/drivers/ahci/ata_driver.h index 5e71f9aac..31df177b9 100644 --- a/repos/os/src/drivers/ahci/ata_driver.h +++ b/repos/os/src/drivers/ahci/ata_driver.h @@ -371,7 +371,7 @@ struct Ata_driver : Port_driver ** Block::Driver interface ** *****************************/ - bool dma_enabled() { return true; }; + bool dma_enabled() override { return true; }; Block::Session::Operations ops() override { diff --git a/repos/os/src/drivers/ahci/atapi_driver.h b/repos/os/src/drivers/ahci/atapi_driver.h index 12b3a6d01..cd74ef5f1 100644 --- a/repos/os/src/drivers/ahci/atapi_driver.h +++ b/repos/os/src/drivers/ahci/atapi_driver.h @@ -163,7 +163,7 @@ struct Atapi_driver : Port_driver ** Block::Driver interface ** *****************************/ - bool dma_enabled() { return true; }; + bool dma_enabled() override { return true; }; Block::Session::Operations ops() override { diff --git a/repos/os/src/drivers/ahci/main.cc b/repos/os/src/drivers/ahci/main.cc index 188381974..ccfeaa19c 100644 --- a/repos/os/src/drivers/ahci/main.cc +++ b/repos/os/src/drivers/ahci/main.cc @@ -36,12 +36,12 @@ struct Block::Factory : Driver_factory { long device_num; - Block::Driver *create() + Block::Driver *create() override { return Ahci_driver::claim_port(device_num); } - void destroy(Block::Driver *) + void destroy(Block::Driver *) override { Ahci_driver::free_port(device_num); } @@ -76,7 +76,7 @@ class Block::Root_multiple_clients : public Root_component< ::Session_component> protected: - ::Session_component *_create_session(const char *args) + ::Session_component *_create_session(const char *args) override { Session_label const label = label_from_args(args); Session_policy const policy(label, _config); @@ -136,7 +136,7 @@ class Block::Root_multiple_clients : public Root_component< ::Session_component> return session; } - void _destroy_session(::Session_component *session) + void _destroy_session(::Session_component *session) override { Driver_factory &factory = session->factory(); Genode::destroy(&_alloc, session); diff --git a/repos/os/src/drivers/ahci/spec/exynos5/platform.cc b/repos/os/src/drivers/ahci/spec/exynos5/platform.cc index fce602654..6687c9668 100644 --- a/repos/os/src/drivers/ahci/spec/exynos5/platform.cc +++ b/repos/os/src/drivers/ahci/spec/exynos5/platform.cc @@ -386,7 +386,7 @@ struct Exynos5_hba : Platform::Hba return env.ram().alloc(size, UNCACHED); } - void free_dma_buffer(Ram_dataspace_capability ds) + void free_dma_buffer(Ram_dataspace_capability ds) override { env.ram().free(ds); } diff --git a/repos/os/src/drivers/ahci/spec/x86/platform.cc b/repos/os/src/drivers/ahci/spec/x86/platform.cc index ea169334b..47aa46d96 100644 --- a/repos/os/src/drivers/ahci/spec/x86/platform.cc +++ b/repos/os/src/drivers/ahci/spec/x86/platform.cc @@ -142,7 +142,7 @@ struct X86_hba : Platform::Hba }); } - void free_dma_buffer(Genode::Ram_dataspace_capability ds) + void free_dma_buffer(Genode::Ram_dataspace_capability ds) override { pci.free_dma_buffer(ds); } diff --git a/repos/os/src/drivers/audio/spec/linux/main.cc b/repos/os/src/drivers/audio/spec/linux/main.cc index fafed144d..c00c14d4d 100644 --- a/repos/os/src/drivers/audio/spec/linux/main.cc +++ b/repos/os/src/drivers/audio/spec/linux/main.cc @@ -245,7 +245,7 @@ class Audio_out::Root : public Audio_out::Root_component protected: - Session_component *_create_session(const char *args) + Session_component *_create_session(const char *args) override { char channel_name[16]; Channel_number channel_number = INVALID; diff --git a/repos/os/src/drivers/framebuffer/spec/imx53/main.cc b/repos/os/src/drivers/framebuffer/spec/imx53/main.cc index 132f01edb..9b5b35101 100644 --- a/repos/os/src/drivers/framebuffer/spec/imx53/main.cc +++ b/repos/os/src/drivers/framebuffer/spec/imx53/main.cc @@ -115,7 +115,7 @@ class Framebuffer::Session_component : _refresh_buffered(x, y, w, h); } - void overlay(Genode::addr_t phys_base, int x, int y, int alpha) { + void overlay(Genode::addr_t phys_base, int x, int y, int alpha) override { _ipu.overlay(phys_base, x, y, alpha); } }; diff --git a/repos/os/src/drivers/gpio/spec/exynos4/driver.h b/repos/os/src/drivers/gpio/spec/exynos4/driver.h index 7643d356e..9861fc848 100644 --- a/repos/os/src/drivers/gpio/spec/exynos4/driver.h +++ b/repos/os/src/drivers/gpio/spec/exynos4/driver.h @@ -93,7 +93,7 @@ class Gpio::Odroid_x2_driver : public Driver ** Gpio::Driver interface ** ******************************/ - void direction(unsigned gpio_pin, bool input) + void direction(unsigned gpio_pin, bool input) override { int pos_gpio = gpio_bank_index(gpio_pin, true); int sum_gpio = gpio_bank_index(gpio_pin, false); @@ -104,7 +104,7 @@ class Gpio::Odroid_x2_driver : public Driver reg->set_direction(gpio, input, offset); } - void write(unsigned gpio_pin, bool level) + void write(unsigned gpio_pin, bool level) override { int pos_gpio = gpio_bank_index(gpio_pin, true); int sum_gpio = gpio_bank_index(gpio_pin, false); @@ -115,7 +115,7 @@ class Gpio::Odroid_x2_driver : public Driver reg->write_pin(gpio, level, offset); } - bool read(unsigned gpio_pin) + bool read(unsigned gpio_pin) override { int pos_gpio = gpio_bank_index(gpio_pin, true); int sum_gpio = gpio_bank_index(gpio_pin, false); @@ -127,13 +127,13 @@ class Gpio::Odroid_x2_driver : public Driver } - void debounce_enable(unsigned /* gpio */, bool /* enable */) { + void debounce_enable(unsigned /* gpio */, bool /* enable */) override { Genode::warning("debounce_enable not supported!"); } - void debounce_time(unsigned /* gpio */, unsigned long /* us */) { + void debounce_time(unsigned /* gpio */, unsigned long /* us */) override { Genode::warning("debounce_time not supported!"); } - void falling_detect(unsigned gpio_pin) + void falling_detect(unsigned gpio_pin) override { int pos_gpio = gpio_bank_index(gpio_pin, true); int sum_gpio = gpio_bank_index(gpio_pin, false); @@ -144,7 +144,7 @@ class Gpio::Odroid_x2_driver : public Driver reg->set_enable_triggers(gpio, offset, FALLING); } - void rising_detect(unsigned gpio_pin) + void rising_detect(unsigned gpio_pin) override { int pos_gpio = gpio_bank_index(gpio_pin, true); int sum_gpio = gpio_bank_index(gpio_pin, false); @@ -156,7 +156,7 @@ class Gpio::Odroid_x2_driver : public Driver } - void high_detect(unsigned gpio_pin) + void high_detect(unsigned gpio_pin) override { int pos_gpio = gpio_bank_index(gpio_pin, true); int sum_gpio = gpio_bank_index(gpio_pin, false); @@ -168,7 +168,7 @@ class Gpio::Odroid_x2_driver : public Driver } - void low_detect(unsigned gpio_pin) + void low_detect(unsigned gpio_pin) override { int pos_gpio = gpio_bank_index(gpio_pin, true); int sum_gpio = gpio_bank_index(gpio_pin, false); @@ -180,24 +180,24 @@ class Gpio::Odroid_x2_driver : public Driver } - void irq_enable(unsigned gpio_pin, bool enable) + void irq_enable(unsigned gpio_pin, bool enable) override { _irq_enabled[gpio_pin] = enable; } - void ack_irq(unsigned /* gpio_pin */) + void ack_irq(unsigned /* gpio_pin */) override { _irq.ack_irq(); } void register_signal(unsigned gpio_pin, - Genode::Signal_context_capability cap) + Genode::Signal_context_capability cap) override { _sig_cap[gpio_pin] = cap; } - void unregister_signal(unsigned gpio_pin) + void unregister_signal(unsigned gpio_pin) override { Genode::Signal_context_capability cap; _sig_cap[gpio_pin] = cap; @@ -214,7 +214,7 @@ class Gpio::Odroid_x2_driver : public Driver return pos ? i : sum; } - bool gpio_valid(unsigned gpio) { return gpio < (MAX_PINS); } + bool gpio_valid(unsigned gpio) override { return gpio < (MAX_PINS); } }; #endif /* _DRIVER_H_ */ diff --git a/repos/os/src/drivers/gpio/spec/imx/driver.h b/repos/os/src/drivers/gpio/spec/imx/driver.h index f89b9c958..b50a93b65 100644 --- a/repos/os/src/drivers/gpio/spec/imx/driver.h +++ b/repos/os/src/drivers/gpio/spec/imx/driver.h @@ -191,14 +191,14 @@ class Imx_driver : public Gpio::Driver ** Gpio::Driver interface ** ******************************/ - void direction(unsigned gpio, bool input) + void direction(unsigned gpio, bool input) override { Gpio_reg *gpio_reg = _gpio_bank(gpio)->regs(); gpio_reg->write(input ? 0 : 1, _gpio_index(gpio)); } - void write(unsigned gpio, bool level) + void write(unsigned gpio, bool level) override { Gpio_reg *gpio_reg = _gpio_bank(gpio)->regs(); @@ -206,72 +206,72 @@ class Imx_driver : public Gpio::Driver _gpio_index(gpio)); } - bool read(unsigned gpio) + bool read(unsigned gpio) override { Gpio_reg *gpio_reg = _gpio_bank(gpio)->regs(); return gpio_reg->read(_gpio_index(gpio)); } - void debounce_enable(unsigned /* gpio */, bool /* enable */) + void debounce_enable(unsigned /* gpio */, bool /* enable */) override { Genode::warning("debounce enable not supported"); } - void debounce_time(unsigned /* gpio */, unsigned long /* us */) + void debounce_time(unsigned /* gpio */, unsigned long /* us */) override { Genode::warning("debounce time not supported"); } - void falling_detect(unsigned gpio) + void falling_detect(unsigned gpio) override { Gpio_reg *gpio_reg = _gpio_bank(gpio)->regs(); gpio_reg->write(Gpio_reg::Int_conf::FAL_EDGE, _gpio_index(gpio)); } - void rising_detect(unsigned gpio) + void rising_detect(unsigned gpio) override { Gpio_reg *gpio_reg = _gpio_bank(gpio)->regs(); gpio_reg->write(Gpio_reg::Int_conf::RIS_EDGE, _gpio_index(gpio)); } - void high_detect(unsigned gpio) + void high_detect(unsigned gpio) override { Gpio_reg *gpio_reg = _gpio_bank(gpio)->regs(); gpio_reg->write(Gpio_reg::Int_conf::HIGH_LEVEL, _gpio_index(gpio)); } - void low_detect(unsigned gpio) + void low_detect(unsigned gpio) override { Gpio_reg *gpio_reg = _gpio_bank(gpio)->regs(); gpio_reg->write(Gpio_reg::Int_conf::LOW_LEVEL, _gpio_index(gpio)); } - void irq_enable(unsigned gpio, bool enable) + void irq_enable(unsigned gpio, bool enable) override { _gpio_bank(gpio)->irq(_gpio_index(gpio), enable); } - void ack_irq(unsigned gpio) + void ack_irq(unsigned gpio) override { _gpio_bank(gpio)->ack_irq(_gpio_index(gpio)); } void register_signal(unsigned gpio, - Genode::Signal_context_capability cap) + Genode::Signal_context_capability cap) override { _gpio_bank(gpio)->sigh(_gpio_index(gpio), cap); } - void unregister_signal(unsigned gpio) + void unregister_signal(unsigned gpio) override { Genode::Signal_context_capability cap; _gpio_bank(gpio)->sigh(_gpio_index(gpio), cap); } - bool gpio_valid(unsigned gpio) { return gpio < (MAX_PINS*MAX_BANKS); } + bool gpio_valid(unsigned gpio) override { return gpio < (MAX_PINS*MAX_BANKS); } }; #endif /* _DRIVERS__GPIO__SPEC__IMX53__DRIVER_H_ */ diff --git a/repos/os/src/drivers/gpio/spec/omap4/driver.h b/repos/os/src/drivers/gpio/spec/omap4/driver.h index 4b530f9c5..c704fbcfe 100644 --- a/repos/os/src/drivers/gpio/spec/omap4/driver.h +++ b/repos/os/src/drivers/gpio/spec/omap4/driver.h @@ -152,13 +152,13 @@ class Omap4_driver : public Gpio::Driver ** Gpio::Driver interface ** ******************************/ - void direction(unsigned gpio, bool input) + void direction(unsigned gpio, bool input) override { Gpio_reg *gpio_reg = _gpio_bank(gpio)->regs(); gpio_reg->write(input ? 1 : 0, _gpio_index(gpio)); } - void write(unsigned gpio, bool level) + void write(unsigned gpio, bool level) override { Gpio_reg *gpio_reg = _gpio_bank(gpio)->regs(); @@ -168,20 +168,20 @@ class Omap4_driver : public Gpio::Driver gpio_reg->write(1 << _gpio_index(gpio)); } - bool read(unsigned gpio) + bool read(unsigned gpio) override { Gpio_reg *gpio_reg = _gpio_bank(gpio)->regs(); return gpio_reg->read(_gpio_index(gpio)); } - void debounce_enable(unsigned gpio, bool enable) + void debounce_enable(unsigned gpio, bool enable) override { Gpio_reg *gpio_reg = _gpio_bank(gpio)->regs(); gpio_reg->write(enable ? 1 : 0, _gpio_index(gpio)); } - void debounce_time(unsigned gpio, unsigned long us) + void debounce_time(unsigned gpio, unsigned long us) override { unsigned char debounce; @@ -196,7 +196,7 @@ class Omap4_driver : public Gpio::Driver gpio_reg->write(debounce); } - void falling_detect(unsigned gpio) + void falling_detect(unsigned gpio) override { Gpio_reg *gpio_reg = _gpio_bank(gpio)->regs(); gpio_reg->write (0, _gpio_index(gpio)); @@ -205,7 +205,7 @@ class Omap4_driver : public Gpio::Driver gpio_reg->write (0, _gpio_index(gpio)); } - void rising_detect(unsigned gpio) + void rising_detect(unsigned gpio) override { Gpio_reg *gpio_reg = _gpio_bank(gpio)->regs(); gpio_reg->write (0, _gpio_index(gpio)); @@ -214,7 +214,7 @@ class Omap4_driver : public Gpio::Driver gpio_reg->write (1, _gpio_index(gpio)); } - void high_detect(unsigned gpio) + void high_detect(unsigned gpio) override { Gpio_reg *gpio_reg = _gpio_bank(gpio)->regs(); gpio_reg->write (0, _gpio_index(gpio)); @@ -223,7 +223,7 @@ class Omap4_driver : public Gpio::Driver gpio_reg->write (0, _gpio_index(gpio)); } - void low_detect(unsigned gpio) + void low_detect(unsigned gpio) override { Gpio_reg *gpio_reg = _gpio_bank(gpio)->regs(); gpio_reg->write (1, _gpio_index(gpio)); @@ -232,28 +232,28 @@ class Omap4_driver : public Gpio::Driver gpio_reg->write (0, _gpio_index(gpio)); } - void irq_enable(unsigned gpio, bool enable) + void irq_enable(unsigned gpio, bool enable) override { _gpio_bank(gpio)->irq(_gpio_index(gpio), enable); } - void ack_irq(unsigned gpio) + void ack_irq(unsigned gpio) override { _gpio_bank(gpio)->ack_irq(_gpio_index(gpio)); } void register_signal(unsigned gpio, - Genode::Signal_context_capability cap) + Genode::Signal_context_capability cap) override { _gpio_bank(gpio)->sigh(_gpio_index(gpio), cap); } - void unregister_signal(unsigned gpio) + void unregister_signal(unsigned gpio) override { Genode::Signal_context_capability cap; _gpio_bank(gpio)->sigh(_gpio_index(gpio), cap); } - bool gpio_valid(unsigned gpio) { return gpio < (MAX_PINS*MAX_BANKS); } + bool gpio_valid(unsigned gpio) override { return gpio < (MAX_PINS*MAX_BANKS); } }; #endif /* _DRIVERS__GPIO__SPEC__OMAP4__DRIVER_H_ */ diff --git a/repos/os/src/drivers/gpio/spec/rpi/driver.h b/repos/os/src/drivers/gpio/spec/rpi/driver.h index 9032232c0..6a61008b1 100644 --- a/repos/os/src/drivers/gpio/spec/rpi/driver.h +++ b/repos/os/src/drivers/gpio/spec/rpi/driver.h @@ -85,9 +85,9 @@ class Gpio::Rpi_driver : public Driver ** Driver interface ** ******************************/ - bool gpio_valid(unsigned gpio) { return gpio < MAX_PINS; } + bool gpio_valid(unsigned gpio) override { return gpio < MAX_PINS; } - void direction(unsigned gpio, bool input) + void direction(unsigned gpio, bool input) override { if (!gpio_valid(gpio)) { _invalid_gpio(gpio); return; } @@ -98,7 +98,7 @@ class Gpio::Rpi_driver : public Driver _reg.set_gpio_function(gpio, f); } - void write(unsigned gpio, bool level) + void write(unsigned gpio, bool level) override { if (!gpio_valid(gpio)) { _invalid_gpio(gpio); return; } @@ -114,7 +114,7 @@ class Gpio::Rpi_driver : public Driver _reg.clear_gpio_level(gpio); } - bool read(unsigned gpio) + bool read(unsigned gpio) override { if (!gpio_valid(gpio)) { _invalid_gpio(gpio); return 0; } if(_reg.get_gpio_function(gpio) != Reg::FSEL_INPUT) @@ -123,13 +123,13 @@ class Gpio::Rpi_driver : public Driver return _reg.get_gpio_level(gpio); } - void debounce_enable(unsigned, bool) { + void debounce_enable(unsigned, bool) override { Genode::warning("debounce_enable not supported!"); } - void debounce_time(unsigned, unsigned long) { + void debounce_time(unsigned, unsigned long) override { Genode::warning("debounce_time not supported!"); } - void falling_detect(unsigned gpio) + void falling_detect(unsigned gpio) override { if (!gpio_valid(gpio)) { _invalid_gpio(gpio); return; } @@ -141,7 +141,7 @@ class Gpio::Rpi_driver : public Driver _reg.set_gpio_falling_detect(gpio); } - void rising_detect(unsigned gpio) + void rising_detect(unsigned gpio) override { if (!gpio_valid(gpio)) { _invalid_gpio(gpio); return; } @@ -153,7 +153,7 @@ class Gpio::Rpi_driver : public Driver _reg.set_gpio_rising_detect(gpio); } - void high_detect(unsigned gpio) + void high_detect(unsigned gpio) override { if (!gpio_valid(gpio)) { _invalid_gpio(gpio); return; } if (verbose) Genode::log("high_detect: gpio=", gpio); @@ -161,7 +161,7 @@ class Gpio::Rpi_driver : public Driver _reg.set_gpio_high_detect(gpio); } - void low_detect(unsigned gpio) + void low_detect(unsigned gpio) override { if (!gpio_valid(gpio)) { _invalid_gpio(gpio); return; } if (verbose) Genode::log("low_detect: gpio=", gpio); @@ -169,7 +169,7 @@ class Gpio::Rpi_driver : public Driver _reg.set_gpio_low_detect(gpio); } - void irq_enable(unsigned gpio, bool enable) + void irq_enable(unsigned gpio, bool enable) override { if (!gpio_valid(gpio)) { _invalid_gpio(gpio); return; } if (verbose) Genode::log("irq_enable: gpio=", gpio, " enable=", enable); @@ -177,7 +177,7 @@ class Gpio::Rpi_driver : public Driver _irq_enabled[gpio] = enable; } - void ack_irq(unsigned gpio) + void ack_irq(unsigned gpio) override { if (!gpio_valid(gpio)) { _invalid_gpio(gpio); return; } if (verbose) Genode::log("ack_irq: gpio=", gpio); @@ -187,7 +187,7 @@ class Gpio::Rpi_driver : public Driver } void register_signal(unsigned gpio, - Genode::Signal_context_capability cap) + Genode::Signal_context_capability cap) override { if (!gpio_valid(gpio)) { _invalid_gpio(gpio); return; } if (verbose) Genode::log("register_signal: gpio=", gpio); @@ -195,7 +195,7 @@ class Gpio::Rpi_driver : public Driver _sig_cap[gpio] = cap; } - void unregister_signal(unsigned gpio) + void unregister_signal(unsigned gpio) override { if (!gpio_valid(gpio)) { _invalid_gpio(gpio); return; } if (verbose) Genode::log("unregister_signal: gpio=", gpio); diff --git a/repos/os/src/drivers/gpio/spec/rpi/gpio.h b/repos/os/src/drivers/gpio/spec/rpi/gpio.h index af0e325e5..eb34d4108 100644 --- a/repos/os/src/drivers/gpio/spec/rpi/gpio.h +++ b/repos/os/src/drivers/gpio/spec/rpi/gpio.h @@ -118,7 +118,7 @@ class Gpio::Reg : Attached_io_mem_dataspace, Mmio /** * Implementation of 'Delayer' interface */ - void usleep(unsigned us) { Timer::Connection::usleep(us); } + void usleep(unsigned us) override { Timer::Connection::usleep(us); } } _delayer; diff --git a/repos/os/src/drivers/gpu/intel/main.cc b/repos/os/src/drivers/gpu/intel/main.cc index 4301ae9be..937d9fe91 100644 --- a/repos/os/src/drivers/gpu/intel/main.cc +++ b/repos/os/src/drivers/gpu/intel/main.cc @@ -95,7 +95,8 @@ struct Igd::Device Timer::Connection &_timer; Timer_delayer(Timer::Connection &timer) : _timer(timer) { } - void usleep(unsigned us) { _timer.usleep(us); } + void usleep(unsigned us) override { _timer.usleep(us); } + } _delayer { _timer }; /********* @@ -158,7 +159,7 @@ struct Igd::Device Pci_backend_alloc(Platform::Connection &pci) : _pci(pci) { } Genode::Ram_dataspace_capability alloc(Genode::Allocator_guard &guard, - Genode::size_t size) + Genode::size_t size) override { if (!guard.withdraw(size)) { throw Out_of_ram(); } @@ -175,7 +176,7 @@ struct Igd::Device throw Out_of_ram(); } } - void free(Genode::Allocator_guard &guard, Genode::Ram_dataspace_capability cap) + void free(Genode::Allocator_guard &guard, Genode::Ram_dataspace_capability cap) override { if (!cap.valid()) { Genode::error("could not free, capability invalid"); @@ -1704,7 +1705,7 @@ class Gpu::Root : public Gpu::Root_component protected: - Session_component *_create_session(char const *args) + Session_component *_create_session(char const *args) override { if (!_device || !_device->vgpu_avail()) { throw Genode::Service_denied(); @@ -1735,7 +1736,7 @@ class Gpu::Root : public Gpu::Root_component } catch (...) { throw Genode::Service_denied(); } } - void _upgrade_session(Session_component *s, char const *args) + void _upgrade_session(Session_component *s, char const *args) override { s->upgrade_ram_quota(_ram_quota(args)); @@ -1745,7 +1746,7 @@ class Gpu::Root : public Gpu::Root_component */ } - void _destroy_session(Session_component *s) + void _destroy_session(Session_component *s) override { if (s->vgpu_active()) { Genode::warning("vGPU active, reset device and hope for the best"); diff --git a/repos/os/src/drivers/gpu/intel/ppgtt_allocator.h b/repos/os/src/drivers/gpu/intel/ppgtt_allocator.h index e50238077..3bfb42d8e 100644 --- a/repos/os/src/drivers/gpu/intel/ppgtt_allocator.h +++ b/repos/os/src/drivers/gpu/intel/ppgtt_allocator.h @@ -50,7 +50,7 @@ class Igd::Ppgtt_allocator : public Genode::Translation_table_allocator ** Allocator interface ** *************************/ - bool alloc(size_t size, void **out_addr) + bool alloc(size_t size, void **out_addr) override { Genode::Ram_dataspace_capability ds = _backend.alloc(_guard, size); if (!ds.valid()) { return false; } @@ -59,7 +59,7 @@ class Igd::Ppgtt_allocator : public Genode::Translation_table_allocator return _map.add(ds, *out_addr); } - void free(void *addr, size_t) + void free(void *addr, size_t) override { if (addr == nullptr) { return; } @@ -80,14 +80,14 @@ class Igd::Ppgtt_allocator : public Genode::Translation_table_allocator ** Translation_table_allocator interface ** *******************************************/ - void *phys_addr(void *va) + void *phys_addr(void *va) override { if (va == nullptr) { return nullptr; } typename Utils::Address_map::Element *e = _map.phys_addr(va); return e ? (void*)e->pa : nullptr; } - void *virt_addr(void *pa) + void *virt_addr(void *pa) override { if (pa == nullptr) { return nullptr; } typename Utils::Address_map::Element *e = _map.virt_addr(pa); diff --git a/repos/os/src/drivers/input/dummy/main.cc b/repos/os/src/drivers/input/dummy/main.cc index 71bcb7346..b59d109cd 100644 --- a/repos/os/src/drivers/input/dummy/main.cc +++ b/repos/os/src/drivers/input/dummy/main.cc @@ -59,7 +59,7 @@ namespace Input { Dataspace_capability _ev_ds_cap; - Session_component *_create_session(const char *) { + Session_component *_create_session(const char *) override { return new (md_alloc()) Session_component(_ev_ds_cap); } public: diff --git a/repos/os/src/drivers/input/spec/ps2/pbxa9/pl050.h b/repos/os/src/drivers/input/spec/ps2/pbxa9/pl050.h index 28578e4f9..92d33d833 100644 --- a/repos/os/src/drivers/input/spec/ps2/pbxa9/pl050.h +++ b/repos/os/src/drivers/input/spec/ps2/pbxa9/pl050.h @@ -94,7 +94,7 @@ class Pl050 /** * Read input or wait busily until input becomes available */ - unsigned char read() + unsigned char read() override { Genode::Lock::Guard guard(_lock); @@ -105,18 +105,18 @@ class Pl050 return get(); } - void write(unsigned char value) + void write(unsigned char value) override { while (!(_reg_base[PL050_REG_STATUS] & PL050_STATUS_TX_EMPTY)); _reg_base[PL050_REG_DATA] = value; } - bool data_read_ready() + bool data_read_ready() override { return !empty() || _input_pending(); } - void enable_irq() + void enable_irq() override { _reg_base[PL050_REG_CONTROL] = PL050_CONTROL_RX_IRQ | PL050_CONTROL_ENABLE; } diff --git a/repos/os/src/drivers/input/spec/ps2/ps2_keyboard.h b/repos/os/src/drivers/input/spec/ps2/ps2_keyboard.h index 51148b4d2..cc13da73a 100644 --- a/repos/os/src/drivers/input/spec/ps2/ps2_keyboard.h +++ b/repos/os/src/drivers/input/spec/ps2/ps2_keyboard.h @@ -120,7 +120,7 @@ class Ps2::Keyboard : public Input_driver ** Interface of Scan-code state machine ** ******************************************/ - void reset() + void reset() override { _state = READ_FIRST; _ready = false; @@ -128,7 +128,7 @@ class Ps2::Keyboard : public Input_driver _key_code = 0; } - void process(unsigned char v, bool verbose) + void process(unsigned char v, bool verbose) override { if (verbose) Genode::log("process ", Genode::Hex(v), " scan code set 1"); @@ -209,10 +209,10 @@ class Ps2::Keyboard : public Input_driver _ready = true; } - bool ready() const { return _ready; } - bool press() const { return _press; } + bool ready() const override { return _ready; } + bool press() const override { return _press; } - unsigned int key_code() const + unsigned int key_code() const override { return ready() ? _key_code : (unsigned)Input::KEY_UNKNOWN; } @@ -253,7 +253,7 @@ class Ps2::Keyboard : public Input_driver ** Interface of Scan-code state machine ** ******************************************/ - void reset() + void reset() override { _state = READ_FIRST; _press = true; @@ -263,7 +263,7 @@ class Ps2::Keyboard : public Input_driver _key_code = 0; } - void process(unsigned char v, bool verbose) + void process(unsigned char v, bool verbose) override { if (verbose) Genode::log("process ", Genode::Hex(v), " scan code set 2"); @@ -347,10 +347,10 @@ class Ps2::Keyboard : public Input_driver _key_code = (_extended ? scan_code_set_2_ext : scan_code_set_2)[v]; } - bool ready() const { return _ready; } - bool press() const { return _press; } + bool ready() const override { return _ready; } + bool press() const override { return _press; } - unsigned int key_code() const + unsigned int key_code() const override { return ready() ? _key_code : (unsigned)Input::KEY_UNKNOWN; } @@ -478,7 +478,7 @@ class Ps2::Keyboard : public Input_driver ** Input driver interface ** ****************************/ - void handle_event() + void handle_event() override { _state_machine->process(_kbd.read(), _verbose.scancodes); @@ -521,7 +521,7 @@ class Ps2::Keyboard : public Input_driver _update_leds(); } - bool event_pending() const { return _kbd.data_read_ready(); } + bool event_pending() const override { return _kbd.data_read_ready(); } }; #endif /* _DRIVERS__INPUT__SPEC__PS2__PS2_KEYBOARD_H_ */ diff --git a/repos/os/src/drivers/input/spec/ps2/ps2_mouse.h b/repos/os/src/drivers/input/spec/ps2/ps2_mouse.h index ca2c218ae..45bcbccca 100644 --- a/repos/os/src/drivers/input/spec/ps2/ps2_mouse.h +++ b/repos/os/src/drivers/input/spec/ps2/ps2_mouse.h @@ -236,7 +236,7 @@ class Ps2::Mouse : public Input_driver ** Input driver interface ** ****************************/ - void handle_event() + void handle_event() override { _packet[_packet_idx++] = _aux.read(); if (_packet_idx < _packet_len) @@ -306,7 +306,7 @@ class Ps2::Mouse : public Input_driver _packet_idx = 0; } - bool event_pending() const { return _aux.data_read_ready(); } + bool event_pending() const override { return _aux.data_read_ready(); } }; #endif /* _DRIVERS__INPUT__SPEC__PS2__PS2_MOUSE_H_ */ diff --git a/repos/os/src/drivers/input/spec/ps2/x86/i8042.h b/repos/os/src/drivers/input/spec/ps2/x86/i8042.h index 29e61f7db..a1bc5080c 100644 --- a/repos/os/src/drivers/input/spec/ps2/x86/i8042.h +++ b/repos/os/src/drivers/input/spec/ps2/x86/i8042.h @@ -120,7 +120,7 @@ class I8042 _i8042._read_and_route(); } - unsigned char read() + unsigned char read() override { unsigned attempts = MAX_ATTEMPTS; while (empty() && attempts > 0) { @@ -141,7 +141,7 @@ class I8042 return get(); } - void write(unsigned char value) + void write(unsigned char value) override { Genode::Lock::Guard guard(_i8042._lock); @@ -151,7 +151,7 @@ class I8042 _i8042._data(value); } - bool data_read_ready() + bool data_read_ready() override { flush_read(); return !empty(); diff --git a/repos/os/src/drivers/nic/spec/gem/cadence_gem.h b/repos/os/src/drivers/nic/spec/gem/cadence_gem.h index a834e0203..9e887d8e1 100644 --- a/repos/os/src/drivers/nic/spec/gem/cadence_gem.h +++ b/repos/os/src/drivers/nic/spec/gem/cadence_gem.h @@ -606,13 +606,13 @@ namespace Genode using Nic::Session_component::cap; - void phy_write(const uint8_t phyaddr, const uint8_t regnum, const uint16_t data) + void phy_write(const uint8_t phyaddr, const uint8_t regnum, const uint16_t data) override { _phy_setup_op(phyaddr, regnum, data, Phy_maintenance::Operation::WRITE); } - void phy_read(const uint8_t phyaddr, const uint8_t regnum, uint16_t& data) + void phy_read(const uint8_t phyaddr, const uint8_t regnum, uint16_t& data) override { _phy_setup_op(phyaddr, regnum, 0, Phy_maintenance::Operation::READ); @@ -664,7 +664,7 @@ namespace Genode ** Nic::Session_component interface ** **************************************/ - virtual Nic::Mac_address mac_address() + virtual Nic::Mac_address mac_address() override { Nic::Mac_address mac; uint32_t* const low_addr_pointer = reinterpret_cast(&mac.addr[0]); @@ -676,7 +676,7 @@ namespace Genode return mac; } - virtual bool link_state() + virtual bool link_state() override { /* XXX return always true for now */ return true; diff --git a/repos/os/src/drivers/nic/spec/linux/main.cc b/repos/os/src/drivers/nic/spec/linux/main.cc index 2a13c31b6..7393b4033 100644 --- a/repos/os/src/drivers/nic/spec/linux/main.cc +++ b/repos/os/src/drivers/nic/spec/linux/main.cc @@ -65,7 +65,7 @@ class Linux_session_component : public Nic::Session_component Rx_signal_thread(Genode::Env &env, int fd, Genode::Signal_context_capability sigh) : Genode::Thread(env, "rx_signal", 0x1000), fd(fd), sigh(sigh) { } - void entry() + void entry() override { while (true) { /* wait for packet arrival on fd */ diff --git a/repos/os/src/drivers/nic/spec/pbxa9/main.cc b/repos/os/src/drivers/nic/spec/pbxa9/main.cc index 9ac9d0a5a..587fc5643 100644 --- a/repos/os/src/drivers/nic/spec/pbxa9/main.cc +++ b/repos/os/src/drivers/nic/spec/pbxa9/main.cc @@ -55,7 +55,7 @@ class Root : public Genode::Root_component protected: - Lan9118 *_create_session(const char *args) + Lan9118 *_create_session(const char *args) override { using namespace Genode; diff --git a/repos/os/src/drivers/nvme/main.cc b/repos/os/src/drivers/nvme/main.cc index 826d16d3c..b63e5df46 100644 --- a/repos/os/src/drivers/nvme/main.cc +++ b/repos/os/src/drivers/nvme/main.cc @@ -1376,7 +1376,8 @@ class Driver : public Block::Driver Timer_delayer(Genode::Env &env) : Timer::Connection(env) { } - void usleep(unsigned us) { Timer::Connection::usleep(us); } + void usleep(unsigned us) override { Timer::Connection::usleep(us); } + } _delayer { _env }; Genode::Constructible _nvme_ctrlr { }; @@ -1738,8 +1739,8 @@ struct Main ~Factory() { _driver.destruct(); } - Block::Driver *create() { return &*_driver; } - void destroy(Block::Driver *) { } + Block::Driver *create() override { return &*_driver; } + void destroy(Block::Driver *) override { } }; Factory _factory { _env, _heap, _announce_sigh }; diff --git a/repos/os/src/drivers/platform/spec/arndale/cmu.h b/repos/os/src/drivers/platform/spec/arndale/cmu.h index e6f5ceaf1..a257c498e 100644 --- a/repos/os/src/drivers/platform/spec/arndale/cmu.h +++ b/repos/os/src/drivers/platform/spec/arndale/cmu.h @@ -476,7 +476,7 @@ class Cmu : public Regulator::Driver, ** Regulator driver interface ** ********************************/ - void level(Regulator_id id, unsigned long level) + void level(Regulator_id id, unsigned long level) override { switch (id) { case CLK_CPU: @@ -487,7 +487,7 @@ class Cmu : public Regulator::Driver, } } - unsigned long level(Regulator_id id) + unsigned long level(Regulator_id id) override { switch (id) { case CLK_CPU: @@ -501,7 +501,7 @@ class Cmu : public Regulator::Driver, return 0; } - void state(Regulator_id id, bool enable) + void state(Regulator_id id, bool enable) override { if (enable) _enable(id); @@ -509,7 +509,7 @@ class Cmu : public Regulator::Driver, _disable(id); } - bool state(Regulator_id id) + bool state(Regulator_id id) override { switch (id) { case CLK_SATA: diff --git a/repos/os/src/drivers/platform/spec/arndale/pmu.h b/repos/os/src/drivers/platform/spec/arndale/pmu.h index 81ee0245f..fda87a5a9 100644 --- a/repos/os/src/drivers/platform/spec/arndale/pmu.h +++ b/repos/os/src/drivers/platform/spec/arndale/pmu.h @@ -190,7 +190,7 @@ class Pmu : public Regulator::Driver, ** Regulator driver interface ** ********************************/ - void level(Regulator_id id, unsigned long /* level */) + void level(Regulator_id id, unsigned long /* level */) override { switch (id) { default: @@ -198,7 +198,7 @@ class Pmu : public Regulator::Driver, } } - unsigned long level(Regulator_id id) + unsigned long level(Regulator_id id) override { switch (id) { default: @@ -207,7 +207,7 @@ class Pmu : public Regulator::Driver, return 0; } - void state(Regulator_id id, bool enable) + void state(Regulator_id id, bool enable) override { if (enable) _enable(id); @@ -215,7 +215,7 @@ class Pmu : public Regulator::Driver, _disable(id); } - bool state(Regulator_id id) + bool state(Regulator_id id) override { switch (id) { case PWR_USB30: diff --git a/repos/os/src/drivers/platform/spec/imx53/main.cc b/repos/os/src/drivers/platform/spec/imx53/main.cc index 6e624b188..379d783ad 100644 --- a/repos/os/src/drivers/platform/spec/imx53/main.cc +++ b/repos/os/src/drivers/platform/spec/imx53/main.cc @@ -51,7 +51,7 @@ class Platform::Session_component : public Genode::Rpc_object ** Platform session interface ** **********************************/ - void enable(Device dev) + void enable(Device dev) override { switch (dev) { case Session::IPU: @@ -78,7 +78,7 @@ class Platform::Session_component : public Genode::Rpc_object }; } - void disable(Device dev) + void disable(Device dev) override { switch (dev) { case Session::IPU: @@ -89,7 +89,7 @@ class Platform::Session_component : public Genode::Rpc_object }; } - void clock_rate(Device dev, unsigned long /* rate */) + void clock_rate(Device dev, unsigned long /* rate */) override { switch (dev) { default: @@ -97,7 +97,7 @@ class Platform::Session_component : public Genode::Rpc_object }; } - Board_revision revision() + Board_revision revision() override { switch (_iim.revision()) { case QSB: return QSB; @@ -121,7 +121,7 @@ class Platform::Root : public Genode::Root_component ** Platform session interface ** **********************************/ - void setup_framebuffer(Framebuffer_info &info) + void setup_framebuffer(Framebuffer_info &info) override { auto const &msg = _mbox.message(info); _mbox.call(); info = msg; } - bool power_state(Power id) + bool power_state(Power id) override { auto &msg = _mbox.message(); auto const &res = msg.append(id); @@ -63,14 +63,14 @@ class Platform::Session_component : public Genode::Rpc_object return res.state; } - void power_state(Power id, bool enable) + void power_state(Power id, bool enable) override { auto &msg = _mbox.message(); msg.append_no_response(id, enable, true); _mbox.call(); } - uint32_t clock_rate(Clock id) + uint32_t clock_rate(Clock id) override { auto &msg = _mbox.message(); auto const &res = msg.append(id); @@ -88,7 +88,7 @@ class Platform::Root : public Genode::Root_component protected: - Session_component *_create_session(const char *args) + Session_component *_create_session(const char *args) override { try { return new (md_alloc()) diff --git a/repos/os/src/drivers/rtc/spec/x86/main.cc b/repos/os/src/drivers/rtc/spec/x86/main.cc index 39c827951..6a76d99fb 100644 --- a/repos/os/src/drivers/rtc/spec/x86/main.cc +++ b/repos/os/src/drivers/rtc/spec/x86/main.cc @@ -51,7 +51,7 @@ class Rtc::Root : public Genode::Root_component protected: - Session_component *_create_session(const char *) + Session_component *_create_session(const char *) override { return new (md_alloc()) Session_component(_env); } diff --git a/repos/os/src/drivers/sd_card/main.cc b/repos/os/src/drivers/sd_card/main.cc index f7a921f5a..ab9bd1124 100644 --- a/repos/os/src/drivers/sd_card/main.cc +++ b/repos/os/src/drivers/sd_card/main.cc @@ -35,10 +35,10 @@ struct Main Factory(Env &env, Heap &heap) : env(env), heap(heap) { } - Block::Driver *create() { + Block::Driver *create() override { return new (&heap) Sd_card::Driver(env); } - void destroy(Block::Driver *driver) { + void destroy(Block::Driver *driver) override { Genode::destroy(&heap, static_cast(driver)); } } factory { env, heap }; diff --git a/repos/os/src/drivers/sd_card/spec/exynos5/driver.h b/repos/os/src/drivers/sd_card/spec/exynos5/driver.h index b154cfed1..aa48f9c4a 100644 --- a/repos/os/src/drivers/sd_card/spec/exynos5/driver.h +++ b/repos/os/src/drivers/sd_card/spec/exynos5/driver.h @@ -168,7 +168,7 @@ class Sd_card::Driver : public Driver_base, { Timer_delayer(Genode::Env &env) : Timer::Connection(env) { } - void usleep(unsigned us) { Timer::Connection::usleep(us); } + void usleep(unsigned us) override { Timer::Connection::usleep(us); } }; struct Block_transfer diff --git a/repos/os/src/drivers/sd_card/spec/imx/driver.h b/repos/os/src/drivers/sd_card/spec/imx/driver.h index 56d597f5d..f85456be3 100644 --- a/repos/os/src/drivers/sd_card/spec/imx/driver.h +++ b/repos/os/src/drivers/sd_card/spec/imx/driver.h @@ -202,7 +202,7 @@ class Sd_card::Driver : public Driver_base, { Timer_delayer(Genode::Env &env) : Timer::Connection(env) { } - void usleep(unsigned us) { Timer::Connection::usleep(us); } + void usleep(unsigned us) override { Timer::Connection::usleep(us); } }; struct Block_transfer diff --git a/repos/os/src/drivers/sd_card/spec/omap4/driver.h b/repos/os/src/drivers/sd_card/spec/omap4/driver.h index 33a26ee18..f6e058b5a 100644 --- a/repos/os/src/drivers/sd_card/spec/omap4/driver.h +++ b/repos/os/src/drivers/sd_card/spec/omap4/driver.h @@ -162,7 +162,7 @@ class Sd_card::Driver : public Driver_base, { Timer_delayer(Genode::Env &env) : Timer::Connection(env) { } - void usleep(unsigned us) { Timer::Connection::usleep(us); } + void usleep(unsigned us) override { Timer::Connection::usleep(us); } }; Env &_env; diff --git a/repos/os/src/drivers/sd_card/spec/pbxa9/driver.h b/repos/os/src/drivers/sd_card/spec/pbxa9/driver.h index 4e731291c..4e17e2098 100644 --- a/repos/os/src/drivers/sd_card/spec/pbxa9/driver.h +++ b/repos/os/src/drivers/sd_card/spec/pbxa9/driver.h @@ -120,18 +120,18 @@ class Sd_card::Driver : public Block::Driver, private Attached_mmio ** Block-driver ** ******************/ - Genode::size_t block_size() override { return 512; } + Genode::size_t block_size() override { return 512; } Block::Session::Operations ops() override; void read(Block::sector_t block_number, size_t block_count, char *buffer, - Block::Packet_descriptor &packet); + Block::Packet_descriptor &packet) override; void write(Block::sector_t block_number, size_t block_count, char const *buffer, - Block::Packet_descriptor &packet); + Block::Packet_descriptor &packet) override; /* * TODO report (and support) real capacity not just 512M diff --git a/repos/os/src/drivers/sd_card/spec/rpi/driver.h b/repos/os/src/drivers/sd_card/spec/rpi/driver.h index 83ad2fab1..bf531147b 100644 --- a/repos/os/src/drivers/sd_card/spec/rpi/driver.h +++ b/repos/os/src/drivers/sd_card/spec/rpi/driver.h @@ -152,7 +152,7 @@ class Sd_card::Driver : public Driver_base, { Timer_delayer(Genode::Env &env) : Timer::Connection(env) { } - void usleep(unsigned us) { Timer::Connection::usleep(us); } + void usleep(unsigned us) override { Timer::Connection::usleep(us); } }; Env &_env; diff --git a/repos/os/src/drivers/uart/uart_component.h b/repos/os/src/drivers/uart/uart_component.h index 98b29174d..396c717cc 100644 --- a/repos/os/src/drivers/uart/uart_component.h +++ b/repos/os/src/drivers/uart/uart_component.h @@ -142,7 +142,7 @@ class Uart::Session_component : public Rpc_objectrecord || diff --git a/repos/os/src/lib/vfs/zero_file_system.h b/repos/os/src/lib/vfs/zero_file_system.h index d9fccbf9c..541113a15 100644 --- a/repos/os/src/lib/vfs/zero_file_system.h +++ b/repos/os/src/lib/vfs/zero_file_system.h @@ -54,7 +54,7 @@ struct Vfs::Zero_file_system : Single_file_system return WRITE_OK; } - bool read_ready() { return true; } + bool read_ready() override { return true; } }; /********************************* diff --git a/repos/os/src/server/dynamic_rom/main.cc b/repos/os/src/server/dynamic_rom/main.cc index c890f766f..22496069f 100644 --- a/repos/os/src/server/dynamic_rom/main.cc +++ b/repos/os/src/server/dynamic_rom/main.cc @@ -215,7 +215,7 @@ class Dynamic_rom::Root : public Genode::Root_component protected: - Session_component *_create_session(const char *args) + Session_component *_create_session(const char *args) override { using namespace Genode; diff --git a/repos/os/src/server/fs_log/main.cc b/repos/os/src/server/fs_log/main.cc index 6d5b570ea..b3d882935 100644 --- a/repos/os/src/server/fs_log/main.cc +++ b/repos/os/src/server/fs_log/main.cc @@ -63,7 +63,7 @@ class Fs_log::Root_component : protected: - Session_component *_create_session(const char *args) + Session_component *_create_session(const char *args) override { using namespace File_system; diff --git a/repos/os/src/server/fs_log/session.h b/repos/os/src/server/fs_log/session.h index 3902cd6d4..1608dcc92 100644 --- a/repos/os/src/server/fs_log/session.h +++ b/repos/os/src/server/fs_log/session.h @@ -76,7 +76,7 @@ class Fs_log::Session_component : public Genode::Rpc_object ** Log session ** *****************/ - Genode::size_t write(Log_session::String const &msg) + Genode::size_t write(Log_session::String const &msg) override { using namespace Genode; diff --git a/repos/os/src/server/iso9660/main.cc b/repos/os/src/server/iso9660/main.cc index 7e253bfda..675536895 100644 --- a/repos/os/src/server/iso9660/main.cc +++ b/repos/os/src/server/iso9660/main.cc @@ -106,10 +106,10 @@ class Iso::Rom_component : public Genode::Rpc_object public: - Rom_dataspace_capability dataspace() { + Rom_dataspace_capability dataspace() override { return static_cap_cast(_file->dataspace()); } - void sigh(Signal_context_capability) { } + void sigh(Signal_context_capability) override { } Rom_component(Genode::Env &env, Genode::Allocator &alloc, File_cache &cache, Block::Connection &block, @@ -148,7 +148,7 @@ class Iso::Root : public Iso::Root_component protected: - Rom_component *_create_session(const char *args) + Rom_component *_create_session(const char *args) override { size_t ram_quota = Arg_string::find_arg(args, "ram_quota").ulong_value(0); diff --git a/repos/os/src/server/loader/main.cc b/repos/os/src/server/loader/main.cc index 627f6b831..62acda198 100644 --- a/repos/os/src/server/loader/main.cc +++ b/repos/os/src/server/loader/main.cc @@ -384,7 +384,7 @@ class Loader::Root : public Root_component protected: - Session_component *_create_session(const char *args) + Session_component *_create_session(const char *args) override { Xml_node session_config(""); diff --git a/repos/os/src/server/loader/rom.h b/repos/os/src/server/loader/rom.h index 556bd77b4..56f1a74a4 100644 --- a/repos/os/src/server/loader/rom.h +++ b/repos/os/src/server/loader/rom.h @@ -284,13 +284,13 @@ namespace Genode { ~Rom_session_component() { _ep.dissolve(*this); } - Rom_dataspace_capability dataspace() + Rom_dataspace_capability dataspace() override { Rom_module_lock_guard guard(_rom_module); return _rom_module.fg_dataspace(); } - void sigh(Signal_context_capability sigh) + void sigh(Signal_context_capability sigh) override { Rom_module_lock_guard guard(_rom_module); _rom_module.sigh(sigh); diff --git a/repos/os/src/server/log_terminal/main.cc b/repos/os/src/server/log_terminal/main.cc index e2d2f77fd..4ce160a66 100644 --- a/repos/os/src/server/log_terminal/main.cc +++ b/repos/os/src/server/log_terminal/main.cc @@ -138,7 +138,7 @@ class Terminal::Session_component : public Rpc_objectid().value }; } - Node_handle node(Path const &path) + Node_handle node(Path const &path) override { char const *path_str = path.string(); @@ -297,7 +297,7 @@ class Lx_fs::Session_component : public Session_rpc_object return open_node->id(); } - void close(Node_handle handle) + void close(Node_handle handle) override { auto close_fn = [&] (Open_node &open_node) { Node &node = open_node.node(); @@ -312,7 +312,7 @@ class Lx_fs::Session_component : public Session_rpc_object } } - Status status(Node_handle node_handle) + Status status(Node_handle node_handle) override { auto status_fn = [&] (Open_node &open_node) { return open_node.node().status(); @@ -325,17 +325,17 @@ class Lx_fs::Session_component : public Session_rpc_object } } - void control(Node_handle, Control) + void control(Node_handle, Control) override { Genode::error(__func__, " not implemented"); } - void unlink(Dir_handle, Name const &) + void unlink(Dir_handle, Name const &) override { Genode::error(__func__, " not implemented"); } - void truncate(File_handle file_handle, file_size_t size) + void truncate(File_handle file_handle, file_size_t size) override { if (!_writable) throw Permission_denied(); @@ -351,7 +351,7 @@ class Lx_fs::Session_component : public Session_rpc_object } } - void move(Dir_handle, Name const &, Dir_handle, Name const &) + void move(Dir_handle, Name const &, Dir_handle, Name const &) override { Genode::error(__func__, " not implemented"); } @@ -368,7 +368,7 @@ class Lx_fs::Root : public Root_component protected: - Session_component *_create_session(const char *args) + Session_component *_create_session(const char *args) override { /* * Determine client-specific policy defined implicitly by diff --git a/repos/os/src/server/mixer/mixer.cc b/repos/os/src/server/mixer/mixer.cc index 552b9acfb..e7385a1ec 100644 --- a/repos/os/src/server/mixer/mixer.cc +++ b/repos/os/src/server/mixer/mixer.cc @@ -659,14 +659,14 @@ class Audio_out::Session_component : public Audio_out::Session_elem _mixer.remove_session(Session_elem::number, *this); } - void start() + void start() override { Session_rpc_object::start(); stream()->pos(_mixer.pos(Session_elem::number)); _mixer.report_channels(); } - void stop() + void stop() override { Session_rpc_object::stop(); _mixer.report_channels(); @@ -687,7 +687,7 @@ class Audio_out::Root : public Audio_out::Root_component Mixer &_mixer; int _sessions = { 0 }; - Session_component *_create_session(const char *args) + Session_component *_create_session(const char *args) override { using namespace Genode; @@ -727,7 +727,7 @@ class Audio_out::Root : public Audio_out::Root_component } - void _destroy_session(Session_component *session) + void _destroy_session(Session_component *session) override { if (--_sessions == 0) _mixer.stop(); Genode::destroy(md_alloc(), session); diff --git a/repos/os/src/server/nic_bridge/component.h b/repos/os/src/server/nic_bridge/component.h index 2d326abb9..957a21198 100644 --- a/repos/os/src/server/nic_bridge/component.h +++ b/repos/os/src/server/nic_bridge/component.h @@ -146,7 +146,7 @@ class Net::Session_component : private Net::Stream_allocator, ~Session_component(); - ::Nic::Mac_address mac_address() + ::Nic::Mac_address mac_address() override { ::Nic::Mac_address m; Mac_address_node::Address mac = _mac_node.addr(); @@ -167,9 +167,9 @@ class Net::Session_component : private Net::Stream_allocator, ** Nic::Driver notification interface ** ****************************************/ - bool link_state(); + bool link_state() override; - void link_state_sigh(Genode::Signal_context_capability sigh) { + void link_state_sigh(Genode::Signal_context_capability sigh) override { _link_state_sigh = sigh; } @@ -211,7 +211,7 @@ class Net::Root : public Genode::Root_component protected: - Session_component *_create_session(const char *args) + Session_component *_create_session(const char *args) override { using namespace Genode; diff --git a/repos/os/src/server/nic_dump/component.h b/repos/os/src/server/nic_dump/component.h index 7feddbec6..cd61edcd7 100644 --- a/repos/os/src/server/nic_dump/component.h +++ b/repos/os/src/server/nic_dump/component.h @@ -85,8 +85,8 @@ class Net::Session_component : private Session_component_base, ** Net::Interface ** ********************/ - Packet_stream_sink &_sink() { return *_tx.sink(); } - Packet_stream_source &_source() { return *_rx.source(); } + Packet_stream_sink &_sink() override { return *_tx.sink(); } + Packet_stream_source &_source() override { return *_rx.source(); } public: @@ -104,9 +104,9 @@ class Net::Session_component : private Session_component_base, ** Nic::Session ** ******************/ - Mac_address mac_address() { return _uplink.mac_address(); } - bool link_state() { return _uplink.link_state(); } - void link_state_sigh(Genode::Signal_context_capability sigh) { + Mac_address mac_address() override { return _uplink.mac_address(); } + bool link_state() override { return _uplink.link_state(); } + void link_state_sigh(Genode::Signal_context_capability sigh) override { _link_state_sigh = sigh; } }; @@ -126,7 +126,7 @@ class Net::Root : public Genode::Root_component protected: - Session_component *_create_session(char const *args) + Session_component *_create_session(char const *args) override { size_t ram_quota = Arg_string::find_arg(args, "ram_quota" ).ulong_value(0); size_t tx_buf_size = Arg_string::find_arg(args, "tx_buf_size").ulong_value(0); diff --git a/repos/os/src/server/nic_router/permit_rule.h b/repos/os/src/server/nic_router/permit_rule.h index bb2571901..e75f41c91 100644 --- a/repos/os/src/server/nic_router/permit_rule.h +++ b/repos/os/src/server/nic_router/permit_rule.h @@ -86,7 +86,7 @@ struct Net::Permit_any_rule : Permit_rule ** log ** *********/ - void print(Genode::Output &output) const; + void print(Genode::Output &output) const override; }; @@ -119,7 +119,7 @@ class Net::Permit_single_rule : public Permit_rule, ** log ** *********/ - void print(Genode::Output &output) const; + void print(Genode::Output &output) const override; /************** diff --git a/repos/os/src/server/nitpicker/canvas.h b/repos/os/src/server/nitpicker/canvas.h index d3e1140b0..13bba57d8 100644 --- a/repos/os/src/server/nitpicker/canvas.h +++ b/repos/os/src/server/nitpicker/canvas.h @@ -72,22 +72,22 @@ class Nitpicker::Canvas : public Canvas_base, public Surface_base::Flusher /** * Default implementation of Surface_base::Flusher interface */ - void flush_pixels(Rect) { } + void flush_pixels(Rect) override { } - Area size() const { return _surface.size(); } + Area size() const override { return _surface.size(); } - Rect clip() const { return _surface.clip(); } + Rect clip() const override { return _surface.clip(); } - void clip(Rect rect) { _surface.clip(rect); } + void clip(Rect rect) override { _surface.clip(rect); } - void draw_box(Rect rect, Color color) + void draw_box(Rect rect, Color color) override { Box_painter::paint(_surface, rect, color); } void draw_texture(Point pos, Texture_base const &texture_base, Texture_painter::Mode mode, Color mix_color, - bool allow_alpha) + bool allow_alpha) override { Texture const &texture = static_cast const &>(texture_base); Texture_painter::paint(_surface, texture, mix_color, pos, mode, @@ -95,7 +95,7 @@ class Nitpicker::Canvas : public Canvas_base, public Surface_base::Flusher } void draw_text(Point pos, Font const &font, - Color color, char const *string) + Color color, char const *string) override { Text_painter::paint(_surface, Text_painter::Position(pos.x(), pos.y()), font, color, string); diff --git a/repos/os/src/server/nitpicker/main.cc b/repos/os/src/server/nitpicker/main.cc index 48c5f53de..1e7c3d705 100644 --- a/repos/os/src/server/nitpicker/main.cc +++ b/repos/os/src/server/nitpicker/main.cc @@ -85,7 +85,7 @@ class Nitpicker::Root : public Root_component, protected: - Session_component *_create_session(const char *args) + Session_component *_create_session(const char *args) override { size_t const ram_quota = Arg_string::find_arg(args, "ram_quota").ulong_value(0); @@ -117,13 +117,13 @@ class Nitpicker::Root : public Root_component, return session; } - void _upgrade_session(Session_component *s, const char *args) + void _upgrade_session(Session_component *s, const char *args) override { size_t ram_quota = Arg_string::find_arg(args, "ram_quota").ulong_value(0); s->upgrade_ram_quota(ram_quota); } - void _destroy_session(Session_component *session) + void _destroy_session(Session_component *session) override { /* invalidate pointers held by other sessions to the destroyed session */ for (Session_component *s = _session_list.first(); s; s = s->next()) diff --git a/repos/os/src/server/part_block/component.h b/repos/os/src/server/part_block/component.h index e1cef43f7..b79a97cae 100644 --- a/repos/os/src/server/part_block/component.h +++ b/repos/os/src/server/part_block/component.h @@ -174,7 +174,7 @@ class Block::Session_component : public Block::Session_rpc_object, Ram_dataspace_capability const rq_ds() const { return _rq_ds; } Partition *partition() { return _partition; } - void dispatch(Packet_descriptor &request, Packet_descriptor &reply) + void dispatch(Packet_descriptor &request, Packet_descriptor &reply) override { request.succeeded(reply.succeeded()); @@ -217,7 +217,7 @@ class Block::Session_component : public Block::Session_rpc_object, *******************************/ void info(sector_t *blk_count, size_t *blk_size, - Operations *ops) + Operations *ops) override { Operations driver_ops = _driver.ops(); @@ -233,7 +233,7 @@ class Block::Session_component : public Block::Session_rpc_object, ops->set_operation(Opcode::WRITE); } - void sync() { _driver.session().sync(); } + void sync() override { _driver.session().sync(); } }; diff --git a/repos/os/src/server/part_block/gpt.h b/repos/os/src/server/part_block/gpt.h index fbed0b1b0..c3940beb5 100644 --- a/repos/os/src/server/part_block/gpt.h +++ b/repos/os/src/server/part_block/gpt.h @@ -393,10 +393,10 @@ class Gpt : public Block::Partition_table using Partition_table::Partition_table; - Block::Partition *partition(int num) { + Block::Partition *partition(int num) override { return (num <= MAX_PARTITIONS && num > 0) ? _part_list[num-1] : 0; } - bool parse() + bool parse() override { Sector s(driver, Gpt_hdr::HEADER_LBA, 1); _parse_gpt(s.addr()); diff --git a/repos/os/src/server/part_block/mbr.h b/repos/os/src/server/part_block/mbr.h index 133ae5ba2..2a1f92977 100644 --- a/repos/os/src/server/part_block/mbr.h +++ b/repos/os/src/server/part_block/mbr.h @@ -136,10 +136,10 @@ struct Mbr_partition_table : public Block::Partition_table using Partition_table::Partition_table; - Block::Partition *partition(int num) { + Block::Partition *partition(int num) override { return (num < MAX_PARTITIONS) ? _part_list[num] : 0; } - bool parse() + bool parse() override { Sector s(driver, 0, 1); Mbr *mbr = s.addr(); diff --git a/repos/os/src/server/ram_block/main.cc b/repos/os/src/server/ram_block/main.cc index 70dae3635..5f6bbdca0 100644 --- a/repos/os/src/server/ram_block/main.cc +++ b/repos/os/src/server/ram_block/main.cc @@ -112,10 +112,10 @@ class Ram_block : public Block::Driver ** Block-driver interface ** ****************************/ - size_t block_size() { return _block_size; } - Block::sector_t block_count() { return _block_count; } + size_t block_size() override { return _block_size; } + Block::sector_t block_count() override { return _block_count; } - Block::Session::Operations ops() + Block::Session::Operations ops() override { Block::Session::Operations o; o.set_operation(Block::Packet_descriptor::READ); @@ -126,7 +126,7 @@ class Ram_block : public Block::Driver void read(Block::sector_t block_number, size_t block_count, char* buffer, - Block::Packet_descriptor &packet) + Block::Packet_descriptor &packet) override { _io(block_number, block_count, buffer, packet, true); } @@ -134,7 +134,7 @@ class Ram_block : public Block::Driver void write(Block::sector_t block_number, size_t block_count, const char * buffer, - Block::Packet_descriptor &packet) + Block::Packet_descriptor &packet) override { _io(block_number, block_count, const_cast(buffer), packet, false); } @@ -180,7 +180,7 @@ struct Main block_size = config.attribute_value("block_size", block_size); } - Block::Driver *create() + Block::Driver *create() override { try { if (use_file) { @@ -197,7 +197,7 @@ struct Main catch (...) { throw Service_denied(); } } - void destroy(Block::Driver *driver) { + void destroy(Block::Driver *driver) override { Genode::destroy(&alloc, driver); } } factory { env, heap, config_rom.xml() }; diff --git a/repos/os/src/server/ram_fs/directory.h b/repos/os/src/server/ram_fs/directory.h index ff580f548..349d718d0 100644 --- a/repos/os/src/server/ram_fs/directory.h +++ b/repos/os/src/server/ram_fs/directory.h @@ -160,7 +160,7 @@ class Ram_fs::Directory : public Node throw File_system::Lookup_failed(); } - Symlink *lookup_symlink(char const *path) + Symlink *lookup_symlink(char const *path) override { Node *node = lookup(path); diff --git a/repos/os/src/server/ram_fs/main.cc b/repos/os/src/server/ram_fs/main.cc index cd0e54767..e4dc1a8d2 100644 --- a/repos/os/src/server/ram_fs/main.cc +++ b/repos/os/src/server/ram_fs/main.cc @@ -229,7 +229,7 @@ class Ram_fs::Session_component : public File_system::Session_rpc_object ***************************/ File_handle file(Dir_handle dir_handle, Name const &name, - Mode mode, bool create) + Mode mode, bool create) override { if (!valid_name(name.string())) throw Invalid_name(); @@ -279,7 +279,7 @@ class Ram_fs::Session_component : public File_system::Session_rpc_object } } - Symlink_handle symlink(Dir_handle dir_handle, Name const &name, bool create) + Symlink_handle symlink(Dir_handle dir_handle, Name const &name, bool create) override { if (!valid_name(name.string())) throw Invalid_name(); @@ -325,7 +325,7 @@ class Ram_fs::Session_component : public File_system::Session_rpc_object } } - Dir_handle dir(Path const &path, bool create) + Dir_handle dir(Path const &path, bool create) override { char const *path_str = path.string(); @@ -364,7 +364,7 @@ class Ram_fs::Session_component : public File_system::Session_rpc_object return Dir_handle { open_dir->id().value }; } - Node_handle node(Path const &path) + Node_handle node(Path const &path) override { _assert_valid_path(path.string()); @@ -394,7 +394,7 @@ class Ram_fs::Session_component : public File_system::Session_rpc_object return Watch_handle { watcher->id().value }; } - void close(Node_handle handle) + void close(Node_handle handle) override { auto close_fn = [&] (Open_node &open_node) { destroy(_alloc, &open_node); @@ -407,7 +407,7 @@ class Ram_fs::Session_component : public File_system::Session_rpc_object } } - Status status(Node_handle node_handle) + Status status(Node_handle node_handle) override { auto status_fn = [&] (Open_node &open_node) { Locked_ptr node { open_node.node() }; @@ -423,9 +423,9 @@ class Ram_fs::Session_component : public File_system::Session_rpc_object } } - void control(Node_handle, Control) { } + void control(Node_handle, Control) override { } - void unlink(Dir_handle dir_handle, Name const &name) + void unlink(Dir_handle dir_handle, Name const &name) override { if (!valid_name(name.string())) throw Invalid_name(); @@ -454,7 +454,7 @@ class Ram_fs::Session_component : public File_system::Session_rpc_object } } - void truncate(File_handle file_handle, file_size_t size) + void truncate(File_handle file_handle, file_size_t size) override { if (!_writable) throw Permission_denied(); @@ -475,7 +475,7 @@ class Ram_fs::Session_component : public File_system::Session_rpc_object } void move(Dir_handle from_dir_handle, Name const &from_name, - Dir_handle to_dir_handle, Name const &to_name) + Dir_handle to_dir_handle, Name const &to_name) override { if (!_writable) throw Permission_denied(); @@ -542,7 +542,7 @@ class Ram_fs::Root : public Root_component protected: - Session_component *_create_session(const char *args) + Session_component *_create_session(const char *args) override { /* * Determine client-specific policy defined implicitly by diff --git a/repos/os/src/server/rom_block/main.cc b/repos/os/src/server/rom_block/main.cc index d33fc90d5..ff222fdc3 100644 --- a/repos/os/src/server/rom_block/main.cc +++ b/repos/os/src/server/rom_block/main.cc @@ -44,10 +44,10 @@ class Rom_block : public Block::Driver ** Block-driver interface ** ****************************/ - size_t block_size() { return _blk_sz; } - Block::sector_t block_count() { return _blk_cnt; } + size_t block_size() override { return _blk_sz; } + Block::sector_t block_count() override { return _blk_cnt; } - Block::Session::Operations ops() + Block::Session::Operations ops() override { Block::Session::Operations o; o.set_operation(Block::Packet_descriptor::READ); @@ -57,7 +57,7 @@ class Rom_block : public Block::Driver void read(Block::sector_t block_number, size_t block_count, char* buffer, - Block::Packet_descriptor &packet) + Block::Packet_descriptor &packet) override { /* sanity check block number */ if (block_number + block_count > _file_sz / _blk_sz) { @@ -90,7 +90,7 @@ struct Main Factory(Env &env, Heap &heap) : env(env), heap(heap) {} - Block::Driver *create() + Block::Driver *create() override { Attached_rom_dataspace config(env, "config"); @@ -111,7 +111,7 @@ struct Main throw Service_denied(); } - void destroy(Block::Driver *driver) { + void destroy(Block::Driver *driver) override { Genode::destroy(&heap, driver); } } factory { env, heap }; diff --git a/repos/os/src/server/rom_filter/main.cc b/repos/os/src/server/rom_filter/main.cc index 22bc9de31..2761ae539 100644 --- a/repos/os/src/server/rom_filter/main.cc +++ b/repos/os/src/server/rom_filter/main.cc @@ -133,7 +133,7 @@ class Rom_filter::Root : public Genode::Root_component protected: - Session_component *_create_session(const char *) + Session_component *_create_session(const char *) override { /* * We ignore the name of the ROM module requested @@ -233,7 +233,7 @@ struct Rom_filter::Main : Input_rom_registry::Input_rom_changed_fn, /** * Output_buffer interface */ - size_t export_content(char *dst, size_t dst_len) const + size_t export_content(char *dst, size_t dst_len) const override { size_t const len = Genode::min(dst_len, _xml_output_len); Genode::memcpy(dst, _xml_ds->local_addr(), len); diff --git a/repos/os/src/server/rom_prefetcher/main.cc b/repos/os/src/server/rom_prefetcher/main.cc index e682c65d5..7f1552ff5 100644 --- a/repos/os/src/server/rom_prefetcher/main.cc +++ b/repos/os/src/server/rom_prefetcher/main.cc @@ -70,9 +70,9 @@ class Rom_prefetcher::Rom_session_component : public Genode::Rpc_object /** * Return dataspace with content of file */ - Rom_dataspace_capability dataspace() + Rom_dataspace_capability dataspace() override { Dataspace_capability ds = _file_ds; return static_cap_cast(ds); } - void sigh(Signal_context_capability) { } + void sigh(Signal_context_capability) override { } }; @@ -195,7 +195,7 @@ class Tar_rom::Rom_root : public Root_component char const * const _tar_addr; unsigned const _tar_size; - Rom_session_component *_create_session(const char *args) + Rom_session_component *_create_session(const char *args) override { Session_label const label = label_from_args(args); Session_label const module_name = label.last_element(); diff --git a/repos/os/src/server/terminal_crosslink/terminal_root.h b/repos/os/src/server/terminal_crosslink/terminal_root.h index 29a9d6263..222a607ed 100644 --- a/repos/os/src/server/terminal_crosslink/terminal_root.h +++ b/repos/os/src/server/terminal_crosslink/terminal_root.h @@ -41,7 +41,7 @@ namespace Terminal_crosslink { public: Session_capability session(Root::Session_args const &, - Genode::Affinity const &) + Genode::Affinity const &) override { if (!(_session_state & FIRST_SESSION_OPEN)) { _session_state |= FIRST_SESSION_OPEN; @@ -54,9 +54,9 @@ namespace Terminal_crosslink { return Session_capability(); } - void upgrade(Genode::Session_capability, Root::Upgrade_args const &) { } + void upgrade(Genode::Session_capability, Root::Upgrade_args const &) override { } - void close(Genode::Session_capability session) + void close(Genode::Session_capability session) override { if (_session_component1.belongs_to(session)) _session_state &= ~FIRST_SESSION_OPEN; diff --git a/repos/os/src/server/terminal_log/main.cc b/repos/os/src/server/terminal_log/main.cc index 1bf5bc0ba..991abc10a 100644 --- a/repos/os/src/server/terminal_log/main.cc +++ b/repos/os/src/server/terminal_log/main.cc @@ -52,7 +52,7 @@ namespace Genode { * The following function's code is a modified variant of the one in: * 'base/src/core/include/log_session_component.h' */ - size_t write(String const &string_buf) + size_t write(String const &string_buf) override { if (!(string_buf.valid_string())) { Genode::error("corrupted string"); @@ -102,7 +102,7 @@ namespace Genode { /** * Root component interface */ - Termlog_component *_create_session(const char *args) + Termlog_component *_create_session(const char *args) override { size_t ram_quota = Arg_string::find_arg(args, "ram_quota" ).ulong_value(0); diff --git a/repos/os/src/server/vfs/node.h b/repos/os/src/server/vfs/node.h index 079267fc3..5964274d3 100644 --- a/repos/os/src/server/vfs/node.h +++ b/repos/os/src/server/vfs/node.h @@ -378,7 +378,7 @@ struct Vfs_server::Symlink : Io_node ** Node interface ** ********************/ - size_t read(char *dst, size_t len, seek_off_t seek_offset) + size_t read(char *dst, size_t len, seek_off_t seek_offset) override { if (seek_offset != 0) { /* partial read is not supported */ @@ -388,7 +388,7 @@ struct Vfs_server::Symlink : Io_node return _read(dst, len, 0); } - size_t write(char const *src, size_t const len, seek_off_t) + size_t write(char const *src, size_t const len, seek_off_t) override { /* * if the symlink target is too long return a short result diff --git a/repos/os/src/test/audio_out/main.cc b/repos/os/src/test/audio_out/main.cc index f2d2c35be..25c7e56b8 100644 --- a/repos/os/src/test/audio_out/main.cc +++ b/repos/os/src/test/audio_out/main.cc @@ -69,7 +69,7 @@ class Track : public Thread start(); } - void entry() + void entry() override { if (verbose) log(_name, " size is ", _size, " bytes " diff --git a/repos/os/src/test/block/client/main.cc b/repos/os/src/test/block/client/main.cc index c3ede34ab..74d388483 100644 --- a/repos/os/src/test/block/client/main.cc +++ b/repos/os/src/test/block/client/main.cc @@ -45,7 +45,7 @@ class Test : Genode::Interface bool write) : _nr(nr), _cnt(cnt), _write(write) {} - virtual void print_error() + void print_error() override { Genode::error("couldn't ", _write ? "write" : "read", " " "block ", _nr, " - ", _nr+_cnt); @@ -53,11 +53,11 @@ class Test : Genode::Interface }; struct Submit_queue_full : Exception { - void print_error() { + void print_error() override { Genode::error("submit queue is full!"); } }; struct Timeout : Exception { - void print_error() { + void print_error() override { Genode::error("test timed out!"); } }; virtual void perform() = 0; @@ -125,7 +125,7 @@ struct Read_test : Test Read_test(Genode::Env &env, Genode::Heap &heap, unsigned timeo_ms) : Test(env, heap, BULK_BLK_NR*blk_sz, timeo_ms), done(false) { } - void perform() + void perform() override { Genode::log("reading block 0 - ", test_cnt - 1, ", ", NR_PER_REQ, " per request"); @@ -153,7 +153,7 @@ struct Read_test : Test _handle_signal(); } - void ack_avail() + void ack_avail() override { _handle = false; @@ -177,7 +177,7 @@ template struct Write_test : Test { struct Invalid_dimensions : Exception { - void print_error() { + void print_error() override { Genode::error("invalid bulk buffer, or batch size!"); } }; struct Integrity_exception : Block_exception @@ -185,7 +185,7 @@ struct Write_test : Test Integrity_exception(Block::sector_t nr, Genode::size_t cnt) : Block_exception(nr, cnt, false) {} - void print_error() + void print_error() override { Genode::error("integrity check failed: block ", _nr, " - ", _nr+_cnt); @@ -279,7 +279,7 @@ struct Write_test : Test compare(); } - void perform() + void perform() override { if (!blk_ops.supported(Block::Packet_descriptor::WRITE)) return; @@ -295,7 +295,7 @@ struct Write_test : Test } } - void ack_avail() + void ack_avail() override { _handle = false; @@ -316,7 +316,7 @@ struct Write_test : Test struct Violation_test : Test { struct Write_on_read_only : Exception { - void print_error() { + void print_error() override { Genode::error("write on read-only device succeeded!"); } }; struct Range_check_failed : Block_exception @@ -324,7 +324,7 @@ struct Violation_test : Test Range_check_failed(Block::sector_t nr, Genode::size_t cnt) : Block_exception(nr, cnt, false) {} - void print_error() + void print_error() override { Genode::error("range check failed: access to block ", _nr, " - ", _nr+_cnt, " succeeded"); @@ -346,7 +346,7 @@ struct Violation_test : Test p_in_fly++; } - void perform() + void perform() override { if (!blk_ops.supported(Block::Packet_descriptor::WRITE)) req(0, 1, true); @@ -358,7 +358,7 @@ struct Violation_test : Test _handle_signal(); } - void ack_avail() + void ack_avail() override { _handle = false; diff --git a/repos/os/src/test/block/server/main.cc b/repos/os/src/test/block/server/main.cc index 9baf2828a..0314fb856 100644 --- a/repos/os/src/test/block/server/main.cc +++ b/repos/os/src/test/block/server/main.cc @@ -60,13 +60,13 @@ class Driver : public Block::Driver ** Block::Driver interface ** *******************************/ - void session_invalidated() { + void session_invalidated() override { while (!_packets.empty()) _packets.get(); } - Genode::size_t block_size() { return _size; } - Block::sector_t block_count() { return _number; } + Genode::size_t block_size() override { return _size; } + Block::sector_t block_count() override { return _number; } - Block::Session::Operations ops() + Block::Session::Operations ops() override { Block::Session::Operations ops; ops.set_operation(Block::Packet_descriptor::READ); @@ -77,7 +77,7 @@ class Driver : public Block::Driver void read(Block::sector_t block_number, Genode::size_t block_count, char *buffer, - Block::Packet_descriptor &packet) + Block::Packet_descriptor &packet) override { if (!_packets.avail_capacity()) throw Block::Driver::Request_congestion(); @@ -90,7 +90,7 @@ class Driver : public Block::Driver void write(Block::sector_t block_number, Genode::size_t block_count, const char *buffer, - Block::Packet_descriptor &packet) + Block::Packet_descriptor &packet) override { if (!_packets.avail_capacity()) throw Block::Driver::Request_congestion(); diff --git a/repos/os/src/test/init/main.cc b/repos/os/src/test/init/main.cc index 3d9d5adba..46a92f070 100644 --- a/repos/os/src/test/init/main.cc +++ b/repos/os/src/test/init/main.cc @@ -138,7 +138,7 @@ class Test::Log_session_component : public Rpc_object _label(label), _handler(handler) { } - size_t write(String const &string) + size_t write(String const &string) override { /* strip known line delimiter from incoming message */ unsigned n = 0; @@ -171,7 +171,7 @@ class Test::Log_root : public Root_component Root_component(ep, md_alloc), _handler(handler) { } - Log_session_component *_create_session(const char *args, Affinity const &) + Log_session_component *_create_session(const char *args, Affinity const &) override { Session_label const label = label_from_args(args); diff --git a/repos/os/src/test/input_filter/main.cc b/repos/os/src/test/input_filter/main.cc index 6357db5df..075ac4f0e 100644 --- a/repos/os/src/test/input_filter/main.cc +++ b/repos/os/src/test/input_filter/main.cc @@ -111,7 +111,7 @@ class Test::Input_root : public Root_component { } Input::Session_component *_create_session(const char *args, - Affinity const &) + Affinity const &) override { Session_label const label = label_from_args(args); diff --git a/repos/os/src/test/sd_card_bench/main.cc b/repos/os/src/test/sd_card_bench/main.cc index f06e6daa8..ce18fc88b 100644 --- a/repos/os/src/test/sd_card_bench/main.cc +++ b/repos/os/src/test/sd_card_bench/main.cc @@ -39,7 +39,7 @@ struct Main Driver_session(Signal_context_capability sig) : sig(sig) { } - void ack_packet(Packet_descriptor &, bool success) + void ack_packet(Packet_descriptor &, bool success) override { if (!success) { throw Block_operation_failed(); } diff --git a/repos/os/src/test/signal/main.cc b/repos/os/src/test/signal/main.cc index 2277f374d..a321b852d 100644 --- a/repos/os/src/test/signal/main.cc +++ b/repos/os/src/test/signal/main.cc @@ -36,7 +36,7 @@ class Sender : Thread unsigned _submit_cnt { 0 }; bool volatile _idle { false }; - void entry() + void entry() override { while (!_stop) { if (!_idle) { @@ -98,7 +98,7 @@ class Handler : Thread unsigned _activation_cnt { 0 }; bool _idle { false }; - void entry() + void entry() override { while (!_stop) { if (!_idle) { @@ -320,7 +320,7 @@ struct Synchronized_destruction_test : private Signal_test, Thread Signal_transmitter transmitter { receiver.manage(&context) }; bool destroyed { false }; - void entry() + void entry() override { receiver.dissolve(&context); log("dissolve finished"); @@ -440,7 +440,7 @@ struct Nested_test : Signal_test test(test), timer(env) { } - void entry() + void entry() override { timer.msleep(1000); @@ -537,7 +537,7 @@ struct Nested_stress_test : Signal_test Sender(Env &env, char const *name, Signal_context_capability cap) : Thread(env, name, 8*1024), transmitter(cap) { } - void entry() + void entry() override { /* send signals as fast as possible */ while (!destruct) { transmitter.submit(); } diff --git a/repos/os/src/test/terminal_crosslink/main.cc b/repos/os/src/test/terminal_crosslink/main.cc index c2af9b705..ef53975cb 100644 --- a/repos/os/src/test/terminal_crosslink/main.cc +++ b/repos/os/src/test/terminal_crosslink/main.cc @@ -89,7 +89,7 @@ class Test_terminal_crosslink::Client : public Partner Client(Env &env) : Partner(env, "client") { } - void entry() + void entry() override { log("Short message test"); @@ -124,7 +124,7 @@ class Test_terminal_crosslink::Server : public Partner Server(Env &env) : Partner(env, "server") { } - void entry() + void entry() override { /* read client text */ diff --git a/repos/os/src/test/trace/main.cc b/repos/os/src/test/trace/main.cc index d0fcf9c46..3b3081708 100644 --- a/repos/os/src/test/trace/main.cc +++ b/repos/os/src/test/trace/main.cc @@ -29,7 +29,7 @@ struct Test_thread : Thread Env &env; Timer::Connection timer { env }; - void entry() + void entry() override { for (unsigned i = 0; ; i++) { if (i & 0x3) { @@ -123,7 +123,7 @@ struct Test_out_of_metadata ~Test_thread() { join(); } - void entry() { } + void entry() override { } }; Test_out_of_metadata(Env &env) : env(env) diff --git a/repos/os/src/test/weak_ptr/main.cc b/repos/os/src/test/weak_ptr/main.cc index 3a7a170ec..54a03e752 100644 --- a/repos/os/src/test/weak_ptr/main.cc +++ b/repos/os/src/test/weak_ptr/main.cc @@ -165,7 +165,7 @@ struct Destruct_thread : Genode::Thread O &obj; Genode::Heap & heap; - void entry() + void entry() override { using namespace Genode; log("thread: going to destroy object"); diff --git a/repos/ports/include/vmm/vcpu_dispatcher.h b/repos/ports/include/vmm/vcpu_dispatcher.h index 5673ef596..66cf4d6f4 100644 --- a/repos/ports/include/vmm/vcpu_dispatcher.h +++ b/repos/ports/include/vmm/vcpu_dispatcher.h @@ -127,7 +127,7 @@ class Vmm::Vcpu_dispatcher : public T * associated with several portals, each for handling a specific * virtualization event. */ - void entry() { } + void entry() override { } /** * Return capability selector of the VCPU's SM and EC diff --git a/repos/ports/include/vmm/vcpu_thread.h b/repos/ports/include/vmm/vcpu_thread.h index 00c5e7ce1..3e189bc8f 100644 --- a/repos/ports/include/vmm/vcpu_thread.h +++ b/repos/ports/include/vmm/vcpu_thread.h @@ -72,7 +72,7 @@ class Vmm::Vcpu_other_pd : public Vmm::Vcpu_thread _exc_pt_sel(Genode::cap_map().insert(Nova::NUM_INITIAL_VCPU_PT_LOG2)) { } - void start(Genode::addr_t sel_ec) + void start(Genode::addr_t sel_ec) override { using namespace Genode; @@ -113,7 +113,7 @@ class Vmm::Vcpu_other_pd : public Vmm::Vcpu_thread cpu_thread.resume(); } - Genode::addr_t exc_base() { return _exc_pt_sel; } + Genode::addr_t exc_base() override { return _exc_pt_sel; } }; @@ -151,9 +151,9 @@ class Vmm::Vcpu_same_pd : public Vmm::Vcpu_thread, Genode::Thread this->native_thread().exc_pt_sel = cap_map().insert(Nova::NUM_INITIAL_PT_LOG2); } - addr_t exc_base() { return this->native_thread().exc_pt_sel; } + addr_t exc_base() override { return this->native_thread().exc_pt_sel; } - void start(Genode::addr_t sel_ec) + void start(Genode::addr_t sel_ec) override { this->Thread::start(); @@ -168,7 +168,7 @@ class Vmm::Vcpu_same_pd : public Vmm::Vcpu_thread, Genode::Thread Nova::revoke(Nova::Obj_crd(pager_pt, 0)); } - void entry() { } + void entry() override { } }; #endif /* _INCLUDE__VMM__VCPU_THREAD_H_ */ diff --git a/repos/ports/src/app/seoul/target.inc b/repos/ports/src/app/seoul/target.inc index cb4a25a99..ee2374ef5 100644 --- a/repos/ports/src/app/seoul/target.inc +++ b/repos/ports/src/app/seoul/target.inc @@ -25,6 +25,7 @@ INC_DIR += $(SEOUL_GENODE_DIR)/include INC_DIR += $(REP_DIR)/src/app/seoul/include include $(call select_from_repositories,lib/mk/libc-common.inc) +CC_CXX_WARN_STRICT = -Wextra -Weffc++ -Werror CC_WARN += -Wno-parentheses -Wall -Wno-unused CC_CXX_OPT += -march=core2 CC_CXX_OPT += -mssse3 diff --git a/repos/ports/src/noux/child.h b/repos/ports/src/noux/child.h index 732f3b6b2..5752d868b 100644 --- a/repos/ports/src/noux/child.h +++ b/repos/ports/src/noux/child.h @@ -411,19 +411,19 @@ class Noux::Child : public Rpc_object, ** Noux session interface ** ****************************/ - Dataspace_capability sysio_dataspace() + Dataspace_capability sysio_dataspace() override { return _sysio_ds.cap(); } - Capability lookup_region_map(addr_t const addr) + Capability lookup_region_map(addr_t const addr) override { return _pd.lookup_region_map(addr); } - bool syscall(Syscall sc); + bool syscall(Syscall sc) override; - int next_open_fd(int start_fd) + int next_open_fd(int start_fd) override { if (start_fd >= 0) for (int fd = start_fd; fd < MAX_FILE_DESCRIPTORS; fd++) @@ -454,7 +454,7 @@ class Noux::Child : public Rpc_object, return true; } - int add_io_channel(Shared_pointer io_channel, int fd = -1) + int add_io_channel(Shared_pointer io_channel, int fd = -1) override { fd = File_descriptor_registry::add_io_channel(io_channel, fd); @@ -467,7 +467,7 @@ class Noux::Child : public Rpc_object, return fd; } - void remove_io_channel(int fd) + void remove_io_channel(int fd) override { Shared_pointer io_channel = _lookup_channel(fd); @@ -484,7 +484,7 @@ class Noux::Child : public Rpc_object, File_descriptor_registry::remove_io_channel(fd); } - void flush() + void flush() override { for (int fd = 0; fd < MAX_FILE_DESCRIPTORS; fd++) try { @@ -497,7 +497,7 @@ class Noux::Child : public Rpc_object, ** Family_member interface ** *****************************/ - void submit_signal(Noux::Sysio::Signal sig) + void submit_signal(Noux::Sysio::Signal sig) override { try { _pending_signals.add(sig); @@ -567,7 +567,7 @@ class Noux::Child : public Rpc_object, ** Interrupt_handler interface ** *********************************/ - void handle_interrupt(Sysio::Signal signal) + void handle_interrupt(Sysio::Signal signal) override { submit_signal(signal); } diff --git a/repos/ports/src/noux/destruct_queue.h b/repos/ports/src/noux/destruct_queue.h index b60bde2bf..084878f88 100644 --- a/repos/ports/src/noux/destruct_queue.h +++ b/repos/ports/src/noux/destruct_queue.h @@ -60,7 +60,7 @@ class Noux::Destruct_queue virtual ~Element() { }; - void destroy() + void destroy() override { Genode::destroy(_alloc, static_cast(this)); } diff --git a/repos/ports/src/noux/empty_rom_session_component.h b/repos/ports/src/noux/empty_rom_session_component.h index 4f29089ea..ae5cf82ab 100644 --- a/repos/ports/src/noux/empty_rom_session_component.h +++ b/repos/ports/src/noux/empty_rom_session_component.h @@ -47,12 +47,12 @@ class Noux::Empty_rom_session_component : public Rpc_object ** ROM session interface ** ***************************/ - Rom_dataspace_capability dataspace() + Rom_dataspace_capability dataspace() override { return Rom_dataspace_capability(); } - void sigh(Signal_context_capability) { } + void sigh(Signal_context_capability) override { } }; #endif /* _NOUX__EMPTY_ROM_SESSION_COMPONENT_H_ */ diff --git a/repos/ports/src/noux/family_member.h b/repos/ports/src/noux/family_member.h index b6eb9ec17..1d00d0b01 100644 --- a/repos/ports/src/noux/family_member.h +++ b/repos/ports/src/noux/family_member.h @@ -103,7 +103,7 @@ class Noux::Family_member : private List::Element, */ /* Called by the child on the parent (via Parent_exit) */ - void exit_child() + void exit_child() override { submit_signal(Sysio::Signal::SIG_CHLD); } @@ -121,7 +121,7 @@ class Noux::Family_member : private List::Element, void execve_child(Family_member &child, const char *filename, Args const &args, - Sysio::Env const &env) + Sysio::Env const &env) override { Lock::Guard guard(_lock); Family_member *new_child = child.do_execve(filename, diff --git a/repos/ports/src/noux/main.cc b/repos/ports/src/noux/main.cc index 92f6bdcfc..7097da148 100644 --- a/repos/ports/src/noux/main.cc +++ b/repos/ports/src/noux/main.cc @@ -288,7 +288,7 @@ struct Noux::Main { Family_member *init_process = nullptr; - bool kill(int pid, Noux::Sysio::Signal sig) + bool kill(int pid, Noux::Sysio::Signal sig) override { return init_process->deliver_kill(pid, sig); } diff --git a/repos/ports/src/noux/pd_session_component.h b/repos/ports/src/noux/pd_session_component.h index 5b16dfef2..20ce93295 100644 --- a/repos/ports/src/noux/pd_session_component.h +++ b/repos/ports/src/noux/pd_session_component.h @@ -265,8 +265,8 @@ class Noux::Pd_session_component : public Rpc_object void transfer_quota(Capability, Cap_quota) override { } - Cap_quota cap_quota() const { return _pd.cap_quota(); } - Cap_quota used_caps() const { return _pd.used_caps(); } + Cap_quota cap_quota() const override { return _pd.cap_quota(); } + Cap_quota used_caps() const override { return _pd.used_caps(); } Ram_dataspace_capability alloc(size_t size, Cache_attribute cached) override { diff --git a/repos/ports/src/noux/rom_session_component.h b/repos/ports/src/noux/rom_session_component.h index ddb76ceca..91bed2957 100644 --- a/repos/ports/src/noux/rom_session_component.h +++ b/repos/ports/src/noux/rom_session_component.h @@ -250,12 +250,12 @@ class Noux::Rom_session_component : public Rpc_object ** ROM session interface ** ***************************/ - Rom_dataspace_capability dataspace() + Rom_dataspace_capability dataspace() override { return static_cap_cast(_ds_cap); } - void sigh(Signal_context_capability) { } + void sigh(Signal_context_capability) override { } }; #endif /* _NOUX__ROM_SESSION_COMPONENT_H_ */