瀏覽代碼

k_priority_queue: Resolved reserved identifier

An identifier containing a starting underscore followed by a capital
letter is reserved by the standard. It's trivial to avoid this by moving
the underscore to the end of the identifier.

While the likelihood of clashing here being minimal, we can turn a
"should not break" scenario into a definitive "will not break" one, so
why not?.
Lioncash 5 年之前
父節點
當前提交
53aec1fe2d
共有 1 個文件被更改,包括 2 次插入2 次删除
  1. 2 2
      src/core/hle/kernel/k_priority_queue.h

+ 2 - 2
src/core/hle/kernel/k_priority_queue.h

@@ -55,7 +55,7 @@ concept KPriorityQueueMember = !std::is_reference_v<T> && requires(T & t) {
     ->Common::ConvertibleTo<s32>;
     ->Common::ConvertibleTo<s32>;
 };
 };
 
 
-template <typename Member, size_t _NumCores, int LowestPriority, int HighestPriority>
+template <typename Member, size_t NumCores_, int LowestPriority, int HighestPriority>
 requires KPriorityQueueMember<Member> class KPriorityQueue {
 requires KPriorityQueueMember<Member> class KPriorityQueue {
 public:
 public:
     using AffinityMaskType = typename std::remove_cv_t<
     using AffinityMaskType = typename std::remove_cv_t<
@@ -65,7 +65,7 @@ public:
     static_assert(HighestPriority >= 0);
     static_assert(HighestPriority >= 0);
     static_assert(LowestPriority >= HighestPriority);
     static_assert(LowestPriority >= HighestPriority);
     static constexpr size_t NumPriority = LowestPriority - HighestPriority + 1;
     static constexpr size_t NumPriority = LowestPriority - HighestPriority + 1;
-    static constexpr size_t NumCores = _NumCores;
+    static constexpr size_t NumCores = NumCores_;
 
 
     static constexpr bool IsValidCore(s32 core) {
     static constexpr bool IsValidCore(s32 core) {
         return 0 <= core && core < static_cast<s32>(NumCores);
         return 0 <= core && core < static_cast<s32>(NumCores);