From 96abe0d7d3dbdffae5ace79fcfddfa9ccf7f93c8 Mon Sep 17 00:00:00 2001 From: FearlessTobi Date: Mon, 25 Dec 2023 14:10:05 +0100 Subject: [PATCH 1/2] main: Remove unused enum Co-Authored-By: GPUCode <47210458+GPUCode@users.noreply.github.com> --- src/yuzu/main.h | 8 -------- 1 file changed, 8 deletions(-) diff --git a/src/yuzu/main.h b/src/yuzu/main.h index 530e445f9..366e806d5 100644 --- a/src/yuzu/main.h +++ b/src/yuzu/main.h @@ -168,14 +168,6 @@ class GMainWindow : public QMainWindow { /// Max number of recently loaded items to keep track of static const int max_recent_files_item = 10; - // TODO: Make use of this! - enum { - UI_IDLE, - UI_EMU_BOOTING, - UI_EMU_RUNNING, - UI_EMU_STOPPING, - }; - enum { CREATE_SHORTCUT_MSGBOX_FULLSCREEN_YES, CREATE_SHORTCUT_MSGBOX_SUCCESS, From 553dac2ae0b83fa4b251511b62c1022359b6851d Mon Sep 17 00:00:00 2001 From: FearlessTobi Date: Mon, 25 Dec 2023 14:10:40 +0100 Subject: [PATCH 2/2] ring_buffer: Use feature macro Co-Authored-By: GPUCode <47210458+GPUCode@users.noreply.github.com> --- src/common/ring_buffer.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/common/ring_buffer.h b/src/common/ring_buffer.h index 5c961b202..e7e9fdb38 100644 --- a/src/common/ring_buffer.h +++ b/src/common/ring_buffer.h @@ -103,7 +103,7 @@ private: // Having them on the same cache-line would result in false-sharing between them. // TODO: Remove this ifdef whenever clang and GCC support // std::hardware_destructive_interference_size. -#if defined(_MSC_VER) && _MSC_VER >= 1911 +#ifdef __cpp_lib_hardware_interference_size alignas(std::hardware_destructive_interference_size) std::atomic_size_t m_read_index{0}; alignas(std::hardware_destructive_interference_size) std::atomic_size_t m_write_index{0}; #else