fix: Adapt breaking status-code API changes

adessoSE · Feb 17, 2024 · 7c3a52d · 7c3a52d
1 parent 45519c6
commit 7c3a52d
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 13 deletions.
diff --git a/apps/vefs/cli/error.hpp b/apps/vefs/cli/error.hpp
@@ -53,8 +53,6 @@ class cli_domain_type : public system_error::status_code_domain
     using base = system_error::status_code_domain;
     template <class DomainType>
     friend class system_error::status_code;
-    template <class StatusCode>
-    friend class system_error::detail::indirecting_domain;
 
 public:
     static constexpr std::string_view uuid

diff --git a/include/vefs/disappointment/errc.hpp b/include/vefs/disappointment/errc.hpp
@@ -45,8 +45,6 @@ class archive_domain_type : public system_error::status_code_domain
     using base = system_error::status_code_domain;
     template <class DomainType>
     friend class system_error::status_code;
-    template <class StatusCode>
-    friend class system_error::detail::indirecting_domain;
 
 public:
     static constexpr std::string_view uuid

diff --git a/src/vefs/vfilesystem.cpp b/src/vefs/vfilesystem.cpp
@@ -979,6 +979,7 @@ auto vfilesystem::commit() -> result<void>
             detail::lut::sector_position_of(mCommittedRoot.maximum_extent - 1)};
     index_tree_layout layout(*mIndexTree, mIndexBlocks, lastAllocated);
 
+    system_error::error syncError{};
     for (auto const &[path, fid] : lockedIndex)
     {
         try
@@ -1002,19 +1003,18 @@ auto vfilesystem::commit() -> result<void>
                                                       descriptor.filePath)));
 
                         if (auto syncrx = layout.sync_to_tree(e, descriptor);
-                            !syncrx)
+                            syncrx.has_failure())
                         {
-                            syncrx.assume_error()
+                            syncrx.error()
                                     << ed::archive_file{"[archive-index]"};
 
-                            std::move(syncrx).assume_error().throw_exception();
+                            syncError = std::move(syncrx).assume_error();
                         }
                     });
+            if (!syncError.empty())
+            {
+                return syncError;
         }
-        catch (system_error::status_error<system_error::erased<
-                       system_error::system_code::value_type>> const &exc)
-        {
-            return exc.code().clone();
         }
         catch (std::bad_alloc const &)
         {

diff --git a/vcpkg-configuration.json b/vcpkg-configuration.json
@@ -2,13 +2,13 @@
     "$schema": "https://raw.githubusercontent.com/microsoft/vcpkg-tool/main/docs/vcpkg-configuration.schema.json",
     "default-registry": {
         "kind": "builtin",
-        "baseline": "f6a5d4e8eb7476b8d7fc12a56dff300c1c986131"
+        "baseline": "a42af01b72c28a8e1d7b48107b33e4f286a55ef6"
     },
     "registries": [
         {
             "kind": "git",
             "repository": "https://github.com/deeplex/vcpkg-registry",
-            "baseline": "f7982f12e092037c9ff86c3de381efca14377ddb",
+            "baseline": "0a1cf2aba847e4074950a3061f5f7251f388e61f",
             "packages": [
                 "base64",
                 "concrete",