diff options
| author | Julien Gilli <julien.gilli@joyent.com> | 2015-03-16 15:55:17 -0700 |
|---|---|---|
| committer | Julien Gilli <julien.gilli@joyent.com> | 2015-03-16 15:55:17 -0700 |
| commit | ae58fc407f916b2abb164453a5b09273c543dbc3 (patch) | |
| tree | 4a16fe73f996a54f34cfb553b2995d16c1375b7f /src | |
| parent | 2b64132101f179c30957e3c5f16fc47a8ec942e1 (diff) | |
| parent | eb2764a9452baa7cba2d98dc34fa00fc776b0a12 (diff) | |
| download | node-merge-review.tar.gz | |
Merge remote-tracking branch 'upstream/v0.12'merge-review
Diffstat (limited to 'src')
| -rw-r--r-- | src/node_dtrace.cc | 11 | ||||
| -rw-r--r-- | src/tcp_wrap.cc | 4 |
2 files changed, 7 insertions, 8 deletions
diff --git a/src/node_dtrace.cc b/src/node_dtrace.cc index 6e5e31083..8acff3947 100644 --- a/src/node_dtrace.cc +++ b/src/node_dtrace.cc @@ -19,16 +19,11 @@ // OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE // USE OR OTHER DEALINGS IN THE SOFTWARE. - -#include "util.h" +#include "node_dtrace.h" #ifdef HAVE_DTRACE -#include "node_dtrace.h" #include "node_provider.h" -#include <string.h> #elif HAVE_ETW -#include "node_dtrace.h" -#include <string.h> #include "node_win32_etw_provider.h" #include "node_win32_etw_provider-inl.h" #else @@ -55,6 +50,10 @@ #include "env.h" #include "env-inl.h" +#include "util.h" + +#include <string.h> + namespace node { using v8::FunctionCallbackInfo; diff --git a/src/tcp_wrap.cc b/src/tcp_wrap.cc index 6b2408c98..4d66c2912 100644 --- a/src/tcp_wrap.cc +++ b/src/tcp_wrap.cc @@ -428,7 +428,7 @@ void TCPWrap::Connect(const FunctionCallbackInfo<Value>& args) { assert(args[0]->IsObject()); assert(args[1]->IsString()); - assert(args[2]->Uint32Value()); + assert(args[2]->IsUint32()); Local<Object> req_wrap_obj = args[0].As<Object>(); node::Utf8Value ip_address(args[1]); @@ -460,7 +460,7 @@ void TCPWrap::Connect6(const FunctionCallbackInfo<Value>& args) { assert(args[0]->IsObject()); assert(args[1]->IsString()); - assert(args[2]->Uint32Value()); + assert(args[2]->IsUint32()); Local<Object> req_wrap_obj = args[0].As<Object>(); node::Utf8Value ip_address(args[1]); |