3
0
Fork 0
forked from suyu/suyu

ips_layer: Add missing includes

Adds missing includes to prevent potential compilation issues in the
future. Also moves the definition of a struct into the cpp file, so that
some includes don't need to be introduced within the header.
This commit is contained in:
Lioncash 2018-10-09 13:39:23 -04:00
parent 93ac8d0fea
commit f7d2889fb4
2 changed files with 17 additions and 7 deletions

View file

@ -2,9 +2,14 @@
// Licensed under GPLv2 or any later version // Licensed under GPLv2 or any later version
// Refer to the license.txt file included. // Refer to the license.txt file included.
#include <cstring>
#include <map>
#include <sstream> #include <sstream>
#include "common/assert.h" #include <string>
#include <utility>
#include "common/hex_util.h" #include "common/hex_util.h"
#include "common/logging/log.h"
#include "common/swap.h" #include "common/swap.h"
#include "core/file_sys/ips_layer.h" #include "core/file_sys/ips_layer.h"
#include "core/file_sys/vfs_vector.h" #include "core/file_sys/vfs_vector.h"
@ -95,6 +100,12 @@ VirtualFile PatchIPS(const VirtualFile& in, const VirtualFile& ips) {
in->GetContainingDirectory()); in->GetContainingDirectory());
} }
struct IPSwitchCompiler::IPSwitchPatch {
std::string name;
bool enabled;
std::map<u32, std::vector<u8>> records;
};
IPSwitchCompiler::IPSwitchCompiler(VirtualFile patch_text_) : patch_text(std::move(patch_text_)) { IPSwitchCompiler::IPSwitchCompiler(VirtualFile patch_text_) : patch_text(std::move(patch_text_)) {
Parse(); Parse();
} }

View file

@ -4,8 +4,11 @@
#pragma once #pragma once
#include <array>
#include <memory> #include <memory>
#include <vector>
#include "common/common_types.h"
#include "core/file_sys/vfs.h" #include "core/file_sys/vfs.h"
namespace FileSys { namespace FileSys {
@ -22,17 +25,13 @@ public:
VirtualFile Apply(const VirtualFile& in) const; VirtualFile Apply(const VirtualFile& in) const;
private: private:
struct IPSwitchPatch;
void ParseFlag(const std::string& flag); void ParseFlag(const std::string& flag);
void Parse(); void Parse();
bool valid = false; bool valid = false;
struct IPSwitchPatch {
std::string name;
bool enabled;
std::map<u32, std::vector<u8>> records;
};
VirtualFile patch_text; VirtualFile patch_text;
std::vector<IPSwitchPatch> patches; std::vector<IPSwitchPatch> patches;
std::array<u8, 0x20> nso_build_id{}; std::array<u8, 0x20> nso_build_id{};