ExternalVendorCode/genode
1
0
Fork 0
mirror of https://github.com/genodelabs/genode.git synced 2024-12-18 21:27:56 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Add missing override annotations

Browse Source 
Issue #3159
This commit is contained in:
Norman Feske 2019-02-14 22:39:08 +01:00
parent 1f47e2823a
commit b3727a9b46
259 changed files with 747 additions and 743 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
repos/base-fiasco/src/core/include/platform.h
View File

@ -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;
};
}

6
repos/base-foc/src/core/include/platform.h
View File

@ -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;
};
}

2
repos/base-foc/src/core/irq_session_component.cc
View File

@ -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()
{

14
repos/base-foc/src/include/base/internal/cap_alloc.h
View File

@ -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<Spin_lock> 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<Spin_lock> 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<Spin_lock> 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<Cap_index_allocator_tpl<T, SZ> >(this);
}

2
repos/base-foc/src/include/signal_source/client.h
View File

@ -60,7 +60,7 @@ class Genode::Signal_source_client : public Rpc_client<Foc_signal_source>
* 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_ */

2
repos/base-hw/src/core/kernel/cpu.h
View File

@ -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);

2
repos/base-hw/src/core/kernel/irq.h
View File

@ -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();

30
repos/base-hw/src/core/kernel/thread.h
View File

@ -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;
/***************

6
repos/base-hw/src/core/kernel/vm.h
View File

@ -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_ */

2
repos/base-hw/src/core/native_pd_component.h
View File

@ -40,7 +40,7 @@ class Genode::Native_pd_component : public Rpc_object<Hw_native_pd>
~Native_pd_component();
void upgrade_cap_slab();
void upgrade_cap_slab() override;
};
#endif /* _CORE__INCLUDE__NATIVE_PD_COMPONENT_H_ */

2
repos/base-hw/src/core/pager.h
View File

@ -220,7 +220,7 @@ class Genode::Pager_entrypoint : public Object_pool<Pager_object>,
** Thread interface **
**********************/
void entry();
void entry() override;
};
#endif /* _CORE__PAGER_H_ */

2
repos/base-hw/src/core/platform.h
View File

@ -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; }

6
repos/base-hw/src/core/spec/arm_v7/trustzone/vm_session_component.h
View File

@ -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) {}
};

2
repos/base-hw/src/core/spec/arm_v7/virtualization/kernel/vm.cc
View File

@ -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<Vm*>(&job);

6
repos/base-hw/src/core/spec/arm_v7/virtualization/vm_session_component.h
View File

@ -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) {}
};

8
repos/base-hw/src/core/spec/x86_64/muen/vm_session_component.h
View File

@ -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_ */

4
repos/base-hw/src/lib/hw/page_table_allocator.h
View File

@ -110,7 +110,7 @@ class Hw::Page_table_allocator<TABLE_SIZE>::Array<COUNT>::Allocator
Bit_allocator _free_tables { };
unsigned _alloc()
unsigned _alloc() override
{
try {
return _free_tables.alloc();
@ -118,7 +118,7 @@ class Hw::Page_table_allocator<TABLE_SIZE>::Array<COUNT>::Allocator
throw Out_of_tables();
}
void _free(unsigned idx) { _free_tables.free(idx); }
void _free(unsigned idx) override { _free_tables.free(idx); }
public:

2
repos/base-hw/src/test/cpu_quota/main.cc
View File

@ -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) {

4
repos/base-linux/src/core/include/dataspace_component.h
View File

@ -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());

2
repos/base-linux/src/core/include/io_mem_session_component.h
View File

@ -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(); }
};
}

8
repos/base-linux/src/core/include/platform.h
View File

@ -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;
};
}

10
repos/base-linux/src/core/include/region_map_component.h
View File

@ -54,16 +54,16 @@ class Genode::Region_map_component : public Rpc_object<Region_map>,
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; }

6
repos/base-linux/src/include/base/internal/local_pd_session.h
View File

@ -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<Region_map> address_space()
Capability<Region_map> address_space() override
{
return Local_capability<Region_map>::local_cap(&_address_space);
}
Capability<Region_map> stack_area()
Capability<Region_map> stack_area() override
{
return Local_capability<Region_map>::local_cap(&_stack_area);
}
Capability<Region_map> linker_area()
Capability<Region_map> linker_area() override
{
return Local_capability<Region_map>::local_cap(&_linker_area);
}

4
repos/base-linux/src/include/base/internal/local_rm_session.h
View File

@ -36,13 +36,13 @@ struct Genode::Local_rm_session : Rm_session, Local_session
Local_session(id_space, id, *this), md_alloc(md_alloc)
{ }
Capability<Region_map> create(size_t size)
Capability<Region_map> create(size_t size) override
{
Region_map *rm = new (md_alloc) Region_map_mmap(true, size);
return Local_capability<Region_map>::local_cap(rm);
}
void destroy(Capability<Region_map> cap)
void destroy(Capability<Region_map> cap) override
{
Region_map *rm = Local_capability<Region_map>::deref(cap);
Genode::destroy(md_alloc, rm);

10
repos/base-linux/src/include/linux_dataspace/client.h
View File

@ -31,17 +31,17 @@ namespace Genode {
** Generic dataspace interface **
*********************************/
size_t size() { return call<Rpc_size>(); }
addr_t phys_addr() { return call<Rpc_phys_addr>(); }
bool writable() { return call<Rpc_writable>(); }
size_t size() override { return call<Rpc_size>(); }
addr_t phys_addr() override { return call<Rpc_phys_addr>(); }
bool writable() override { return call<Rpc_writable>(); }
/****************************************
** Linux-specific dataspace interface **
****************************************/
Filename fname() { return call<Rpc_fname>(); }
Untyped_capability fd() { return call<Rpc_fd>(); }
Filename fname() override { return call<Rpc_fname>(); }
Untyped_capability fd() override { return call<Rpc_fd>(); }
};
}

6
repos/base-linux/src/include/linux_native_cpu/client.h
View File

@ -24,13 +24,13 @@ struct Genode::Linux_native_cpu_client : Rpc_client<Linux_native_cpu>
explicit Linux_native_cpu_client(Capability<Native_cpu> cap)
: Rpc_client<Linux_native_cpu>(static_cap_cast<Linux_native_cpu>(cap)) { }
void thread_id(Thread_capability thread, int pid, int tid) {
void thread_id(Thread_capability thread, int pid, int tid) override {
call<Rpc_thread_id>(thread, pid, tid); }
Untyped_capability server_sd(Thread_capability thread) {
Untyped_capability server_sd(Thread_capability thread) override {
return call<Rpc_server_sd>(thread); }
Untyped_capability client_sd(Thread_capability thread) {
Untyped_capability client_sd(Thread_capability thread) override {
return call<Rpc_client_sd>(thread); }
};

24
repos/base-linux/src/lib/lx_hybrid/lx_hybrid.cc
View File

@ -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");
}

2
repos/base-linux/src/test/lx_hybrid_errno/main.cc
View File

@ -24,7 +24,7 @@ struct Thread : Genode::Thread_deprecated<STACK_SIZE>
Thread(Genode::Lock &barrier)
: Genode::Thread_deprecated<STACK_SIZE>("stat"), _barrier(barrier) { start(); }
void entry()
void entry() override
{
/*
* Stat syscall should return with errno ENOENT

2
repos/base-nova/include/nova_native_cpu/client.h
View File

@ -26,7 +26,7 @@ struct Genode::Nova_native_cpu_client : Rpc_client<Nova_native_cpu>
: Rpc_client<Nova_native_cpu>(static_cap_cast<Nova_native_cpu>(cap)) { }
void thread_type(Thread_capability thread_cap, Thread_type thread_type,
Exception_base exception_base) {
Exception_base exception_base) override {
call<Rpc_thread_type>(thread_cap, thread_type, exception_base); }
};

2
repos/base-nova/src/core/include/pager.h
View File

@ -400,7 +400,7 @@ namespace Genode {
/**
* Thread interface
*/
void entry();
void entry() override;
/**
* Return capability to this activation

2
repos/base-nova/src/core/include/signal_source_component.h
View File

@ -52,7 +52,7 @@ class Genode::Signal_source_component : public Rpc_object<Nova_signal_source,
Native_capability blocking_semaphore() const { return _blocking_semaphore; }
Signal wait_for_signal() { /* unused on NOVA */ return Signal(0, 0); }
Signal wait_for_signal() override { /* unused on NOVA */ return Signal(0, 0); }
void submit(Signal_context_component *, unsigned long) { /* unused on NOVA */ }
};

8
repos/base-nova/src/test/platform/main.cc
View File

@ -426,7 +426,7 @@ class Pager : private Genode::Thread {
Ram_dataspace_capability _ds;
static addr_t _ds_mem;
void entry() { }
void entry() override { }
static void page_fault()
{
@ -510,8 +510,8 @@ class Cause_mapping : public Genode::Thread {
_mem_st(mem_st)
{ }
void entry() {
void entry() override
{
log("mapper: hello");
Nova::Utcb * nova_utcb = reinterpret_cast<Nova::Utcb *>(utcb());
@ -580,7 +580,7 @@ class Greedy : public Genode::Thread {
_env(env)
{ }
void entry()
void entry() override
{
log("starting");

2
repos/base-nova/src/timer/nova/time_source.h
View File

@ -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:

4
repos/base-okl4/src/core/include/platform.h
View File

@ -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; }
/**************************************

8
repos/base-pistachio/src/core/include/platform.h
View File

@ -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

2
repos/base-sel4/src/core/include/pager.h
View File

@ -195,7 +195,7 @@ class Genode::Pager_entrypoint : public Object_pool<Pager_object>,
** Thread interface **
**********************/
void entry();
void entry() override;
};
#endif /* _CORE__INCLUDE__PAGER_H_ */

22
repos/base-sel4/src/core/include/platform.h
View File

@ -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 &region_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 &region_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

2
repos/base/include/base/allocator.h
View File

@ -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

2
repos/base/include/base/allocator_avl.h
View File

@ -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

2
repos/base/include/base/child.h
View File

@ -294,7 +294,7 @@ class Genode::Child : protected Rpc_object<Parent>,
void start(addr_t) override;
Capability<Cpu_thread> cap() const { return _cap; }
Capability<Cpu_thread> cap() const override { return _cap; }
};
/* child policy */

10
repos/base/include/base/heap.h
View File

@ -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_ */

4
repos/base/include/base/rpc_server.h
View File

@ -267,7 +267,7 @@ struct Genode::Rpc_object : Rpc_object_base, Rpc_dispatcher<RPC_INTERFACE, SERVE
{
struct Capability_guard;
Rpc_exception_code dispatch(Rpc_opcode opcode, Ipc_unmarshaller &in, Msgbuf_base &out)
Rpc_exception_code dispatch(Rpc_opcode opcode, Ipc_unmarshaller &in, Msgbuf_base &out) override
{
return Rpc_dispatcher<RPC_INTERFACE, SERVER>::dispatch(opcode, in, out);
}
@ -397,7 +397,7 @@ class Genode::Rpc_entrypoint : Thread, public Object_pool<Rpc_object_base>
*
* \noapi
*/
void entry();
void entry() override;
public:

4
repos/base/include/pd_session/client.h
View File

@ -70,8 +70,8 @@ struct Genode::Pd_session_client : Rpc_client<Pd_session>
void transfer_quota(Capability<Pd_session> pd, Cap_quota amount) override {
call<Rpc_transfer_cap_quota>(pd, amount); }
Cap_quota cap_quota() const { return call<Rpc_cap_quota>(); }
Cap_quota used_caps() const { return call<Rpc_used_caps>(); }
Cap_quota cap_quota() const override { return call<Rpc_cap_quota>(); }
Cap_quota used_caps() const override { return call<Rpc_used_caps>(); }
Ram_dataspace_capability alloc(size_t size,
Cache_attribute cached = CACHED) override

4
repos/base/include/timer_session/connection.h
View File

@ -293,7 +293,7 @@ class Timer::Connection : public Genode::Connection<Session>,
* \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<Session>,
* \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();

4
repos/base/include/util/avl_tree.h
View File

@ -195,12 +195,12 @@ class Genode::Avl_tree : Avl_node<NT>
*/
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<NT *>(n1)->higher(static_cast<NT *>(n2));
}
void recompute(Avl_node_base *node)
void recompute(Avl_node_base *node) override
{
static_cast<NT *>(node)->recompute();
}

6
repos/base/include/vm_session/client.h
View File

@ -42,13 +42,13 @@ struct Genode::Vm_session_client : Rpc_client<Vm_session>
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<Rpc_attach>(ds, vm_addr); }
void detach(addr_t vm_addr, size_t size) {
void detach(addr_t vm_addr, size_t size) override {
call<Rpc_detach>(vm_addr, size); }
void attach_pic(addr_t vm_addr) {
void attach_pic(addr_t vm_addr) override {
call<Rpc_attach_pic>(vm_addr); }
Vcpu_id create_vcpu(Allocator &, Env &, Vm_handler_base &);

8
repos/base/src/core/include/core_mem_alloc.h
View File

@ -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);
}

2
repos/base/src/core/include/core_region_map.h
View File

@ -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(); }

2
repos/base/src/core/include/cpu_root.h
View File

@ -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);

2
repos/base/src/core/include/cpu_thread_component.h
View File

@ -185,7 +185,7 @@ class Genode::Cpu_thread_component : public Rpc_object<Cpu_thread>,
** 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(),

2
repos/base/src/core/include/io_mem_root.h
View File

@ -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,

2
repos/base/src/core/include/io_mem_session_component.h
View File

@ -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; }
};
}

2
repos/base/src/core/include/io_port_root.h
View File

@ -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:

12
repos/base/src/core/include/io_port_session_component.h
View File

@ -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;
};
}

2
repos/base/src/core/include/irq_root.h
View File

@ -39,7 +39,7 @@ class Genode::Irq_root : public Root_component<Irq_session_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:

2
repos/base/src/core/include/log_root.h
View File

@ -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];

2
repos/base/src/core/include/log_session_component.h
View File

@ -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");

2
repos/base/src/core/include/pager.h
View File

@ -202,7 +202,7 @@ class Genode::Pager_entrypoint : public Object_pool<Pager_object>,
** Thread interface **
**********************/
void entry();
void entry() override;
};
#endif /* _CORE__INCLUDE__PAGER_H_ */

2
repos/base/src/core/include/pd_root.h
View File

@ -59,7 +59,7 @@ class Genode::Pd_root : public Genode::Root_component<Genode::Pd_session_compone
protected:
Pd_session_component *_create_session(const char *args)
Pd_session_component *_create_session(const char *args) override
{
return new (md_alloc())
Pd_session_component(_ep,

6
repos/base/src/core/include/pd_session_component.h
View File

@ -283,12 +283,12 @@ class Genode::Pd_session_component : public Session_object<Pd_session>
void transfer_quota(Capability<Pd_session>, Cap_quota) override;
void transfer_quota(Capability<Pd_session>, 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<Pd_session>
** Platform-specific interface extension **
*******************************************/
Capability<Native_pd> native_pd() { return _native_pd.cap(); }
Capability<Native_pd> native_pd() override { return _native_pd.cap(); }
};
#endif /* _CORE__INCLUDE__PD_SESSION_COMPONENT_H_ */

2
repos/base/src/core/include/region_map_component.h
View File

@ -199,7 +199,7 @@ class Genode::Rm_client : public Pager_object, public Rm_faulter,
Rm_faulter(static_cast<Pager_object &>(*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

2
repos/base/src/core/include/rm_root.h
View File

@ -32,7 +32,7 @@ class Genode::Rm_root : public Root_component<Rm_session_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);

2
repos/base/src/core/include/trace/root.h
View File

@ -34,7 +34,7 @@ class Genode::Trace::Root : public Genode::Root_component<Session_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);

20
repos/base/src/core/include/trace/session_component.h
View File

@ -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_ */

2
repos/base/src/core/include/vm_root.h
View File

@ -32,7 +32,7 @@ class Genode::Vm_root : public Root_component<Vm_session_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(),

2
repos/base/src/core/main.cc
View File

@ -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

2
repos/base/src/lib/base/signal.cc
View File

@ -40,7 +40,7 @@ class Signal_handler_thread : Thread, Lock
*/
Constructible<Signal_source_client> _signal_source { };
void entry()
void entry() override
{
_signal_source.construct(env_deprecated()->pd_session()->alloc_signal_source());
unlock();

2
repos/base/src/lib/startup/init_main_thread.cc
View File

@ -68,7 +68,7 @@ class Main_thread : public Thread_deprecated<MAIN_THREAD_STACK_SIZE>
** Thread interface **
**********************/
void entry() { }
void entry() override { }
};

2
repos/base/src/test/rm_fault/main.cc
View File

@ -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;

4
repos/base/src/test/smp/main.cc
View File

@ -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;

14
repos/base/src/test/thread/main.cc
View File

@ -56,7 +56,7 @@ class Helper : Thread
void *stack() const { return _stack; }
void entry()
void entry() override
{
Constructible<Helper> 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;
}

2
repos/base/src/timer/include/root_component.h
View File

@ -39,7 +39,7 @@ class Timer::Root_component : public Genode::Root_component<Session_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 =

2
repos/base/src/timer/include/session_component.h
View File

@ -46,7 +46,7 @@ class Timer::Session_component : public Genode::Rpc_object<Session>,
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:

2
repos/base/src/timer/include/threaded_time_source.h
View File

@ -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();

2
repos/base/src/timer/periodic/time_source.h
View File

@ -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:

30
repos/demo/include/scout/canvas.h
View File

@ -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<Texture<PT> 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<short> 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<PT> const &texture = static_cast<Texture<PT> 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<PT>(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<PT> *texture = static_cast<Texture<PT> *>(texture_base);

2
repos/demo/include/scout/fader.h
View File

@ -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;

10
repos/demo/include/scout/nitpicker_graphics_backend.h
View File

@ -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;
}

12
repos/demo/include/scout/parent_element.h
View File

@ -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

2
repos/demo/include/scout/user_state.h
View File

@ -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;

10
repos/demo/include/scout/window.h
View File

@ -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();

6
repos/demo/include/scout_gfx/sky_texture_painter.h
View File

@ -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; }
};

2
repos/demo/src/app/launchpad/child_entry.h
View File

@ -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;

4
repos/demo/src/app/launchpad/launch_entry.h
View File

@ -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;

10
repos/demo/src/app/launchpad/launchpad_window.h
View File

@ -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);

6
repos/demo/src/app/launchpad/loadbar.h
View File

@ -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;

2
repos/demo/src/app/launchpad/main.cc
View File

@ -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;

4
repos/demo/src/app/launchpad/section.h
View File

@ -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;

2
repos/demo/src/app/launchpad/status_entry.h
View File

@ -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;

4
repos/demo/src/app/scout/browser_window.cc
View File

@ -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);

14
repos/demo/src/app/scout/browser_window.h
View File

@ -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_ */

36
repos/demo/src/app/scout/elements.h
View File

@ -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_ */

6
repos/demo/src/app/scout/fade_icon.h
View File

@ -62,7 +62,7 @@ class Scout::Fade_icon : public Fader, public Icon<PT, W, H>
/**
* 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<PT, W, H>
/**
* Icon interface
*/
void alpha(int alpha)
void alpha(int alpha) override
{
_curr_value = alpha;
Icon<PT, W, H>::alpha(alpha);
@ -83,7 +83,7 @@ class Scout::Fade_icon : public Fader, public Icon<PT, W, H>
/**
* Element interface
*/
void mfocus(int flag)
void mfocus(int flag) override
{
Icon<PT, W, H>::mfocus(flag);
int step = _focus_alpha - _default_alpha;

2
repos/demo/src/app/scout/refracted_icon.h
View File

@ -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<short>
distmap(_distmap, Area(_distmap_w, _distmap_h));

2
repos/demo/src/app/scout/scrollbar.cc
View File

@ -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)

4
repos/demo/src/app/scout/scrollbar.h
View File

@ -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;
};

2
repos/demo/src/app/scout/sky_texture.h
View File

@ -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);

4
repos/demo/src/app/scout/titlebar.h
View File

@ -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(),

23
repos/demo/src/app/scout/widgets.h
View File

@ -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;
};

6
repos/demo/src/server/liquid_framebuffer/framebuffer_window.h
View File

@ -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;

Some files were not shown because too many files have changed in this diff Show More