Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fatalexception #327

Merged
merged 3 commits into from
May 5, 2015
Merged

Fatalexception #327

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
81d4a2c
Added NanFatalException
kkoopa Apr 30, 2015
80cf724
Whitespace fixes
kkoopa Apr 30, 2015
101652b
Add const_cast to NanFatalException
kkoopa May 1, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,17 +20,17 @@ LINT_SOURCES = \
nan_implementation_pre_12_inl.h \
nan_new.h \
test/cpp/asyncworker.cpp \
test/cpp/asyncprogressworker.cpp \
test/cpp/asyncworkererror.cpp \
test/cpp/bufferworkerpersistent.cpp \
test/cpp/gc.cpp \
test/cpp/morenews.cpp \
test/cpp/asyncprogressworker.cpp \
test/cpp/asyncworkererror.cpp \
test/cpp/bufferworkerpersistent.cpp \
test/cpp/gc.cpp \
test/cpp/morenews.cpp \
test/cpp/multifile1.cpp \
test/cpp/multifile2.cpp \
test/cpp/multifile2.h \
test/cpp/nancallback.cpp \
test/cpp/nannew.cpp \
test/cpp/news.cpp \
test/cpp/news.cpp \
test/cpp/objectwraphandle.cpp \
test/cpp/optionvalues.cpp \
test/cpp/persistent.cpp \
Expand All @@ -41,7 +41,7 @@ LINT_SOURCES = \
test/cpp/settergetter.cpp \
test/cpp/strings.cpp \
test/cpp/symbols.cpp \
test/cpp/weak.cpp \
test/cpp/weak.cpp \
node_modules/node-gyp/gyp/data/win/large-pdb-shim.cc

FILTER = -whitespace/parens
Expand Down
8 changes: 8 additions & 0 deletions nan.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -756,6 +756,10 @@ NAN_INLINE _NanWeakCallbackInfo<T, P>* NanMakeWeakPersistent(
v8::Isolate::GetCurrent(), target, method, argc, argv));
}

NAN_INLINE void NanFatalException(const v8::TryCatch& try_catch) {
node::FatalException(v8::Isolate::GetCurrent(), try_catch);
}

template<typename T>
NAN_INLINE void NanSetIsolateData(
v8::Isolate *isolate
Expand Down Expand Up @@ -1309,6 +1313,10 @@ NAN_INLINE _NanWeakCallbackInfo<T, P>* NanMakeWeakPersistent(
# endif
}

NAN_INLINE void NanFatalException(const v8::TryCatch& try_catch) {
node::FatalException(const_cast<v8::TryCatch&>(try_catch));
}

template<typename T>
NAN_INLINE void NanSetIsolateData(
v8::Isolate *isolate
Expand Down