From 110cacd1ed7350cd718b0d5aa0ce8c320c040bb1 Mon Sep 17 00:00:00 2001 From: isaacs Date: Wed, 13 Mar 2013 11:22:33 -0700 Subject: [PATCH] core: Move UNWRAP_NO_ABORT to handle_wrap.h Otherwise it cannot be used in StreamWrap. Forgot to include in last patch, broke the build. --- src/handle_wrap.cc | 6 ------ src/handle_wrap.h | 6 ++++++ 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/handle_wrap.cc b/src/handle_wrap.cc index a667bb47c5..3f05c7d81b 100644 --- a/src/handle_wrap.cc +++ b/src/handle_wrap.cc @@ -23,12 +23,6 @@ #include "ngx-queue.h" #include "handle_wrap.h" -#define UNWRAP_NO_ABORT(type) \ - assert(!args.Holder().IsEmpty()); \ - assert(args.Holder()->InternalFieldCount() > 0); \ - type* wrap = static_cast( \ - args.Holder()->GetPointerFromInternalField(0)); - namespace node { using v8::Arguments; diff --git a/src/handle_wrap.h b/src/handle_wrap.h index 6780cd72fe..dbefc2a114 100644 --- a/src/handle_wrap.h +++ b/src/handle_wrap.h @@ -46,6 +46,12 @@ namespace node { // js/c++ boundary crossing. At the javascript layer that should all be // taken care of. +#define UNWRAP_NO_ABORT(type) \ + assert(!args.Holder().IsEmpty()); \ + assert(args.Holder()->InternalFieldCount() > 0); \ + type* wrap = static_cast( \ + args.Holder()->GetPointerFromInternalField(0)); + class HandleWrap { public: static void Initialize(v8::Handle target);