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.

1 files changed, 2 insertions, 3 deletions

diff --git a/src/core/file_sys/patch_manager.cpp b/src/core/file_sys/patch_manager.cpp
index af3f9a78f..561ad67a7 100644
--- a/src/core/file_sys/patch_manager.cpp
+++ b/src/core/file_sys/patch_manager.cpp
@@ -90,10 +90,9 @@ static void ApplyLayeredFS(VirtualFile& romfs, u64 title_id, ContentRecordType t
 
             layers.push_back(std::move(extracted));
 
-            const auto layered = LayerDirectories(layers);
-
+            auto layered = LayeredVfsDirectory::MakeLayeredDirectory(std::move(layers));
             if (layered != nullptr) {
-                auto packed = CreateRomFS(layered);
+                auto packed = CreateRomFS(std::move(layered));
 
                 if (packed != nullptr) {
                     LOG_INFO(Loader, "    RomFS: LayeredFS patches applied successfully");