Merge pull request #1145 from lioncash/fwd-decl

vfs: Replace mode.h include with forward declarations where applicable
merge-requests/60/head
bunnei 2018-08-21 18:00:28 +07:00 committed by GitHub
commit ac68c8a605
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 7 additions and 4 deletions

@ -8,6 +8,7 @@
#include "common/common_paths.h" #include "common/common_paths.h"
#include "common/file_util.h" #include "common/file_util.h"
#include "common/logging/backend.h" #include "common/logging/backend.h"
#include "core/file_sys/mode.h"
#include "core/file_sys/vfs.h" #include "core/file_sys/vfs.h"
namespace FileSys { namespace FileSys {

@ -9,9 +9,8 @@
#include <string_view> #include <string_view>
#include <type_traits> #include <type_traits>
#include <vector> #include <vector>
#include "boost/optional.hpp" #include <boost/optional.hpp>
#include "common/common_types.h" #include "common/common_types.h"
#include "core/file_sys/mode.h"
namespace FileSys { namespace FileSys {
@ -19,6 +18,8 @@ class VfsDirectory;
class VfsFile; class VfsFile;
class VfsFilesystem; class VfsFilesystem;
enum class Mode : u32;
// Convenience typedefs to use Vfs* interfaces // Convenience typedefs to use Vfs* interfaces
using VirtualFilesystem = std::shared_ptr<VfsFilesystem>; using VirtualFilesystem = std::shared_ptr<VfsFilesystem>;
using VirtualDir = std::shared_ptr<VfsDirectory>; using VirtualDir = std::shared_ptr<VfsDirectory>;

@ -9,12 +9,12 @@
#include "core/core.h" #include "core/core.h"
#include "core/file_sys/bis_factory.h" #include "core/file_sys/bis_factory.h"
#include "core/file_sys/errors.h" #include "core/file_sys/errors.h"
#include "core/file_sys/mode.h"
#include "core/file_sys/romfs_factory.h" #include "core/file_sys/romfs_factory.h"
#include "core/file_sys/savedata_factory.h" #include "core/file_sys/savedata_factory.h"
#include "core/file_sys/sdmc_factory.h" #include "core/file_sys/sdmc_factory.h"
#include "core/file_sys/vfs.h" #include "core/file_sys/vfs.h"
#include "core/file_sys/vfs_offset.h" #include "core/file_sys/vfs_offset.h"
#include "core/file_sys/vfs_real.h"
#include "core/hle/service/filesystem/filesystem.h" #include "core/hle/service/filesystem/filesystem.h"
#include "core/hle/service/filesystem/fsp_ldr.h" #include "core/hle/service/filesystem/fsp_ldr.h"
#include "core/hle/service/filesystem/fsp_pr.h" #include "core/hle/service/filesystem/fsp_pr.h"

@ -7,7 +7,6 @@
#include <memory> #include <memory>
#include "common/common_types.h" #include "common/common_types.h"
#include "core/file_sys/directory.h" #include "core/file_sys/directory.h"
#include "core/file_sys/mode.h"
#include "core/hle/result.h" #include "core/hle/result.h"
namespace FileSys { namespace FileSys {
@ -18,6 +17,7 @@ class SaveDataFactory;
class SDMCFactory; class SDMCFactory;
enum class ContentRecordType : u8; enum class ContentRecordType : u8;
enum class Mode : u32;
enum class SaveDataSpaceId : u8; enum class SaveDataSpaceId : u8;
enum class StorageId : u8; enum class StorageId : u8;

@ -15,6 +15,7 @@
#include "common/string_util.h" #include "common/string_util.h"
#include "core/file_sys/directory.h" #include "core/file_sys/directory.h"
#include "core/file_sys/errors.h" #include "core/file_sys/errors.h"
#include "core/file_sys/mode.h"
#include "core/file_sys/nca_metadata.h" #include "core/file_sys/nca_metadata.h"
#include "core/file_sys/savedata_factory.h" #include "core/file_sys/savedata_factory.h"
#include "core/file_sys/vfs.h" #include "core/file_sys/vfs.h"