diff options
| author | liamwhite <liamwhite@users.noreply.github.com> | 2023-03-08 09:16:27 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-03-08 09:16:27 -0500 |
| commit | f3f57f90fed6d1c3b478c9fceb91a54579b4947d (patch) | |
| tree | 3280b90f3b54b6f8f3fca804cab04699897faa3f /src/core/hle/service/friend | |
| parent | b5d61f214d4d591a3d16901fe733ec54df9b1a76 (diff) | |
| parent | 1d0fe75e7cca27d79006654dcc56c44cb4096d3a (diff) | |
Merge pull request #9912 from liamwhite/err
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 @@ -// SPDX-FileCopyrightText: Copyright 2019 yuzu Emulator Project -// SPDX-License-Identifier: GPL-2.0-or-later - -#pragma once - -#include "core/hle/result.h" - -namespace Service::Friend { - -constexpr Result ERR_NO_NOTIFICATIONS{ErrorModule::Account, 15}; -} 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 @@ #include "common/uuid.h" #include "core/core.h" #include "core/hle/kernel/k_event.h" -#include "core/hle/service/friend/errors.h" +#include "core/hle/service/acc/errors.h" #include "core/hle/service/friend/friend.h" #include "core/hle/service/friend/friend_interface.h" #include "core/hle/service/ipc_helpers.h" @@ -259,7 +259,7 @@ private: if (notifications.empty()) { LOG_ERROR(Service_Friend, "No notifications in queue!"); IPC::ResponseBuilder rb{ctx, 2}; - rb.Push(ERR_NO_NOTIFICATIONS); + rb.Push(Account::ResultNoNotifications); return; } |
