summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJames Ausmus <james.ausmus@intel.com>2012-08-23 15:36:21 -0700
committerJames Ausmus <james.ausmus@intel.com>2012-08-23 15:38:04 -0700
commit1eb4c718024c55344d16c132ae6c9fbf89671bfb (patch)
tree38cdfbd52acfda535911f8039adde626c9b9d3b2
parent0d7934e19a7414dbf00bd281938d12ee6a9b5b3e (diff)
downloadautomotive-message-broker-1eb4c718024c55344d16c132ae6c9fbf89671bfb.tar.gz
Make the boost::any conversions actually work in WheelSource
Signed-off-by: James Ausmus <james.ausmus@intel.com>
-rw-r--r--plugins/wheel/wheelplugin.cpp12
1 files changed, 6 insertions, 6 deletions
diff --git a/plugins/wheel/wheelplugin.cpp b/plugins/wheel/wheelplugin.cpp
index 2205d53b..f02acdd5 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)