mika/Atmosphere-libs
1
0
Fork 0
mirror of https://github.com/Atmosphere-NX/Atmosphere-libs.git synced 2025-06-28 14:02:40 +02:00
Code Issues Packages Projects Releases Wiki Activity

Replace std::make_tuple with simpler syntax (#77)

Browse Source 
* boot2: Simplify g_additional_launch_programs

It appears that Stratosphère is targeting C++17. In C++17,
std::make_tuple is not required for initialisating a tuple anymore.
Same thing, but less typing

* Replace std::make_tuple with {}

More readable and less noise. Also fixes two missing return statements.
This commit is contained in:
Léo Lam 2018-05-05 20:41:39 +02:00 committed by SciresM
parent e2fbbbeb4e
commit 24860d83a9
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/stratosphere/ipc_templating.hpp
View File

@ -457,4 +457,4 @@ Result WrapStaticIpcCommandImpl(IpcParsedCommand& r, IpcCommand &out_command, u8
auto result = std::apply(IpcCommandImpl, args); auto result = std::apply(IpcCommandImpl, args);
return std::apply(Encoder<OutArgs>{out_command}, result); return std::apply(Encoder<OutArgs>{out_command}, result);
} }

12
include/stratosphere/servicesession.hpp
View File

@ -158,22 +158,22 @@ class ServiceSession : public IWaitable {
/* Control commands. */ /* Control commands. */
std::tuple<Result> ConvertCurrentObjectToDomain() { std::tuple<Result> ConvertCurrentObjectToDomain() {
/* TODO */ /* TODO */
return std::make_tuple(0xF601); return {0xF601};
} }
std::tuple<Result> CopyFromCurrentDomain() { std::tuple<Result> CopyFromCurrentDomain() {
/* TODO */ /* TODO */
return std::make_tuple(0xF601); return {0xF601};
} }
std::tuple<Result> CloneCurrentObject() { std::tuple<Result> CloneCurrentObject() {
/* TODO */ /* TODO */
return std::make_tuple(0xF601); return {0xF601};
} }
std::tuple<Result, u32> QueryPointerBufferSize() { std::tuple<Result, u32> QueryPointerBufferSize() {
return std::make_tuple(0x0, (u32)sizeof(this->pointer_buffer)); return {0x0, (u32)sizeof(this->pointer_buffer)};
} }
std::tuple<Result> CloneCurrentObjectEx() { std::tuple<Result> CloneCurrentObjectEx() {
/* TODO */ /* TODO */
return std::make_tuple(0xF601); return {0xF601};
} }
Result dispatch_control_command(IpcParsedCommand &r, IpcCommand &out_c, u64 cmd_id) { Result dispatch_control_command(IpcParsedCommand &r, IpcCommand &out_c, u64 cmd_id) {
@ -202,4 +202,4 @@ class ServiceSession : public IWaitable {
return rc; return rc;
} }
}; };