diff options
| author | LC <mathew1800@gmail.com> | 2020-10-20 22:08:53 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-10-20 22:08:53 -0400 |
| commit | 2e74b79e89fe1e6a21fe0d8650844e563b3c32f5 (patch) | |
| tree | 0dbc65ac86e609ae22087c7be9d4759ac6b73004 /src/core/hle/kernel/handle_table.cpp | |
| parent | fdd91540695594c4b015f234325a950a5e6566e9 (diff) | |
| parent | 3d592972dc3fd61cc88771b889eff237e4e03e0f (diff) | |
Merge pull request #4814 from yuzu-emu/revert-4796-clang
Revert "core: Fix clang build"
Diffstat (limited to 'src/core/hle/kernel/handle_table.cpp')
| -rw-r--r-- | src/core/hle/kernel/handle_table.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/core/hle/kernel/handle_table.cpp b/src/core/hle/kernel/handle_table.cpp index fe4988f84..3e745c18b 100644 --- a/src/core/hle/kernel/handle_table.cpp +++ b/src/core/hle/kernel/handle_table.cpp @@ -68,7 +68,7 @@ ResultVal<Handle> HandleTable::Create(std::shared_ptr<Object> obj) { generations[slot] = generation; objects[slot] = std::move(obj); - const auto handle = static_cast<Handle>(generation | static_cast<u16>(slot << 15)); + Handle handle = generation | (slot << 15); return MakeResult<Handle>(handle); } |