From 91a4f52f67bdc955268131d0a67d41400a2bd40f Mon Sep 17 00:00:00 2001 From: WerWolv Date: Mon, 14 Nov 2022 10:42:09 +0100 Subject: [PATCH] build: Potentially fix LTO --- lib/external/pattern_language | 2 +- plugins/builtin/include/ui/hex_editor.hpp | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/external/pattern_language b/lib/external/pattern_language index 239b26b57..7aeac4a3a 160000 --- a/lib/external/pattern_language +++ b/lib/external/pattern_language @@ -1 +1 @@ -Subproject commit 239b26b573642a393ece29d2b4448ba4aadb9979 +Subproject commit 7aeac4a3a9fc06df6bac59fe1a07101b912b9bc7 diff --git a/plugins/builtin/include/ui/hex_editor.hpp b/plugins/builtin/include/ui/hex_editor.hpp index 9b2e2130a..5192e0407 100644 --- a/plugins/builtin/include/ui/hex_editor.hpp +++ b/plugins/builtin/include/ui/hex_editor.hpp @@ -197,8 +197,8 @@ namespace hex::plugin::builtin::ui { std::optional m_currCustomEncoding; - static std::optional defaultColorCallback(u64, const u8 *, size_t) { return std::nullopt; } - static void defaultTooltipCallback(u64, const u8 *, size_t) { } + static inline std::optional defaultColorCallback(u64, const u8 *, size_t) { return std::nullopt; } + static inline void defaultTooltipCallback(u64, const u8 *, size_t) { } std::function(u64, const u8 *, size_t)> m_foregroundColorCallback = defaultColorCallback, m_backgroundColorCallback = defaultColorCallback; std::function m_tooltipCallback = defaultTooltipCallback; };