From dd1f45ea197c0914739baae252dbcefa144d9b63 Mon Sep 17 00:00:00 2001 From: Paolo Monteverde Date: Wed, 30 Nov 2016 09:38:32 +0100 Subject: [PATCH 1/2] made DataEvent::data unique_ptr non-const --- src/uvw/stream.hpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/uvw/stream.hpp b/src/uvw/stream.hpp index 239f7dde..f2d5d2bd 100644 --- a/src/uvw/stream.hpp +++ b/src/uvw/stream.hpp @@ -62,11 +62,11 @@ struct WriteEvent: Event { }; * It will be emitted by StreamHandle according with its functionalities. */ struct DataEvent: Event { - explicit DataEvent(std::unique_ptr data, ssize_t length) noexcept + explicit DataEvent(std::unique_ptr data, ssize_t length) noexcept : data{std::move(data)}, length(length) { } - std::unique_ptr data; /*!< A bunch of data read on the stream. */ + std::unique_ptr data; /*!< A bunch of data read on the stream. */ std::size_t length; /*!< The amount of data read on the stream. */ }; From 898746151e56c796771d70ed987dd01bd807a834 Mon Sep 17 00:00:00 2001 From: Paolo Monteverde Date: Wed, 30 Nov 2016 10:02:10 +0100 Subject: [PATCH 2/2] fixed compilation errors --- src/uvw/stream.hpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/uvw/stream.hpp b/src/uvw/stream.hpp index f2d5d2bd..f1eb8dda 100644 --- a/src/uvw/stream.hpp +++ b/src/uvw/stream.hpp @@ -143,7 +143,7 @@ class StreamHandle: public Handle { static void readCallback(uv_stream_t *handle, ssize_t nread, const uv_buf_t *buf) { T &ref = *(static_cast(handle->data)); // data will be destroyed no matter of what the value of nread is - std::unique_ptr data{buf->base}; + std::unique_ptr data{buf->base}; if(nread == UV_EOF) { // end of stream