diff options
| author | 2018-09-25 17:38:16 -0400 | |
|---|---|---|
| committer | 2018-09-25 20:06:01 -0400 | |
| commit | 28bef31ea80478fe58bc4eeaf1b245005f15b36a (patch) | |
| tree | 8ccdb13e155d15b44893a0477984cc83bdf41224 /src/core/core.cpp | |
| parent | vfs_static: Remove template byte parameter from StaticVfsFile (diff) | |
| download | yuzu-28bef31ea80478fe58bc4eeaf1b245005f15b36a.tar.gz yuzu-28bef31ea80478fe58bc4eeaf1b245005f15b36a.tar.xz yuzu-28bef31ea80478fe58bc4eeaf1b245005f15b36a.zip | |
vfs_concat/vfs_layered: Remove friend declarations from ConcatenatedVfsFile
Given these are only added to the class to allow those functions to
access the private constructor, it's a better approach to just make them
static functions in the interface, to make the dependency explicit.
Diffstat (limited to 'src/core/core.cpp')
| -rw-r--r-- | src/core/core.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/core/core.cpp b/src/core/core.cpp index 50f0a42fb..7666354dc 100644 --- a/src/core/core.cpp +++ b/src/core/core.cpp | |||
| @@ -64,7 +64,7 @@ FileSys::VirtualFile GetGameFileFromPath(const FileSys::VirtualFilesystem& vfs, | |||
| 64 | if (concat.empty()) | 64 | if (concat.empty()) |
| 65 | return nullptr; | 65 | return nullptr; |
| 66 | 66 | ||
| 67 | return FileSys::ConcatenateFiles(concat, dir->GetName()); | 67 | return FileSys::ConcatenatedVfsFile::MakeConcatenatedFile(concat, dir->GetName()); |
| 68 | } | 68 | } |
| 69 | 69 | ||
| 70 | return vfs->OpenFile(path, FileSys::Mode::Read); | 70 | return vfs->OpenFile(path, FileSys::Mode::Read); |