From 423679983259948c203e546887445a59b64fc32f Mon Sep 17 00:00:00 2001 From: bunnei Date: Mon, 8 Jan 2018 21:41:37 -0500 Subject: kernel: Rename Semaphore to ConditionVariable. --- src/citra_qt/debugger/wait_tree.cpp | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) (limited to 'src/citra_qt/debugger/wait_tree.cpp') diff --git a/src/citra_qt/debugger/wait_tree.cpp b/src/citra_qt/debugger/wait_tree.cpp index 6d15e43aa..cd03a6554 100644 --- a/src/citra_qt/debugger/wait_tree.cpp +++ b/src/citra_qt/debugger/wait_tree.cpp @@ -5,9 +5,9 @@ #include "citra_qt/debugger/wait_tree.h" #include "citra_qt/util/util.h" +#include "core/hle/kernel/condition_variable.h" #include "core/hle/kernel/event.h" #include "core/hle/kernel/mutex.h" -#include "core/hle/kernel/semaphore.h" #include "core/hle/kernel/thread.h" #include "core/hle/kernel/timer.h" #include "core/hle/kernel/wait_object.h" @@ -85,8 +85,9 @@ std::unique_ptr WaitTreeWaitObject::make(const Kernel::WaitO return std::make_unique(static_cast(object)); case Kernel::HandleType::Mutex: return std::make_unique(static_cast(object)); - case Kernel::HandleType::Semaphore: - return std::make_unique(static_cast(object)); + case Kernel::HandleType::ConditionVariable: + return std::make_unique( + static_cast(object)); case Kernel::HandleType::Timer: return std::make_unique(static_cast(object)); case Kernel::HandleType::Thread: @@ -266,15 +267,15 @@ std::vector> WaitTreeMutex::GetChildren() const { return list; } -WaitTreeSemaphore::WaitTreeSemaphore(const Kernel::Semaphore& object) +WaitTreeConditionVariable::WaitTreeConditionVariable(const Kernel::ConditionVariable& object) : WaitTreeWaitObject(object) {} -std::vector> WaitTreeSemaphore::GetChildren() const { +std::vector> WaitTreeConditionVariable::GetChildren() const { std::vector> list(WaitTreeWaitObject::GetChildren()); - const auto& semaphore = static_cast(object); + const auto& condition_variable = static_cast(object); list.push_back(std::make_unique( - tr("available count = %1").arg(semaphore.GetAvailableCount()))); + tr("available count = %1").arg(condition_variable.GetAvailableCount()))); return list; } -- cgit v1.2.3