diff options
author | isaacs <i@izs.me> | 2013-03-13 11:22:33 -0700 |
---|---|---|
committer | isaacs <i@izs.me> | 2013-03-13 11:26:36 -0700 |
commit | 110cacd1ed7350cd718b0d5aa0ce8c320c040bb1 (patch) | |
tree | b7c684c1ed265ca4325ad977d55b202e775f6502 | |
parent | 9af0085f700294b3535fe9d324e3cdf71b071d03 (diff) | |
download | node-new-110cacd1ed7350cd718b0d5aa0ce8c320c040bb1.tar.gz |
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.
-rw-r--r-- | src/handle_wrap.cc | 6 | ||||
-rw-r--r-- | 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<type*>( \ - 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<type*>( \ + args.Holder()->GetPointerFromInternalField(0)); + class HandleWrap { public: static void Initialize(v8::Handle<v8::Object> target); |