Fix compilation errors

For compiling with gcc-4.8.2 (linaro)

diff --git a/lib/superptr.hpp b/lib/superptr.hpp
index b2c2f53..3723b36 100644 (file)
--- a/lib/superptr.hpp
+++ b/lib/superptr.hpp
@@ -88,7 +88,7 @@ template<typename T> ::std::unique_ptr<T> make_unique(T* t)
 
 template<typename T> gobject_ptr<T> make_gobject(T* t)
 {
-       return gobject_ptr<T>(t, [](auto ptr) { if(ptr) g_object_unref(ptr);});
+    return gobject_ptr<T>(t, [](T *ptr) { if(ptr) g_object_unref(ptr);});
 }
 
 }

diff --git a/plugins/dbus/dbusinterfacemanager.cpp b/plugins/dbus/dbusinterfacemanager.cpp
index 4006d50..d643a33 100644 (file)
--- a/plugins/dbus/dbusinterfacemanager.cpp
+++ b/plugins/dbus/dbusinterfacemanager.cpp
@@ -51,7 +51,7 @@ on_bus_acquired (GDBusConnection *connection, const gchar *name, gpointer user_d
 {
        DBusInterfaceManager* iface = static_cast<DBusInterfaceManager*>(user_data);
 
-       iface->connection = std::shared_ptr<GDBusConnection>(connection, [=](auto conn){
+    iface->connection = std::shared_ptr<GDBusConnection>(connection, [=](GDBusConnection* conn){
                amb::traits<GDBusConnection>::delete_functor functor;
                functor(conn);
        });

diff --git a/tools/AmbSignalMapper/lib/Intel/IviPoc/templates/ambtmpl_plugin.cpp b/tools/AmbSignalMapper/lib/Intel/IviPoc/templates/ambtmpl_plugin.cpp
index 6f41274..6f6c889 100644 (file)
--- a/tools/AmbSignalMapper/lib/Intel/IviPoc/templates/ambtmpl_plugin.cpp
+++ b/tools/AmbSignalMapper/lib/Intel/IviPoc/templates/ambtmpl_plugin.cpp
@@ -81,7 +81,7 @@ gboolean AmbTmplPlugin::timeoutCallback(gpointer data)
 // AmbTmplPlugin
 //----------------------------------------------------------------------------
 
-AmbTmplPlugin::AmbTmplPlugin(AbstractRoutingEngine* re, const map<string, string>& config, AbstractSink& parent) :
+AmbTmplPlugin::AmbTmplPlugin(AbstractRoutingEngine* re, const map<string, string>& config, AbstractSource& parent) :
       AmbPluginImpl(re, config, parent),
       interface(DEFAULT_CAN_IF_NAME),
       canBus(new CANBus(*static_cast<CANObserver*>(this))),

diff --git a/tools/AmbSignalMapper/lib/Intel/IviPoc/templates/ambtmpl_plugin.h b/tools/AmbSignalMapper/lib/Intel/IviPoc/templates/ambtmpl_plugin.h
index 9e22f55..af59323 100644 (file)
--- a/tools/AmbSignalMapper/lib/Intel/IviPoc/templates/ambtmpl_plugin.h
+++ b/tools/AmbSignalMapper/lib/Intel/IviPoc/templates/ambtmpl_plugin.h
@@ -30,6 +30,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 #include <canbus.h>
 #include <canobserver.h>
 
+#include <ambplugin.h>
 #include <ambpluginimpl.h>
 #include "ambtmpl_cansignal.h"
 
@@ -42,7 +43,7 @@ class CANMessage;
 class AmbTmplPlugin : public AmbPluginImpl, public CANObserver {
 
 public:
-    AmbTmplPlugin(AbstractRoutingEngine* re, const std::map<std::string, std::string>& config, AbstractSink& parent);
+    AmbTmplPlugin(AbstractRoutingEngine* re, const std::map<std::string, std::string>& config, AbstractSource& parent);
     virtual ~AmbTmplPlugin(); // has to be virtual because of unit tests
 
     // from AbstractSink