From 98bf2dadb818556e0c0907ddf2ff074e83d7187e Mon Sep 17 00:00:00 2001 From: Christian Prochaska Date: Tue, 2 May 2023 08:56:16 +0200 Subject: [PATCH] core: fix build errors with gcc 12 Fixes #4828 --- repos/base/src/core/include/assertion.h | 2 +- repos/base/src/core/include/core_env.h | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/repos/base/src/core/include/assertion.h b/repos/base/src/core/include/assertion.h index ec9ccc6e67..b14f189062 100644 --- a/repos/base/src/core/include/assertion.h +++ b/repos/base/src/core/include/assertion.h @@ -21,7 +21,7 @@ do { \ Genode::error("Unexpected call of '", __FUNCTION__, "' " \ "(", __FILE__, ":", __LINE__, ")"); \ - for (;;); throw 0UL; \ + for (;;); \ } while (false) #endif /* _CORE__INCLUDE__ASSERTION_H_ */ diff --git a/repos/base/src/core/include/core_env.h b/repos/base/src/core/include/core_env.h index a152d34de7..8db02b38a9 100644 --- a/repos/base/src/core/include/core_env.h +++ b/repos/base/src/core/include/core_env.h @@ -81,8 +81,6 @@ class Core::Core_env : public Env_deprecated, Noncopyable _pd_session.init_cap_and_ram_accounts(); } - ~Core_env() { parent()->exit(0); } - Rpc_entrypoint &entrypoint() { return _entrypoint; } Ram_allocator &ram_allocator() { return _synced_ram_allocator; } Region_map &local_rm() { return _region_map; }