fixed compile errors in database and murphy plugins

diff --git a/plugins/database/databasesink.cpp b/plugins/database/databasesink.cpp
index fbab29b..6313fd5 100644 (file)
--- a/plugins/database/databasesink.cpp
+++ b/plugins/database/databasesink.cpp
@@ -377,7 +377,7 @@ void DatabaseSink::setDatabaseFileName(string filename)
 
        for(int i=0; i < supportedStr.size(); i++)
        {
-               if(!ListPlusPlus<VehicleProperty::Property>(&mSupported).contains(supportedStr[i][0]))
+               if(!contains(mSupported, supportedStr[i][0]))
                        mSupported.push_back(supportedStr[i][0]);
        }
 
@@ -394,7 +394,7 @@ void DatabaseSink::propertyChanged(AbstractPropertyType *value)
        if(!shared)
                return;
 
-       if(!ListPlusPlus<VehicleProperty::Property>(&mSupported).contains(property))
+       if(!contains(mSupported, property))
        {
                mSupported.push_back(property);
                routingEngine->updateSupported(mSupported, PropertyList(), this);

diff --git a/plugins/murphyplugin/murphysource.cpp b/plugins/murphyplugin/murphysource.cpp
index de3fb4a..72e9f11 100644 (file)
--- a/plugins/murphyplugin/murphysource.cpp
+++ b/plugins/murphyplugin/murphysource.cpp
@@ -59,7 +59,7 @@ void MurphySource::processValue(string propertyName, AbstractPropertyType *prop)
 bool MurphySource::hasProperty(string propertyName)
 {
     PropertyList props = supported();
-    return ListPlusPlus<VehicleProperty::Property>(&props).contains(propertyName);
+       return contains(props,propertyName);
 }
 
 static void recvfrom_msg(mrp_transport_t *transp, mrp_msg_t *msg,