BTCPrivate
/
bitcore
mirror of https://github.com/BTCPrivate/bitcore.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge remote-tracking branch 'dthorpe/master'

This commit is contained in:
Ryan X. Charles 2014-04-11 14:23:02 -03:00
parent 5815aac9cb dd5ef29831
commit 7074618049
1 changed files with 15 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/eckey.cc
View File

@ -160,12 +160,17 @@ Key::New()
Handle<Value> Handle<Value>
Key::New(const Arguments& args) Key::New(const Arguments& args)
{ {
if (!args.IsConstructCall()) {
return FromConstructorTemplate(s_ct, args);
}
HandleScope scope; HandleScope scope;
// this was invoked as Key() not new Key()
if (!args.IsConstructCall()) {
// return FromConstructorTemplate(s_ct, args);
const int argc = 1;
Local<Value> argv[argc] = { args[0] };
return scope.Close(s_ct->GetFunction()->NewInstance(argc, argv));
}
else{
Key* key = new Key(); Key* key = new Key();
if (key->lastError != NULL) { if (key->lastError != NULL) {
return VException(key->lastError); return VException(key->lastError);
@ -175,6 +180,7 @@ Key::New(const Arguments& args)
return scope.Close(args.This()); return scope.Close(args.This());
} }
}
Handle<Value> Handle<Value>
Key::GenerateSync(const Arguments& args) Key::GenerateSync(const Arguments& args)