diff --git a/wpiutil/src/main/native/cpp/uv/Handle.cpp b/wpiutil/src/main/native/cpp/uv/Handle.cpp index 1d34249e32..74c4c60c3c 100644 --- a/wpiutil/src/main/native/cpp/uv/Handle.cpp +++ b/wpiutil/src/main/native/cpp/uv/Handle.cpp @@ -8,9 +8,9 @@ using namespace wpi::uv; Handle::~Handle() noexcept { if (!m_closed && m_uv_handle->type != UV_UNKNOWN_HANDLE) { - uv_close(m_uv_handle, [](uv_handle_t* uv_handle) { delete uv_handle; }); + uv_close(m_uv_handle, [](uv_handle_t* uv_handle) { std::free(uv_handle); }); } else { - delete m_uv_handle; + std::free(m_uv_handle); } } diff --git a/wpiutil/src/main/native/include/wpi/uv/Handle.h b/wpiutil/src/main/native/include/wpi/uv/Handle.h index c73032c886..973d0d2ab6 100644 --- a/wpiutil/src/main/native/include/wpi/uv/Handle.h +++ b/wpiutil/src/main/native/include/wpi/uv/Handle.h @@ -7,6 +7,7 @@ #include +#include #include #include #include @@ -288,7 +289,7 @@ class HandleImpl : public Handle { } protected: - HandleImpl() : Handle{reinterpret_cast(new U)} {} + HandleImpl() : Handle{static_cast(std::malloc(sizeof(U)))} {} }; } // namespace wpi::uv diff --git a/wpiutil/src/main/native/include/wpi/uv/NetworkStream.h b/wpiutil/src/main/native/include/wpi/uv/NetworkStream.h index 16bc537205..faac9fe2f2 100644 --- a/wpiutil/src/main/native/include/wpi/uv/NetworkStream.h +++ b/wpiutil/src/main/native/include/wpi/uv/NetworkStream.h @@ -7,6 +7,7 @@ #include +#include #include #include @@ -143,7 +144,8 @@ class NetworkStreamImpl : public NetworkStream { } protected: - NetworkStreamImpl() : NetworkStream{reinterpret_cast(new U)} {} + NetworkStreamImpl() + : NetworkStream{static_cast(std::malloc(sizeof(U)))} {} }; } // namespace wpi::uv diff --git a/wpiutil/src/main/native/include/wpi/uv/Stream.h b/wpiutil/src/main/native/include/wpi/uv/Stream.h index c0a0e4d5b2..1b90a992a3 100644 --- a/wpiutil/src/main/native/include/wpi/uv/Stream.h +++ b/wpiutil/src/main/native/include/wpi/uv/Stream.h @@ -7,6 +7,7 @@ #include +#include #include #include #include @@ -292,7 +293,7 @@ class StreamImpl : public Stream { } protected: - StreamImpl() : Stream{reinterpret_cast(new U)} {} + StreamImpl() : Stream{static_cast(std::malloc(sizeof(U)))} {} }; } // namespace wpi::uv