From 68e4a0069f867a10e3ec000aa15d08fdfb31d26f Mon Sep 17 00:00:00 2001 From: David Steele Date: Mon, 5 Jun 2017 14:43:33 +0100 Subject: [PATCH] Updated network client to fix cast build errors This variant of the build options is not tested by the build server (--enable-networklogging), consequently, these errors were not discovered when -Werror=old-style-cast was added. Apparently no-one else uses Stagehand any more... Change-Id: I69fdaa03608723b66be080bd7749e243b7ea6a89 Signed-off-by: David Steele --- adaptors/base/performance-logging/networking/event/automation.cpp | 2 +- .../base/performance-logging/networking/network-performance-client.cpp | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/adaptors/base/performance-logging/networking/event/automation.cpp b/adaptors/base/performance-logging/networking/event/automation.cpp index 3226c32..79f6210 100644 --- a/adaptors/base/performance-logging/networking/event/automation.cpp +++ b/adaptors/base/performance-logging/networking/event/automation.cpp @@ -249,7 +249,7 @@ void AppendPropertyNameAndValue( Dali::Handle handle, int propertyIndex, std::os } else if( '\x00' <= *c && *c <= '\x1f' ) { - escapedValue << "\\u" << std::hex << std::setw(4) << std::setfill('0') << (int)*c; + escapedValue << "\\u" << std::hex << std::setw(4) << std::setfill('0') << int(*c); } else { diff --git a/adaptors/base/performance-logging/networking/network-performance-client.cpp b/adaptors/base/performance-logging/networking/network-performance-client.cpp index 5d2de3a..af0a48b 100644 --- a/adaptors/base/performance-logging/networking/network-performance-client.cpp +++ b/adaptors/base/performance-logging/networking/network-performance-client.cpp @@ -169,8 +169,9 @@ bool NetworkPerformanceClient::TransmitMarker( const PerformanceMarker& marker, { // write out the time stamp char buffer[64]; + double usec = marker.GetTimeStamp().microseconds; int size = snprintf( buffer, sizeof(buffer),"%.6f (seconds), %s\n", - ( (double) marker.GetTimeStamp().microseconds * MICROSECONDS_TO_SECOND ), + usec * MICROSECONDS_TO_SECOND, description ); return mSocket->Write( buffer, size ); -- 2.7.4