diff options
| author | Yuri Kunde Schlesner <yuriks@yuriks.net> | 2017-06-19 04:03:15 +0200 |
|---|---|---|
| committer | Yuri Kunde Schlesner <yuriks@yuriks.net> | 2017-06-19 04:03:15 +0200 |
| commit | 723dc644faa6e29250d1b7fa914dfb7c75d8aec5 (patch) | |
| tree | c7ad927e2cbe1424046e279b3212ac895f4b1e87 /src/core/hle/service/sm/srv.cpp | |
| parent | ResultVal: Add an rvalue overload of Unwrap() (diff) | |
| download | yuzu-723dc644faa6e29250d1b7fa914dfb7c75d8aec5.tar yuzu-723dc644faa6e29250d1b7fa914dfb7c75d8aec5.tar.gz yuzu-723dc644faa6e29250d1b7fa914dfb7c75d8aec5.tar.bz2 yuzu-723dc644faa6e29250d1b7fa914dfb7c75d8aec5.tar.lz yuzu-723dc644faa6e29250d1b7fa914dfb7c75d8aec5.tar.xz yuzu-723dc644faa6e29250d1b7fa914dfb7c75d8aec5.tar.zst yuzu-723dc644faa6e29250d1b7fa914dfb7c75d8aec5.zip | |
Diffstat (limited to 'src/core/hle/service/sm/srv.cpp')
| -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); |