From cc041c485182a9d94db1e68b8987a9dae6fc2b06 Mon Sep 17 00:00:00 2001 From: Jan Steemann Date: Tue, 24 Jun 2014 08:20:35 +0200 Subject: [PATCH] typecasts --- arangod/RestHandler/RestReplicationHandler.cpp | 4 ++-- arangod/V8Server/v8-vocbase.cpp | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/arangod/RestHandler/RestReplicationHandler.cpp b/arangod/RestHandler/RestReplicationHandler.cpp index 3c845b88ee..6905c25f79 100644 --- a/arangod/RestHandler/RestReplicationHandler.cpp +++ b/arangod/RestHandler/RestReplicationHandler.cpp @@ -651,7 +651,7 @@ void RestReplicationHandler::handleCommandLoggerState () { TRI_Insert3ArrayJson(TRI_UNKNOWN_MEM_ZONE, state, "running", TRI_CreateBooleanJson(TRI_UNKNOWN_MEM_ZONE, true)); TRI_Insert3ArrayJson(TRI_UNKNOWN_MEM_ZONE, state, "lastLogTick", TRI_CreateStringCopyJson(TRI_UNKNOWN_MEM_ZONE, StringUtils::itoa(s.lastTick).c_str())); - TRI_Insert3ArrayJson(TRI_UNKNOWN_MEM_ZONE, state, "totalEvents", TRI_CreateNumberJson(TRI_UNKNOWN_MEM_ZONE, s.numEvents)); + TRI_Insert3ArrayJson(TRI_UNKNOWN_MEM_ZONE, state, "totalEvents", TRI_CreateNumberJson(TRI_UNKNOWN_MEM_ZONE, (double) s.numEvents)); TRI_Insert3ArrayJson(TRI_UNKNOWN_MEM_ZONE, state, "time", TRI_CreateStringCopyJson(TRI_UNKNOWN_MEM_ZONE, s.timeString.c_str())); TRI_Insert3ArrayJson(TRI_UNKNOWN_MEM_ZONE, json, "state", state); @@ -1579,7 +1579,7 @@ void RestReplicationHandler::handleCommandInventory () { TRI_Insert3ArrayJson(TRI_CORE_MEM_ZONE, state, "running", TRI_CreateBooleanJson(TRI_CORE_MEM_ZONE, true)); char* logTickString = TRI_StringUInt64(s.lastTick); TRI_Insert3ArrayJson(TRI_CORE_MEM_ZONE, state, "lastLogTick", TRI_CreateStringJson(TRI_CORE_MEM_ZONE, logTickString)); - TRI_Insert3ArrayJson(TRI_CORE_MEM_ZONE, state, "totalEvents", TRI_CreateNumberJson(TRI_CORE_MEM_ZONE, s.numEvents)); + TRI_Insert3ArrayJson(TRI_CORE_MEM_ZONE, state, "totalEvents", TRI_CreateNumberJson(TRI_CORE_MEM_ZONE, (double) s.numEvents)); TRI_Insert3ArrayJson(TRI_CORE_MEM_ZONE, state, "time", TRI_CreateStringCopyJson(TRI_CORE_MEM_ZONE, s.timeString.c_str())); TRI_Insert3ArrayJson(TRI_CORE_MEM_ZONE, &json, "state", state); diff --git a/arangod/V8Server/v8-vocbase.cpp b/arangod/V8Server/v8-vocbase.cpp index 5e0fb5e17d..cb8d75da8d 100644 --- a/arangod/V8Server/v8-vocbase.cpp +++ b/arangod/V8Server/v8-vocbase.cpp @@ -4571,8 +4571,8 @@ static v8::Handle JS_StateLoggerReplication (v8::Arguments const& arg v8::Handle state = v8::Object::New(); state->Set(TRI_V8_STRING("running"), v8::True()); state->Set(TRI_V8_STRING("lastLogTick"), V8TickId(s.lastTick)); - state->Set(TRI_V8_STRING("totalEvents"), v8::Number::New(s.numEvents)); - state->Set(TRI_V8_STRING("time"), v8::String::New(s.timeString.c_str(), s.timeString.size())); + state->Set(TRI_V8_STRING("totalEvents"), v8::Number::New((double) s.numEvents)); + state->Set(TRI_V8_STRING("time"), v8::String::New(s.timeString.c_str(), (int) s.timeString.size())); result->Set(TRI_V8_STRING("state"), state); v8::Handle server = v8::Object::New();