diff options
| author | LC <mathew1800@gmail.com> | 2020-10-20 19:19:12 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-10-20 19:19:12 -0400 |
| commit | 88d5140cf2f80d51dc297af3a128a4212215149f (patch) | |
| tree | cd524e8ab111fba79f75a48cc672cb875251a32f /src/core/hle/kernel/handle_table.cpp | |
| parent | 940c3bf68deff4f45c2dc3c2549c00cff4e1b586 (diff) | |
| parent | be1954e04cb5a0c3a526f78ed5490a5e65310280 (diff) | |
Merge pull request #4796 from lioncash/clang
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 3e745c18b..fe4988f84 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); - Handle handle = generation | (slot << 15); + const auto handle = static_cast<Handle>(generation | static_cast<u16>(slot << 15)); return MakeResult<Handle>(handle); } |