diff options
| author | liamwhite <liamwhite@users.noreply.github.com> | 2023-07-19 23:14:55 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-07-19 23:14:55 +0200 |
| commit | 014ca709c939512569abc7765b031b496c62a884 (patch) | |
| tree | d43c24e639c9102e63c48a53ee3c8cefaee6f321 /src/common | |
| parent | Merge pull request #11114 from Kelebek1/warnings (diff) | |
| parent | demangle: Update to llvm/llvm-project@ecbc812e0cca (diff) | |
| download | yuzu-014ca709c939512569abc7765b031b496c62a884.tar yuzu-014ca709c939512569abc7765b031b496c62a884.tar.gz yuzu-014ca709c939512569abc7765b031b496c62a884.tar.bz2 yuzu-014ca709c939512569abc7765b031b496c62a884.tar.lz yuzu-014ca709c939512569abc7765b031b496c62a884.tar.xz yuzu-014ca709c939512569abc7765b031b496c62a884.tar.zst yuzu-014ca709c939512569abc7765b031b496c62a884.zip | |
Diffstat (limited to 'src/common')
| -rw-r--r-- | src/common/demangle.cpp | 2 | ||||
| -rw-r--r-- | src/common/detached_tasks.cpp | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/common/demangle.cpp b/src/common/demangle.cpp index 3310faf86..6e117cb41 100644 --- a/src/common/demangle.cpp +++ b/src/common/demangle.cpp @@ -23,7 +23,7 @@ std::string DemangleSymbol(const std::string& mangled) { SCOPE_EXIT({ std::free(demangled); }); if (is_itanium(mangled)) { - demangled = llvm::itaniumDemangle(mangled.c_str(), nullptr, nullptr, nullptr); + demangled = llvm::itaniumDemangle(mangled.c_str()); } if (!demangled) { diff --git a/src/common/detached_tasks.cpp b/src/common/detached_tasks.cpp index da64848da..f2ed795cc 100644 --- a/src/common/detached_tasks.cpp +++ b/src/common/detached_tasks.cpp @@ -30,8 +30,8 @@ DetachedTasks::~DetachedTasks() { void DetachedTasks::AddTask(std::function<void()> task) { std::unique_lock lock{instance->mutex}; ++instance->count; - std::thread([task{std::move(task)}]() { - task(); + std::thread([task_{std::move(task)}]() { + task_(); std::unique_lock thread_lock{instance->mutex}; --instance->count; std::notify_all_at_thread_exit(instance->cv, std::move(thread_lock)); |