fix: Compile fix for MSVC 2022 in C++20 mode (#778)

Signed-off-by: Janosch Machowinski <J.Machowinski@cellumation.com>
Co-authored-by: Janosch Machowinski <J.Machowinski@cellumation.com>
Co-authored-by: Julien Enoch <julien.e@zettascale.tech>

Author: 3 people

include/zenoh/api/bytes.hxx

@@ -64,11 +64,12 @@ class Bytes : public Owned<::z_owned_bytes_t> {
     template <class Allocator>
     Bytes(std::vector<uint8_t, Allocator>&& v) : Bytes() {
         std::vector<uint8_t, Allocator>* ptr = new std::vector<uint8_t, Allocator>(std::move(v));
-        auto d = [p = ptr]() mutable { delete p; };
-        using D = decltype(d);
-        using Dval = std::remove_reference_t<D>;
-        using DroppableType = typename detail::closures::Droppable<Dval>;
-        auto drop = DroppableType::into_context(std::move(d));
+        struct VectorDeleter {
+            std::vector<uint8_t, Allocator>* ptr;
+            void operator()() { delete ptr; };
+        };
+        using DroppableType = typename detail::closures::Droppable<VectorDeleter>;
+        auto drop = DroppableType::into_context(VectorDeleter{ptr});
         ::z_bytes_from_buf(interop::as_owned_c_ptr(*this), ptr->data(), ptr->size(),
                            detail::closures::_zenoh_drop_with_context, drop);
     }
@@ -81,19 +82,20 @@ class Bytes : public Owned<::z_owned_bytes_t> {
     }
 
     /// @brief Construct by copying sequence of charactes.
-    Bytes(const char* v) : Bytes(std::string_view(v)){};
+    Bytes(const char* v) : Bytes(std::string_view(v)) {}
 
     /// @brief Construct by copying sequence of charactes.
-    Bytes(const std::string& v) : Bytes(std::string_view(v)){};
+    Bytes(const std::string& v) : Bytes(std::string_view(v)) {}
 
     /// @brief Construct by moving a string.
     Bytes(std::string&& v) : Bytes() {
         std::string* ptr = new std::string(std::move(v));
-        auto d = [p = ptr]() mutable { delete p; };
-        using D = decltype(d);
-        using Dval = std::remove_reference_t<D>;
-        using DroppableType = typename detail::closures::Droppable<Dval>;
-        auto drop = DroppableType::into_context(std::move(d));
+        struct StringDeleter {
+            std::string* ptr;
+            void operator()() { delete ptr; }
+        };
+        using DroppableType = typename detail::closures::Droppable<StringDeleter>;
+        auto drop = DroppableType::into_context(StringDeleter{ptr});
         ::z_bytes_from_buf(interop::as_owned_c_ptr(*this), reinterpret_cast<uint8_t*>(ptr->data()), ptr->size(),
                            detail::closures::_zenoh_drop_with_context, drop);
     }
@@ -108,11 +110,13 @@ class Bytes : public Owned<::z_owned_bytes_t> {
     Bytes(uint8_t* ptr, size_t len, Deleter deleter) : Bytes() {
         static_assert(std::is_invocable_r<void, Deleter, uint8_t*>::value,
                       "deleter should be callable with the following signature: void deleter(uint8_t* data)");
-        auto d = [p = ptr, del = std::move(deleter)]() mutable { del(p); };
-        using D = decltype(d);
-        using Dval = std::remove_reference_t<D>;
-        using DroppableType = typename detail::closures::Droppable<Dval>;
-        auto drop = DroppableType::into_context(std::move(d));
+        struct CustomDeleter {
+            uint8_t* ptr;
+            Deleter deleter;
+            void operator()() { deleter(ptr); }
+        };
+        using DroppableType = typename detail::closures::Droppable<CustomDeleter>;
+        auto drop = DroppableType::into_context(CustomDeleter{ptr, std::move(deleter)});
         ::z_bytes_from_buf(interop::as_owned_c_ptr(*this), ptr, len, detail::closures::_zenoh_drop_with_context, drop);
     }