Hawkin
/
arangodb
mirror of https://gitee.com/bigwinds/arangodb
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

cleanup

This commit is contained in:
jsteemann 2016-05-01 14:13:20 +02:00
parent 9232df6782
commit e137b37d1d
2 changed files with 12 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
lib/V8/v8-conv.cpp
View File

@ -496,12 +496,11 @@ std::string TRI_ObjectToString(v8::Handle<v8::Value> const value) {
int64_t TRI_ObjectToInt64(v8::Handle<v8::Value> const value) { int64_t TRI_ObjectToInt64(v8::Handle<v8::Value> const value) {
if (value->IsNumber()) { if (value->IsNumber()) {
return (int64_t)value->ToNumber()->Value(); return static_cast<int64_t>(value->ToNumber()->Value());
} }
if (value->IsNumberObject()) { if (value->IsNumberObject()) {
v8::Handle<v8::NumberObject> no = v8::Handle<v8::NumberObject>::Cast(value); return static_cast<int64_t>(v8::Handle<v8::NumberObject>::Cast(value)->NumberValue());
return (int64_t)no->NumberValue();
} }
return 0; return 0;
@ -512,14 +511,13 @@ int64_t TRI_ObjectToInt64(v8::Handle<v8::Value> const value) {
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
uint64_t TRI_ObjectToUInt64(v8::Handle<v8::Value> const value, uint64_t TRI_ObjectToUInt64(v8::Handle<v8::Value> const value,
bool const allowStringConversion) { bool allowStringConversion) {
if (value->IsNumber()) { if (value->IsNumber()) {
return (uint64_t)value->ToNumber()->Value(); return static_cast<uint64_t>(value->ToNumber()->Value());
} }
if (value->IsNumberObject()) { if (value->IsNumberObject()) {
v8::Handle<v8::NumberObject> no = v8::Handle<v8::NumberObject>::Cast(value); return static_cast<uint64_t>(v8::Handle<v8::NumberObject>::Cast(value)->NumberValue());
return (uint64_t)no->NumberValue();
} }
if (allowStringConversion && value->IsString()) { if (allowStringConversion && value->IsString()) {
@ -540,8 +538,7 @@ double TRI_ObjectToDouble(v8::Handle<v8::Value> const value) {
} }
if (value->IsNumberObject()) { if (value->IsNumberObject()) {
v8::Handle<v8::NumberObject> no = v8::Handle<v8::NumberObject>::Cast(value); return v8::Handle<v8::NumberObject>::Cast(value)->NumberValue();
return no->NumberValue();
} }
return 0.0; return 0.0;
@ -559,8 +556,7 @@ double TRI_ObjectToDouble(v8::Handle<v8::Value> const value, bool& error) {
} }
if (value->IsNumberObject()) { if (value->IsNumberObject()) {
v8::Handle<v8::NumberObject> no = v8::Handle<v8::NumberObject>::Cast(value); return v8::Handle<v8::NumberObject>::Cast(value)->NumberValue();
return no->NumberValue();
} }
error = true; error = true;
@ -575,10 +571,10 @@ double TRI_ObjectToDouble(v8::Handle<v8::Value> const value, bool& error) {
bool TRI_ObjectToBoolean(v8::Handle<v8::Value> const value) { bool TRI_ObjectToBoolean(v8::Handle<v8::Value> const value) {
if (value->IsBoolean()) { if (value->IsBoolean()) {
return value->ToBoolean()->Value(); return value->ToBoolean()->Value();
} else if (value->IsBooleanObject()) { }
v8::Handle<v8::BooleanObject> bo =
v8::Handle<v8::BooleanObject>::Cast(value); if (value->IsBooleanObject()) {
return bo->BooleanValue(); return v8::Handle<v8::BooleanObject>::Cast(value)->BooleanValue();
} }
return false; return false;

2
lib/V8/v8-conv.h
View File

@ -68,7 +68,7 @@ int64_t TRI_ObjectToInt64(v8::Handle<v8::Value> const);
/// @brief converts an V8 object to a uint64_t /// @brief converts an V8 object to a uint64_t
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
uint64_t TRI_ObjectToUInt64(v8::Handle<v8::Value> const, bool const); uint64_t TRI_ObjectToUInt64(v8::Handle<v8::Value> const, bool);
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
/// @brief converts a V8 object to a double /// @brief converts a V8 object to a double