cleaned up headers

diff --git a/ambd/core.cpp b/ambd/core.cpp
index 47f9b79..223aaf8 100644 (file)
--- a/ambd/core.cpp
+++ b/ambd/core.cpp
@@ -91,7 +91,12 @@ void Core::setProperty(VehicleProperty::Property , boost::any )
 
 void Core::subscribeToProperty(VehicleProperty::Property property, AbstractSink* self)
 {
-       propertySinkMap[property].push_back(self);
+       SinkList list = propertySinkMap[property];
+       
+       if(!ListPlusPlus<AbstractSink*>(&list).contains(self))
+       {
+               list.push_back(self);
+       }
 }
 
 void Core::unsubscribeToProperty(VehicleProperty::Property , AbstractSink* self)

diff --git a/ambd/core.h b/ambd/core.h
index f464ef6..0ee4cea 100644 (file)
--- a/ambd/core.h
+++ b/ambd/core.h
@@ -50,7 +50,7 @@ private:
        SourceList mSources;
        SinkList mSinks;
        
-       std::unordered_map<VehicleProperty::Property, SinkList> propertySinkMap;
+       unordered_map<VehicleProperty::Property, SinkList> propertySinkMap;
     
 };
 

diff --git a/lib/abstractsink.cpp b/lib/abstractsink.cpp
index 2629e35..b77e096 100644 (file)
--- a/lib/abstractsink.cpp
+++ b/lib/abstractsink.cpp
@@ -18,6 +18,7 @@
 
 
 #include "abstractsink.h"
+#include "abstractroutingengine.h"
 
 AbstractSink::AbstractSink()
 {

diff --git a/lib/abstractsink.h b/lib/abstractsink.h
index cabb7b1..3ce54d7 100644 (file)
--- a/lib/abstractsink.h
+++ b/lib/abstractsink.h
@@ -26,10 +26,10 @@
 #include <boost/any.hpp>
 
 #include "vehicleproperty.h"
-#include "abstractroutingengine.h"
 
 using namespace std;
 
+class AbstractRoutingEngine;
 class AbstractSink;
 
 typedef list<AbstractSink*> SinkList;