[out_ptr] switch to P1132 reference implementation

Author: xmkg

CMakeLists.txt

@@ -146,6 +146,8 @@ if(UNIX)
   list(APPEND MULTIPASS_BACKENDS qemu)
 endif()
 
+include(src/cmake/cmake-deps.cmake)
+
 # OpenSSL config
 find_package(OpenSSL REQUIRED)
 

src/cmake/cmake-deps.cmake

@@ -0,0 +1,24 @@
+# Copyright (C) Canonical, Ltd.
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License version 3 as
+# published by the Free Software Foundation.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+include(FetchContent)
+
+# Declare and fetch fmt
+FetchContent_Declare(
+  out_ptr
+  GIT_REPOSITORY https://github.com/soasis/out_ptr.git
+  GIT_TAG 02a577edfcf25e2519e380a95c16743b7e5878a1
+)
+
+FetchContent_MakeAvailable(out_ptr)

src/platform/backends/hyperv_api/CMakeLists.txt

@@ -60,6 +60,7 @@ if(WIN32)
 
   target_link_libraries(hyperv_api_backend PRIVATE
     fmt::fmt-header-only
+    ztd::out_ptr
     utils
     computecore.lib
     computenetwork.lib

src/platform/backends/hyperv_api/hcn/hyperv_hcn_api_wrapper.cpp

@@ -20,7 +20,6 @@
 #include <hyperv_api/hcn/hyperv_hcn_create_endpoint_params.h>
 #include <hyperv_api/hcn/hyperv_hcn_create_network_params.h>
 #include <hyperv_api/hcn/hyperv_hcn_wrapper_interface.h>
-#include <hyperv_api/util/out_ptr.h>
 
 #include <multipass/exceptions/formatted_exception_base.h>
 #include <multipass/logging/log.h>
@@ -36,11 +35,14 @@
 // clang-format on
 
 #include <fmt/xchar.h>
+#include <ztd/out_ptr.hpp>
 
 #include <cassert>
 #include <string>
 #include <type_traits>
 
+using ztd::out_ptr::out_ptr;
+
 namespace multipass::hyperv::hcn
 {
 
@@ -156,7 +158,7 @@ OperationResult perform_hcn_operation(const HCNAPITable& api, const FnType& fn,
     // HcnClose*) is ErrorRecord, which is a JSON-formatted document emitted by
     // the API describing the error happened. Therefore, we can streamline all API
     // calls through perform_operation to perform co
-    const auto result = ResultCode{fn(std::forward<Args>(args)..., util::out_ptr(result_msgbuf, api.CoTaskMemFree))};
+    const auto result = ResultCode{fn(std::forward<Args>(args)..., out_ptr(result_msgbuf, api.CoTaskMemFree))};
 
     mpl::debug(kLogCategory,
                "perform_operation(...) > fn: {}, result: {}",
@@ -187,10 +189,8 @@ UniqueHcnNetwork open_network(const HCNAPITable& api, const std::string& network
     mpl::debug(kLogCategory, "open_network(...) > network_guid: {} ", network_guid);
 
     UniqueHcnNetwork network{};
-    const auto result = perform_hcn_operation(api,
-                                              api.OpenNetwork,
-                                              guid_from_string(network_guid),
-                                              util::out_ptr(network, api.CloseNetwork));
+    const auto result =
+        perform_hcn_operation(api, api.OpenNetwork, guid_from_string(network_guid), out_ptr(network, api.CloseNetwork));
     if (!result)
     {
         mpl::error(kLogCategory, "open_network() > HcnOpenNetwork failed with {}!", result.code);
@@ -269,7 +269,7 @@ OperationResult HCNWrapper::create_network(const CreateNetworkParameters& params
                                               api.CreateNetwork,
                                               guid_from_string(params.guid),
                                               network_settings.c_str(),
-                                              util::out_ptr(network, api.CloseNetwork));
+                                              out_ptr(network, api.CloseNetwork));
 
     if (!result)
     {
@@ -330,7 +330,7 @@ OperationResult HCNWrapper::create_endpoint(const CreateEndpointParameters& para
                                               network.get(),
                                               guid_from_string(params.endpoint_guid),
                                               endpoint_settings.c_str(),
-                                              util::out_ptr(endpoint, api.CloseEndpoint));
+                                              out_ptr(endpoint, api.CloseEndpoint));
     return result;
 }
 

src/platform/backends/hyperv_api/hcs/hyperv_hcs_api_wrapper.cpp

@@ -20,7 +20,6 @@
 #include <hyperv_api/hcs/hyperv_hcs_create_compute_system_params.h>
 #include <hyperv_api/hyperv_api_operation_result.h>
 #include <hyperv_api/hyperv_api_string_conversion.h>
-#include <hyperv_api/util/out_ptr.h>
 
 #include <multipass/logging/log.h>
 
@@ -33,6 +32,9 @@
 #include <memory>
 
 #include <fmt/xchar.h>
+#include <ztd/out_ptr.hpp>
+
+using ztd::out_ptr::out_ptr;
 
 namespace multipass::hyperv::hcs
 {
@@ -128,7 +130,7 @@ UniqueHcsSystem open_host_compute_system(const HCSAPITable& api, const std::stri
 
     UniqueHcsSystem system{};
     const ResultCode result =
-        api.OpenComputeSystem(name_w.c_str(), kRequestedAccessLevel, util::out_ptr(system, api.CloseComputeSystem));
+        api.OpenComputeSystem(name_w.c_str(), kRequestedAccessLevel, out_ptr(system, api.CloseComputeSystem));
     if (!result)
     {
         mpl::debug(kLogCategory,
@@ -242,7 +244,7 @@ OperationResult HCSWrapper::create_compute_system(const CreateComputeSystemParam
                                                            vm_settings.c_str(),
                                                            operation.get(),
                                                            nullptr,
-                                                           util::out_ptr(system, api.CloseComputeSystem))};
+                                                           out_ptr(system, api.CloseComputeSystem))};
 
     if (!result)
     {