Преглед изворни кода

Merge pull request #12472 from FearlessTobi/port-7239

Port citra-emu/citra#7239: "common: Miscellaneous cleanups"
liamwhite пре 2 година
родитељ
комит
467ac4fdfe
2 измењених фајлова са 1 додато и 9 уклоњено
  1. 1 1
      src/common/ring_buffer.h
  2. 0 8
      src/yuzu/main.h

+ 1 - 1
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

+ 0 - 8
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,