mirrors/electron
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions 1

Merge branch 'master' into chrome31

Browse source 
Conflicts:
	common/atom_version.h
This commit is contained in:
Cheng Zhao 2013-12-17 12:58:25 +08:00
commit a4715f936b
7 changed files with 42 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

2
common/v8/native_type_conversions.h
View file

@ -239,7 +239,7 @@ bool FromV8Arguments(const v8::FunctionCallbackInfo<v8::Value>& args,
if (!V8ValueCanBeConvertedTo<T1>(args[index]))
return false;
internal::SwapOrAssign(*value,
static_cast<const T1&>(FromV8Value(args[index])));
FromV8Value(args[index]).operator T1());
return true;
}