summaryrefslogtreecommitdiff
path: root/src/stream_wrap.h
diff options
context:
space:
mode:
authorBen Noordhuis <info@bnoordhuis.nl>2013-09-03 00:42:59 +0200
committerBen Noordhuis <info@bnoordhuis.nl>2013-09-03 01:17:58 +0200
commited8d97f572fab15025da0c762e5edfbcbe45f425 (patch)
treeca92b0ac08b5ebc14848883e4cba4e1edc9dd46b /src/stream_wrap.h
parent185c515c9febf2229ed2ac76bfdd0c767ea7fd43 (diff)
downloadnode-new-ed8d97f572fab15025da0c762e5edfbcbe45f425.tar.gz
uv: upgrade to v0.11.12
* upgrade deps/uv/ to v0.11.12. * update files in src/ after a libuv API change.
Diffstat (limited to 'src/stream_wrap.h')
-rw-r--r--src/stream_wrap.h26
1 files changed, 18 insertions, 8 deletions
diff --git a/src/stream_wrap.h b/src/stream_wrap.h
index 7f8f74af9f..6731fdbf75 100644
--- a/src/stream_wrap.h
+++ b/src/stream_wrap.h
@@ -79,10 +79,12 @@ class StreamWrapCallbacks {
uv_stream_t* send_handle,
uv_write_cb cb);
virtual void AfterWrite(WriteWrap* w);
- virtual uv_buf_t DoAlloc(uv_handle_t* handle, size_t suggested_size);
+ virtual void DoAlloc(uv_handle_t* handle,
+ size_t suggested_size,
+ uv_buf_t* buf);
virtual void DoRead(uv_stream_t* handle,
ssize_t nread,
- uv_buf_t buf,
+ const uv_buf_t* buf,
uv_handle_type pending);
virtual int DoShutdown(ShutdownWrap* req_wrap, uv_shutdown_cb cb);
@@ -161,14 +163,22 @@ class StreamWrap : public HandleWrap {
private:
// Callbacks for libuv
static void AfterWrite(uv_write_t* req, int status);
- static uv_buf_t OnAlloc(uv_handle_t* handle, size_t suggested_size);
+ static void OnAlloc(uv_handle_t* handle,
+ size_t suggested_size,
+ uv_buf_t* buf);
static void AfterShutdown(uv_shutdown_t* req, int status);
- static void OnRead(uv_stream_t* handle, ssize_t nread, uv_buf_t buf);
- static void OnRead2(uv_pipe_t* handle, ssize_t nread, uv_buf_t buf,
- uv_handle_type pending);
- static void OnReadCommon(uv_stream_t* handle, ssize_t nread,
- uv_buf_t buf, uv_handle_type pending);
+ static void OnRead(uv_stream_t* handle,
+ ssize_t nread,
+ const uv_buf_t* buf);
+ static void OnRead2(uv_pipe_t* handle,
+ ssize_t nread,
+ const uv_buf_t* buf,
+ uv_handle_type pending);
+ static void OnReadCommon(uv_stream_t* handle,
+ ssize_t nread,
+ const uv_buf_t* buf,
+ uv_handle_type pending);
template <enum encoding encoding>
static void WriteStringImpl(const v8::FunctionCallbackInfo<v8::Value>& args);