More base-derived fixes

src/core/file_sys/archive_extsavedata.h

@@ -60,6 +60,7 @@ private:
     ArchiveFactory_ExtSaveData() = default;
     template <class Archive>
     void serialize(Archive& ar, const unsigned int) {
+        ar& boost::serialization::base_object<ArchiveFactory>(*this);
         ar& shared;
         ar& mount_point;
     }

src/core/file_sys/archive_ncch.h

@@ -116,7 +116,9 @@ public:
 
 private:
     template <class Archive>
-    void serialize(Archive& ar, const unsigned int) {}
+    void serialize(Archive& ar, const unsigned int) {
+        ar& boost::serialization::base_object<ArchiveFactory>(*this);
+    }
     friend class boost::serialization::access;
 };
 

src/core/file_sys/archive_other_savedata.h

@@ -35,6 +35,7 @@ private:
     ArchiveFactory_OtherSaveDataPermitted() = default;
     template <class Archive>
     void serialize(Archive& ar, const unsigned int) {
+        ar& boost::serialization::base_object<ArchiveFactory>(*this);
         ar& sd_savedata_source;
     }
     friend class boost::serialization::access;
@@ -62,6 +63,7 @@ private:
     ArchiveFactory_OtherSaveDataGeneral() = default;
     template <class Archive>
     void serialize(Archive& ar, const unsigned int) {
+        ar& boost::serialization::base_object<ArchiveFactory>(*this);
         ar& sd_savedata_source;
     }
     friend class boost::serialization::access;

src/core/file_sys/archive_savedata.h

@@ -34,6 +34,7 @@ private:
     ArchiveFactory_SaveData() = default;
     template <class Archive>
     void serialize(Archive& ar, const unsigned int) {
+        ar& boost::serialization::base_object<ArchiveFactory>(*this);
         ar& sd_savedata_source;
     }
     friend class boost::serialization::access;

src/core/file_sys/archive_sdmc.h

@@ -81,6 +81,7 @@ private:
     ArchiveFactory_SDMC() = default;
     template <class Archive>
     void serialize(Archive& ar, const unsigned int) {
+        ar& boost::serialization::base_object<ArchiveFactory>(*this);
         ar& sdmc_directory;
     }
     friend class boost::serialization::access;

src/core/file_sys/archive_sdmcwriteonly.h

@@ -67,6 +67,7 @@ private:
     ArchiveFactory_SDMCWriteOnly() = default;
     template <class Archive>
     void serialize(Archive& ar, const unsigned int) {
+        ar& boost::serialization::base_object<ArchiveFactory>(*this);
         ar& sdmc_directory;
     }
     friend class boost::serialization::access;

src/core/file_sys/archive_selfncch.h

@@ -47,6 +47,12 @@ private:
     /// Mapping of ProgramId -> NCCHData
     std::unordered_map<u64, NCCHData>
         ncch_data; // TODO: Remove this, or actually set the values here
+
+    template <class Archive>
+    void serialize(Archive& ar, const unsigned int) {
+        ar& boost::serialization::base_object<ArchiveFactory>(*this);
+    }
+    friend class boost::serialization::access;
 };
 
 } // namespace FileSys

src/core/file_sys/archive_systemsavedata.h

@@ -37,6 +37,7 @@ private:
     ArchiveFactory_SystemSaveData() = default;
     template <class Archive>
     void serialize(Archive& ar, const unsigned int) {
+        ar& boost::serialization::base_object<ArchiveFactory>(*this);
         ar& base_path;
     }
     friend class boost::serialization::access;

src/core/file_sys/savedata_archive.cpp

@@ -357,4 +357,5 @@ u64 SaveDataArchive::GetFreeBytes() const {
 
 } // namespace FileSys
 
+SERIALIZE_EXPORT_IMPL(FileSys::SaveDataArchive)
 SERIALIZE_EXPORT_IMPL(FileSys::SaveDataDelayGenerator)

src/core/file_sys/savedata_archive.h

@@ -38,10 +38,21 @@ public:
 
 protected:
     std::string mount_point;
+
+private:
+    SaveDataArchive() = default;
+
+    template <class Archive>
+    void serialize(Archive& ar, const unsigned int) {
+        ar& boost::serialization::base_object<ArchiveBackend>(*this);
+        ar& mount_point;
+    }
+    friend class boost::serialization::access;
 };
 
 class SaveDataDelayGenerator;
 
 } // namespace FileSys
 
+BOOST_CLASS_EXPORT_KEY(FileSys::SaveDataArchive)
 BOOST_CLASS_EXPORT_KEY(FileSys::SaveDataDelayGenerator)