summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Lioncash2021-02-04 14:54:06 -0500
committerGravatar Lioncash2021-02-04 14:55:08 -0500
commit53aec1fe2d298ac98e3d2c846deb2227c12b4eb4 (patch)
treedba46c8182cfad0bdd8bb5b55a6bc102bb3c662f
parentMerge pull request #5863 from ogniK5377/disable-reverb (diff)
downloadyuzu-53aec1fe2d298ac98e3d2c846deb2227c12b4eb4.tar.gz
yuzu-53aec1fe2d298ac98e3d2c846deb2227c12b4eb4.tar.xz
yuzu-53aec1fe2d298ac98e3d2c846deb2227c12b4eb4.zip
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?.
-rw-r--r--src/core/hle/kernel/k_priority_queue.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/core/hle/kernel/k_priority_queue.h b/src/core/hle/kernel/k_priority_queue.h
index 13d628b85..afaab9812 100644
--- a/src/core/hle/kernel/k_priority_queue.h
+++ b/src/core/hle/kernel/k_priority_queue.h
@@ -55,7 +55,7 @@ concept KPriorityQueueMember = !std::is_reference_v<T> && requires(T & t) {
55 ->Common::ConvertibleTo<s32>; 55 ->Common::ConvertibleTo<s32>;
56}; 56};
57 57
58template <typename Member, size_t _NumCores, int LowestPriority, int HighestPriority> 58template <typename Member, size_t NumCores_, int LowestPriority, int HighestPriority>
59requires KPriorityQueueMember<Member> class KPriorityQueue { 59requires KPriorityQueueMember<Member> class KPriorityQueue {
60public: 60public:
61 using AffinityMaskType = typename std::remove_cv_t< 61 using AffinityMaskType = typename std::remove_cv_t<
@@ -65,7 +65,7 @@ public:
65 static_assert(HighestPriority >= 0); 65 static_assert(HighestPriority >= 0);
66 static_assert(LowestPriority >= HighestPriority); 66 static_assert(LowestPriority >= HighestPriority);
67 static constexpr size_t NumPriority = LowestPriority - HighestPriority + 1; 67 static constexpr size_t NumPriority = LowestPriority - HighestPriority + 1;
68 static constexpr size_t NumCores = _NumCores; 68 static constexpr size_t NumCores = NumCores_;
69 69
70 static constexpr bool IsValidCore(s32 core) { 70 static constexpr bool IsValidCore(s32 core) {
71 return 0 <= core && core < static_cast<s32>(NumCores); 71 return 0 <= core && core < static_cast<s32>(NumCores);