Compare commits

...

1 Commits

Author SHA1 Message Date
Javi d1ebc32f9d Adapt FS to tl::identifier no longer having an invalid value 2024-07-07 01:48:07 +02:00
2 changed files with 4 additions and 4 deletions
+3 -2
View File
@@ -23,7 +23,7 @@ public:
//////////////////////////////////////////////////////////////////////////
// New API
TL_DECLARE_INTEGRAL_ID(PackId, uint64_t, 0)
TL_DECLARE_INTEGRAL_ID(PackId, uint64_t)
tl::result<PackId> mountFront(AbsPath mountPoint, tl::unique_ref<IPack> pack);
tl::result<PackId> mountBack(AbsPath mountPoint, tl::unique_ref<IPack> pack);
@@ -74,8 +74,9 @@ private:
tl::unique_ref<IPack> pack;
AbsPath mountPoint;
explicit PackData(tl::unique_ref<IPack>&& pack) noexcept
explicit PackData(tl::unique_ref<IPack>&& pack, PackId i_packId) noexcept
: pack(std::move(pack))
, id(i_packId)
{}
PackData(PackData&& other) noexcept = default;
+1 -2
View File
@@ -575,7 +575,6 @@ void CustomFilesystem::convertToPackPath(AbsPath& packPath, const AbsPath& path,
tl::result<CustomFilesystem::PackId> CustomFilesystem::mount(AbsPath mountPoint, tl::unique_ref<IPack> 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::PackId> 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)