Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Merge branch 'master' of https://github.com/hybridum/zorba-node

  • Loading branch information...
commit 5d69e23d7fcf726c402c010b73c3fabb61671683 2 parents 9f4491d + e2928d8
@Rod-O authored
Showing with 24 additions and 13 deletions.
  1. +22 −12 binding.gyp
  2. +2 −1  src/Execute.cpp
View
34 binding.gyp
@@ -1,19 +1,23 @@
{
- "targets": [
- {
+ "targets":
+ [{
"target_name": "zorba",
"product_extension": "node",
"sources": [
- "src/execute.cpp",
- "src/helpers.cpp",
- "src/main.cpp",
- "src/nodediagnostichandler.cpp"
+ "./src/Execute.cpp",
+ "./src/helpers.cpp",
+ "./src/main.cpp",
+ "./src/NodeDiagnosticHandler.cpp"
],
+
+ 'cflags!': [ '-fno-exceptions' ],
+ 'cflags_cc!': [ '-fno-exceptions' ],
"include_dirs": [
- "include"
+ "./include"
],
"conditions": [
- ['OS=="win"',
+ [
+ 'OS=="win"',
{
"link_settings": {
"libraries": [
@@ -24,9 +28,15 @@
"win/include"
]
}
- ],
+ ], [
+ 'OS=="mac"',
+ {
+ 'xcode_settings':
+ {
+ 'GCC_ENABLE_CPP_EXCEPTIONS': 'YES'
+ }
+ }
+ ]
]
- }
-
- ]
+ }]
}
View
3  src/Execute.cpp
@@ -64,7 +64,8 @@ Handle<Value> Execute(const Arguments& args) {
break;
case 3:
{
- NodeDiagnosticHandler diagnosticHandler(Local<Function>::Cast(args[2]));
+ Local<Function> function(Local<Function>::Cast(args[2]));
+ NodeDiagnosticHandler diagnosticHandler(function);
query->registerDiagnosticHandler(&diagnosticHandler);
query->compile(sQuery, hints);
Please sign in to comment.
Something went wrong with that request. Please try again.