diff options
| author | 2023-03-06 19:04:12 -0500 | |
|---|---|---|
| committer | 2023-03-06 20:58:42 -0500 | |
| commit | 1d0fe75e7cca27d79006654dcc56c44cb4096d3a (patch) | |
| tree | 3291e0ad973cd3c0e07ded22c968f40c2c6dd955 /src/core/hle/service/friend | |
| parent | Merge pull request #9890 from Kelebek1/reverb_fix (diff) | |
| download | yuzu-1d0fe75e7cca27d79006654dcc56c44cb4096d3a.tar.gz yuzu-1d0fe75e7cca27d79006654dcc56c44cb4096d3a.tar.xz yuzu-1d0fe75e7cca27d79006654dcc56c44cb4096d3a.zip | |
hle: rename legacy errors to Results
Diffstat (limited to 'src/core/hle/service/friend')
| -rw-r--r-- | src/core/hle/service/friend/errors.h | 11 | ||||
| -rw-r--r-- | src/core/hle/service/friend/friend.cpp | 4 |
2 files changed, 2 insertions, 13 deletions
diff --git a/src/core/hle/service/friend/errors.h b/src/core/hle/service/friend/errors.h deleted file mode 100644 index ff525d865..000000000 --- a/src/core/hle/service/friend/errors.h +++ /dev/null | |||
| @@ -1,11 +0,0 @@ | |||
| 1 | // SPDX-FileCopyrightText: Copyright 2019 yuzu Emulator Project | ||
| 2 | // SPDX-License-Identifier: GPL-2.0-or-later | ||
| 3 | |||
| 4 | #pragma once | ||
| 5 | |||
| 6 | #include "core/hle/result.h" | ||
| 7 | |||
| 8 | namespace Service::Friend { | ||
| 9 | |||
| 10 | constexpr Result ERR_NO_NOTIFICATIONS{ErrorModule::Account, 15}; | ||
| 11 | } | ||
diff --git a/src/core/hle/service/friend/friend.cpp b/src/core/hle/service/friend/friend.cpp index 447deab8b..9d05f9801 100644 --- a/src/core/hle/service/friend/friend.cpp +++ b/src/core/hle/service/friend/friend.cpp | |||
| @@ -6,7 +6,7 @@ | |||
| 6 | #include "common/uuid.h" | 6 | #include "common/uuid.h" |
| 7 | #include "core/core.h" | 7 | #include "core/core.h" |
| 8 | #include "core/hle/kernel/k_event.h" | 8 | #include "core/hle/kernel/k_event.h" |
| 9 | #include "core/hle/service/friend/errors.h" | 9 | #include "core/hle/service/acc/errors.h" |
| 10 | #include "core/hle/service/friend/friend.h" | 10 | #include "core/hle/service/friend/friend.h" |
| 11 | #include "core/hle/service/friend/friend_interface.h" | 11 | #include "core/hle/service/friend/friend_interface.h" |
| 12 | #include "core/hle/service/ipc_helpers.h" | 12 | #include "core/hle/service/ipc_helpers.h" |
| @@ -259,7 +259,7 @@ private: | |||
| 259 | if (notifications.empty()) { | 259 | if (notifications.empty()) { |
| 260 | LOG_ERROR(Service_Friend, "No notifications in queue!"); | 260 | LOG_ERROR(Service_Friend, "No notifications in queue!"); |
| 261 | IPC::ResponseBuilder rb{ctx, 2}; | 261 | IPC::ResponseBuilder rb{ctx, 2}; |
| 262 | rb.Push(ERR_NO_NOTIFICATIONS); | 262 | rb.Push(Account::ResultNoNotifications); |
| 263 | return; | 263 | return; |
| 264 | } | 264 | } |
| 265 | 265 | ||