From 1eb4c718024c55344d16c132ae6c9fbf89671bfb Mon Sep 17 00:00:00 2001 From: James Ausmus Date: Thu, 23 Aug 2012 15:36:21 -0700 Subject: [PATCH] Make the boost::any conversions actually work in WheelSource Signed-off-by: James Ausmus --- plugins/wheel/wheelplugin.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/plugins/wheel/wheelplugin.cpp b/plugins/wheel/wheelplugin.cpp index 2205d53..f02acdd 100644 --- a/plugins/wheel/wheelplugin.cpp +++ b/plugins/wheel/wheelplugin.cpp @@ -101,11 +101,11 @@ boost::any WheelSourcePlugin::getProperty(VehicleProperty::Property property) { if(property == VehicleProperty::VehicleSpeed) { - return 0;//velocity; + return (uint16_t)0;//velocity; } else if(property == VehicleProperty::EngineSpeed) { - return 0;//engineSpeed; + return (uint16_t)0;//engineSpeed; } } @@ -113,12 +113,12 @@ void WheelSourcePlugin::getPropertyAsync(AsyncPropertyReply *reply) { if(reply->property == VehicleProperty::VehicleSpeed) { - reply->value = 0;//velocity; + reply->value = (uint16_t)0;//velocity; reply->completed(reply); } else if(reply->property == VehicleProperty::EngineSpeed) { - reply->value = 0;//engineSpeed; + reply->value = (uint16_t)0;//engineSpeed; reply->completed(reply); } } @@ -156,7 +156,7 @@ void WheelSourcePlugin::unsubscribeToPropertyChanges(VehicleProperty::Property p mRequests.erase(property); } -void WheelSourcePlugin::newPropertyValue(VehicleProperty::Property prop, boost::any) +void WheelSourcePlugin::newPropertyValue(VehicleProperty::Property prop, boost::any value) { if (mRequests.find(prop) != mRequests.end()){ //TODO: Send out new subscribed value @@ -219,7 +219,7 @@ WheelPrivate::~WheelPrivate() boost::any WheelPrivate::getProperty(VehicleProperty::Property propType) { - + return (uint16_t)0; } void WheelPrivate::gotData(GAsyncResult *res) -- 2.7.4