From d1ebc32f9d712afd7c9758084afc974b3e5920f3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Javier=20Mart=C3=ADn?= Date: Sun, 7 Jul 2024 01:42:39 +0200 Subject: [PATCH] Adapt FS to tl::identifier no longer having an invalid value --- include/fs/CustomFilesystem.h | 5 +++-- src/CustomFilesystem.cpp | 3 +-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/include/fs/CustomFilesystem.h b/include/fs/CustomFilesystem.h index a6e2315..fb17b1b 100644 --- a/include/fs/CustomFilesystem.h +++ b/include/fs/CustomFilesystem.h @@ -23,7 +23,7 @@ public: ////////////////////////////////////////////////////////////////////////// // New API - TL_DECLARE_INTEGRAL_ID(PackId, uint64_t, 0) + TL_DECLARE_INTEGRAL_ID(PackId, uint64_t) tl::result mountFront(AbsPath mountPoint, tl::unique_ref pack); tl::result mountBack(AbsPath mountPoint, tl::unique_ref pack); @@ -74,8 +74,9 @@ private: tl::unique_ref pack; AbsPath mountPoint; - explicit PackData(tl::unique_ref&& pack) noexcept + explicit PackData(tl::unique_ref&& pack, PackId i_packId) noexcept : pack(std::move(pack)) + , id(i_packId) {} PackData(PackData&& other) noexcept = default; diff --git a/src/CustomFilesystem.cpp b/src/CustomFilesystem.cpp index 94b4e13..b738f42 100644 --- a/src/CustomFilesystem.cpp +++ b/src/CustomFilesystem.cpp @@ -575,7 +575,6 @@ void CustomFilesystem::convertToPackPath(AbsPath& packPath, const AbsPath& path, tl::result CustomFilesystem::mount(AbsPath mountPoint, tl::unique_ref pack, MountPolicy policy) { - PackData data(std::move(pack)); if (!mountPoint.is_valid()) return tl::make_generic_error("Invalid mount point"); @@ -585,7 +584,7 @@ tl::result CustomFilesystem::mount(AbsPath mountPoint, return tl::make_generic_error("Invalid shadowing (mount point shadowing a file)"); const PackId id(++s_lastId); - data.id = id; + PackData data(std::move(pack), id); data.mountPoint = std::move(mountPoint); switch (policy)