diff options
| author | 2018-08-21 18:00:28 -0400 | |
|---|---|---|
| committer | 2018-08-21 18:00:28 -0400 | |
| commit | ac68c8a60529fede551378fe03e527930b998c71 (patch) | |
| tree | 645ea9745ee8f255dedd14166f7801bba4995f1d /src/core/file_sys | |
| parent | Merge pull request #1146 from lioncash/am (diff) | |
| parent | vfs: Replace mode.h include with forward declarations where applicable (diff) | |
| download | yuzu-ac68c8a60529fede551378fe03e527930b998c71.tar.gz yuzu-ac68c8a60529fede551378fe03e527930b998c71.tar.xz yuzu-ac68c8a60529fede551378fe03e527930b998c71.zip | |
Merge pull request #1145 from lioncash/fwd-decl
vfs: Replace mode.h include with forward declarations where applicable
Diffstat (limited to 'src/core/file_sys')
| -rw-r--r-- | src/core/file_sys/vfs.cpp | 1 | ||||
| -rw-r--r-- | src/core/file_sys/vfs.h | 5 |
2 files changed, 4 insertions, 2 deletions
diff --git a/src/core/file_sys/vfs.cpp b/src/core/file_sys/vfs.cpp index a5ec50b1a..b915b4c11 100644 --- a/src/core/file_sys/vfs.cpp +++ b/src/core/file_sys/vfs.cpp | |||
| @@ -8,6 +8,7 @@ | |||
| 8 | #include "common/common_paths.h" | 8 | #include "common/common_paths.h" |
| 9 | #include "common/file_util.h" | 9 | #include "common/file_util.h" |
| 10 | #include "common/logging/backend.h" | 10 | #include "common/logging/backend.h" |
| 11 | #include "core/file_sys/mode.h" | ||
| 11 | #include "core/file_sys/vfs.h" | 12 | #include "core/file_sys/vfs.h" |
| 12 | 13 | ||
| 13 | namespace FileSys { | 14 | namespace FileSys { |
diff --git a/src/core/file_sys/vfs.h b/src/core/file_sys/vfs.h index 78a63c59b..22db08b59 100644 --- a/src/core/file_sys/vfs.h +++ b/src/core/file_sys/vfs.h | |||
| @@ -9,9 +9,8 @@ | |||
| 9 | #include <string_view> | 9 | #include <string_view> |
| 10 | #include <type_traits> | 10 | #include <type_traits> |
| 11 | #include <vector> | 11 | #include <vector> |
| 12 | #include "boost/optional.hpp" | 12 | #include <boost/optional.hpp> |
| 13 | #include "common/common_types.h" | 13 | #include "common/common_types.h" |
| 14 | #include "core/file_sys/mode.h" | ||
| 15 | 14 | ||
| 16 | namespace FileSys { | 15 | namespace FileSys { |
| 17 | 16 | ||
| @@ -19,6 +18,8 @@ class VfsDirectory; | |||
| 19 | class VfsFile; | 18 | class VfsFile; |
| 20 | class VfsFilesystem; | 19 | class VfsFilesystem; |
| 21 | 20 | ||
| 21 | enum class Mode : u32; | ||
| 22 | |||
| 22 | // Convenience typedefs to use Vfs* interfaces | 23 | // Convenience typedefs to use Vfs* interfaces |
| 23 | using VirtualFilesystem = std::shared_ptr<VfsFilesystem>; | 24 | using VirtualFilesystem = std::shared_ptr<VfsFilesystem>; |
| 24 | using VirtualDir = std::shared_ptr<VfsDirectory>; | 25 | using VirtualDir = std::shared_ptr<VfsDirectory>; |