diff options
| author | Yuri Kunde Schlesner <yuriks@yuriks.net> | 2017-06-21 07:04:09 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-06-21 07:04:09 +0200 |
| commit | b21dfbb2956698b05104bc68c0b08ade0d671fd8 (patch) | |
| tree | 2f39f319f1391d4be12e50d1504c2bfc06b35cc2 /src/core/hle/service/sm | |
| parent | Merge pull request #2779 from Subv/uds_more2 (diff) | |
| parent | ResultVal: Remove MoveFrom() (diff) | |
| download | yuzu-b21dfbb2956698b05104bc68c0b08ade0d671fd8.tar yuzu-b21dfbb2956698b05104bc68c0b08ade0d671fd8.tar.gz yuzu-b21dfbb2956698b05104bc68c0b08ade0d671fd8.tar.bz2 yuzu-b21dfbb2956698b05104bc68c0b08ade0d671fd8.tar.lz yuzu-b21dfbb2956698b05104bc68c0b08ade0d671fd8.tar.xz yuzu-b21dfbb2956698b05104bc68c0b08ade0d671fd8.tar.zst yuzu-b21dfbb2956698b05104bc68c0b08ade0d671fd8.zip | |
Diffstat (limited to 'src/core/hle/service/sm')
| -rw-r--r-- | src/core/hle/service/sm/srv.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/core/hle/service/sm/srv.cpp b/src/core/hle/service/sm/srv.cpp index 74a1256e0..352941e69 100644 --- a/src/core/hle/service/sm/srv.cpp +++ b/src/core/hle/service/sm/srv.cpp @@ -113,13 +113,13 @@ void SRV::GetServiceHandle(Kernel::HLERequestContext& ctx) { (*session)->GetObjectId()); IPC::RequestBuilder rb = rp.MakeBuilder(1, 2); rb.Push(session.Code()); - rb.PushObjects(session.MoveFrom()); + rb.PushObjects(std::move(session).Unwrap()); } else if (session.Code() == Kernel::ERR_MAX_CONNECTIONS_REACHED && return_port_on_failure) { LOG_WARNING(Service_SRV, "called service=%s -> ERR_MAX_CONNECTIONS_REACHED, *port*=%u", name.c_str(), (*client_port)->GetObjectId()); IPC::RequestBuilder rb = rp.MakeBuilder(1, 2); rb.Push(ERR_MAX_CONNECTIONS_REACHED); - rb.PushObjects(client_port.MoveFrom()); + rb.PushObjects(std::move(client_port).Unwrap()); } else { LOG_ERROR(Service_SRV, "called service=%s -> error 0x%08X", name.c_str(), session.Code()); IPC::RequestBuilder rb = rp.MakeBuilder(1, 0); |