diff options
| author | Timothy J Fontaine <tjfontaine@gmail.com> | 2014-06-10 19:36:04 -0400 |
|---|---|---|
| committer | Timothy J Fontaine <tjfontaine@gmail.com> | 2014-06-10 19:36:04 -0400 |
| commit | 1a09da6ec219883668564d5d6cd30e8867d7e97d (patch) | |
| tree | fda9b632fa5ab280286a2f0c1076bbaa008be362 /src/tcp_wrap.cc | |
| parent | ab50fad63bcbedd7c935a9c5d2ab9e4c7202c9f2 (diff) | |
| parent | 1cb6f1a46ad24c60ab1fccfa3f88aad9401e6444 (diff) | |
| download | android-node-v8-1a09da6ec219883668564d5d6cd30e8867d7e97d.tar.gz android-node-v8-1a09da6ec219883668564d5d6cd30e8867d7e97d.tar.bz2 android-node-v8-1a09da6ec219883668564d5d6cd30e8867d7e97d.zip | |
Merge remote-tracking branch 'upstream/v0.10'
Conflicts:
AUTHORS
ChangeLog
deps/v8/src/api.cc
deps/v8/src/unicode-inl.h
deps/v8/src/unicode.h
lib/_stream_readable.js
lib/http.js
src/cares_wrap.cc
src/node.cc
src/node_crypto.cc
src/node_dtrace.cc
src/node_file.cc
src/node_stat_watcher.cc
src/node_version.h
src/process_wrap.cc
src/string_bytes.cc
src/string_bytes.h
src/udp_wrap.cc
src/util.h
test/simple/test-buffer.js
test/simple/test-stream2-compatibility.js
Diffstat (limited to 'src/tcp_wrap.cc')
| -rw-r--r-- | src/tcp_wrap.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/tcp_wrap.cc b/src/tcp_wrap.cc index d0e2573bd5..ecaffef803 100644 --- a/src/tcp_wrap.cc +++ b/src/tcp_wrap.cc @@ -257,7 +257,7 @@ void TCPWrap::Bind(const FunctionCallbackInfo<Value>& args) { TCPWrap* wrap = Unwrap<TCPWrap>(args.Holder()); - String::Utf8Value ip_address(args[0]); + node::Utf8Value ip_address(args[0]); int port = args[1]->Int32Value(); sockaddr_in addr; @@ -278,7 +278,7 @@ void TCPWrap::Bind6(const FunctionCallbackInfo<Value>& args) { TCPWrap* wrap = Unwrap<TCPWrap>(args.Holder()); - String::Utf8Value ip6_address(args[0]); + node::Utf8Value ip6_address(args[0]); int port = args[1]->Int32Value(); sockaddr_in6 addr; @@ -381,7 +381,7 @@ void TCPWrap::Connect(const FunctionCallbackInfo<Value>& args) { assert(args[2]->Uint32Value()); Local<Object> req_wrap_obj = args[0].As<Object>(); - String::Utf8Value ip_address(args[1]); + node::Utf8Value ip_address(args[1]); int port = args[2]->Uint32Value(); sockaddr_in addr; @@ -415,7 +415,7 @@ void TCPWrap::Connect6(const FunctionCallbackInfo<Value>& args) { assert(args[2]->Uint32Value()); Local<Object> req_wrap_obj = args[0].As<Object>(); - String::Utf8Value ip_address(args[1]); + node::Utf8Value ip_address(args[1]); int port = args[2]->Int32Value(); sockaddr_in6 addr; |