diff options
author | Lioncash <mathew1800@gmail.com> | 2018-07-25 23:29:49 +0200 |
---|---|---|
committer | Lioncash <mathew1800@gmail.com> | 2018-07-25 23:31:08 +0200 |
commit | a2cd07d0940e8bcd84d08dbf8f1d6663dc61ab6f (patch) | |
tree | eafde8257566ad69b1c435dd84f5e9fd77a400fb /src/core | |
parent | Merge pull request #801 from lioncash/time (diff) | |
download | yuzu-a2cd07d0940e8bcd84d08dbf8f1d6663dc61ab6f.tar yuzu-a2cd07d0940e8bcd84d08dbf8f1d6663dc61ab6f.tar.gz yuzu-a2cd07d0940e8bcd84d08dbf8f1d6663dc61ab6f.tar.bz2 yuzu-a2cd07d0940e8bcd84d08dbf8f1d6663dc61ab6f.tar.lz yuzu-a2cd07d0940e8bcd84d08dbf8f1d6663dc61ab6f.tar.xz yuzu-a2cd07d0940e8bcd84d08dbf8f1d6663dc61ab6f.tar.zst yuzu-a2cd07d0940e8bcd84d08dbf8f1d6663dc61ab6f.zip |
Diffstat (limited to '')
-rw-r--r-- | src/core/hle/service/nvdrv/nvdrv.cpp | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/core/hle/service/nvdrv/nvdrv.cpp b/src/core/hle/service/nvdrv/nvdrv.cpp index cc5cfe34e..c5d3e2fff 100644 --- a/src/core/hle/service/nvdrv/nvdrv.cpp +++ b/src/core/hle/service/nvdrv/nvdrv.cpp @@ -2,6 +2,8 @@ // Licensed under GPLv2 or any later version // Refer to the license.txt file included. +#include <utility> + #include "core/hle/ipc_helpers.h" #include "core/hle/service/nvdrv/devices/nvdevice.h" #include "core/hle/service/nvdrv/devices/nvdisp_disp0.h" @@ -45,9 +47,9 @@ u32 Module::Open(std::string device_name) { device_name); auto device = devices[device_name]; - u32 fd = next_fd++; + const u32 fd = next_fd++; - open_files[fd] = device; + open_files[fd] = std::move(device); return fd; } @@ -56,7 +58,7 @@ u32 Module::Ioctl(u32 fd, u32_le command, const std::vector<u8>& input, std::vec auto itr = open_files.find(fd); ASSERT_MSG(itr != open_files.end(), "Tried to talk to an invalid device"); - auto device = itr->second; + auto& device = itr->second; return device->ioctl({command}, input, output); } |