OmniNX/Atmosphere
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fs.mitm: Fix c++ modernization breaking changes

Browse Source
This commit is contained in:
Michael Scire
2018-06-27 23:02:06 -06:00
parent ed718e007f
commit 8da27723fc
7 changed files with 161 additions and 151 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
stratosphere/libstratosphere/include/stratosphere/domainowner.hpp
View File

@@ -14,7 +14,11 @@ class DomainOwner {
private:
std::array<std::shared_ptr<IServiceObject>, DOMAIN_ID_MAX> domain_objects;
public:
DomainOwner() = default;
DomainOwner() {
for (unsigned int i = 0; i < DOMAIN_ID_MAX; i++) {
this->domain_objects[i].reset();
}
}
/* Shared ptrs should auto delete here. */
virtual ~DomainOwner() = default;
@@ -33,14 +37,14 @@ class DomainOwner {
}
*out_i = std::distance(domain_objects.begin(), object_it);
*object_it = std::move(object);
(*object_it)->set_owner(this);
*object_it = object;
object->set_owner(this);
return 0;
}
Result set_object(std::shared_ptr<IServiceObject> object, unsigned int i) {
if (domain_objects[i] == NULL) {
domain_objects[i] = std::move(object);
if (domain_objects[i] == nullptr) {
domain_objects[i] = object;
object->set_owner(this);
return 0;
}