diff options
| -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: | |||
| 103 | // Having them on the same cache-line would result in false-sharing between them. | 103 | // Having them on the same cache-line would result in false-sharing between them. |
| 104 | // TODO: Remove this ifdef whenever clang and GCC support | 104 | // TODO: Remove this ifdef whenever clang and GCC support |
| 105 | // std::hardware_destructive_interference_size. | 105 | // std::hardware_destructive_interference_size. |
| 106 | #if defined(_MSC_VER) && _MSC_VER >= 1911 | 106 | #ifdef __cpp_lib_hardware_interference_size |
| 107 | alignas(std::hardware_destructive_interference_size) std::atomic_size_t m_read_index{0}; | 107 | alignas(std::hardware_destructive_interference_size) std::atomic_size_t m_read_index{0}; |
| 108 | alignas(std::hardware_destructive_interference_size) std::atomic_size_t m_write_index{0}; | 108 | alignas(std::hardware_destructive_interference_size) std::atomic_size_t m_write_index{0}; |
| 109 | #else | 109 | #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 { | |||
| 168 | /// Max number of recently loaded items to keep track of | 168 | /// Max number of recently loaded items to keep track of |
| 169 | static const int max_recent_files_item = 10; | 169 | static const int max_recent_files_item = 10; |
| 170 | 170 | ||
| 171 | // TODO: Make use of this! | ||
| 172 | enum { | ||
| 173 | UI_IDLE, | ||
| 174 | UI_EMU_BOOTING, | ||
| 175 | UI_EMU_RUNNING, | ||
| 176 | UI_EMU_STOPPING, | ||
| 177 | }; | ||
| 178 | |||
| 179 | enum { | 171 | enum { |
| 180 | CREATE_SHORTCUT_MSGBOX_FULLSCREEN_YES, | 172 | CREATE_SHORTCUT_MSGBOX_FULLSCREEN_YES, |
| 181 | CREATE_SHORTCUT_MSGBOX_SUCCESS, | 173 | CREATE_SHORTCUT_MSGBOX_SUCCESS, |