summaryrefslogtreecommitdiffstats
path: root/src/core
diff options
context:
space:
mode:
authorbunnei <bunneidev@gmail.com>2018-08-22 00:00:06 +0200
committerGitHub <noreply@github.com>2018-08-22 00:00:06 +0200
commitc2695aa2eb77a8a93a9d0ea2bd0c3c8dfd86f494 (patch)
treeab42bed00c47b3c8174122048dd8f2e695cd339d /src/core
parentMerge pull request #1148 from lioncash/audio-warn (diff)
parentam: Utilize std::array within PopLaunchParameter() (diff)
downloadyuzu-c2695aa2eb77a8a93a9d0ea2bd0c3c8dfd86f494.tar
yuzu-c2695aa2eb77a8a93a9d0ea2bd0c3c8dfd86f494.tar.gz
yuzu-c2695aa2eb77a8a93a9d0ea2bd0c3c8dfd86f494.tar.bz2
yuzu-c2695aa2eb77a8a93a9d0ea2bd0c3c8dfd86f494.tar.lz
yuzu-c2695aa2eb77a8a93a9d0ea2bd0c3c8dfd86f494.tar.xz
yuzu-c2695aa2eb77a8a93a9d0ea2bd0c3c8dfd86f494.tar.zst
yuzu-c2695aa2eb77a8a93a9d0ea2bd0c3c8dfd86f494.zip
Diffstat (limited to 'src/core')
-rw-r--r--src/core/hle/service/am/am.cpp7
1 files changed, 4 insertions, 3 deletions
diff --git a/src/core/hle/service/am/am.cpp b/src/core/hle/service/am/am.cpp
index c524e7a48..78d551a8a 100644
--- a/src/core/hle/service/am/am.cpp
+++ b/src/core/hle/service/am/am.cpp
@@ -2,6 +2,7 @@
// Licensed under GPLv2 or any later version
// Refer to the license.txt file included.
+#include <array>
#include <cinttypes>
#include <stack>
#include "core/core.h"
@@ -625,16 +626,16 @@ IApplicationFunctions::IApplicationFunctions() : ServiceFramework("IApplicationF
}
void IApplicationFunctions::PopLaunchParameter(Kernel::HLERequestContext& ctx) {
- constexpr u8 data[0x88] = {
+ constexpr std::array<u8, 0x88> data{{
0xca, 0x97, 0x94, 0xc7, // Magic
1, 0, 0, 0, // IsAccountSelected (bool)
1, 0, 0, 0, // User Id (word 0)
0, 0, 0, 0, // User Id (word 1)
0, 0, 0, 0, // User Id (word 2)
0, 0, 0, 0 // User Id (word 3)
- };
+ }};
- std::vector<u8> buffer(data, data + sizeof(data));
+ std::vector<u8> buffer(data.begin(), data.end());
IPC::ResponseBuilder rb{ctx, 2, 0, 1};