diff options
| author | liamwhite <liamwhite@users.noreply.github.com> | 2023-12-26 11:45:57 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-12-26 11:45:57 -0500 |
| commit | 467ac4fdfeb501a71545e9274a964c4e59e767ee (patch) | |
| tree | 58615f26d4d3efdf8b37e3f38bd4342a1b089aff /src | |
| parent | 69b7100dac80ebe94bcb4574bd21f9f6a229e322 (diff) | |
| parent | 553dac2ae0b83fa4b251511b62c1022359b6851d (diff) | |
Merge pull request #12472 from FearlessTobi/port-7239
Port citra-emu/citra#7239: "common: Miscellaneous cleanups"
Diffstat (limited to 'src')
| -rw-r--r-- | src/common/ring_buffer.h | 2 | ||||
| -rw-r--r-- | src/yuzu/main.h | 8 |
2 files changed, 1 insertions, 9 deletions
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 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, |