X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=senf%2FPPI%2FRoute.ih;h=b57f520f7ca170e88aa679331ed74bdaa7c087df;hb=93d9568d448749dc187e7622b733a4a3caa319df;hp=31a4e5b31f8e7785126ace7fc9106633c7b965e2;hpb=601d1f509f5bb24df167a4dd5a20da67a0af9af8;p=senf.git

diff --git a/senf/PPI/Route.ih b/senf/PPI/Route.ih
index 31a4e5b..b57f520 100644
--- a/senf/PPI/Route.ih
+++ b/senf/PPI/Route.ih
@@ -33,7 +33,7 @@
 #include <boost/mpl/bool.hpp>
 #include <boost/static_assert.hpp>
 
-///////////////////////////////ih.p////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 
 #ifndef DOXYGEN
 
@@ -47,7 +47,7 @@ namespace detail {
     struct RoutingTraitsImplementation
     {
         BOOST_STATIC_ASSERT((boost::is_base_of<connector::Connector, Connector>::value));
-        
+
         static bool const event = false;
 
         static bool const notifySource = boost::is_base_of<
@@ -59,7 +59,7 @@ namespace detail {
             connector::InputConnector, Connector>::value;
         static bool const dataTarget = boost::is_base_of<
             connector::OutputConnector, Connector>::value;
-        
+
         typedef Connector type;
     };
 
@@ -88,12 +88,12 @@ namespace detail {
     // for Events
     template <class Object>
     struct RoutingTraits
-        : public RoutingTraitsImplementation<Object, 
+        : public RoutingTraitsImplementation<Object,
                                              boost::is_convertible<Object*,
                                                                    EventDescriptor*>::value>
     {};
 
-    // This is the generic route implementation for all routes. It just provides access to the 
+    // This is the generic route implementation for all routes. It just provides access to the
     // source and target.
     template <class Source, class Target, class Base>
     class BaseRouteImplementation
@@ -110,6 +110,14 @@ namespace detail {
         BaseRouteImplementation(module::Module & module, Source & source, Target & target);
 
     private:
+        bool v_hasConnector(connector::Connector const & conn) const;
+        bool v_hasEvent(EventDescriptor const & event) const;
+
+        bool isSame(connector::Connector const & conn, connector::Connector const & other) const;
+        bool isSame(connector::Connector const & conn, EventDescriptor const & other) const;
+        bool isSame(EventDescriptor const & event, connector::Connector const & other) const;
+        bool isSame(EventDescriptor const & event, EventDescriptor const & other) const;
+
         Source * source_;
         Target * target_;
     };
@@ -132,9 +140,10 @@ namespace detail {
         : public BaseRouteImplementation<Source, Target, ForwardingRoute>
     {
         typedef BaseRouteImplementation<Source, Target, ForwardingRoute> Base;
-        
+
     protected:
         ForwardingRouteImplementation(module::Module & module, Source & source, Target & target);
+        ~ForwardingRouteImplementation();
 
     private:
         // send a throttle/unthrottle notification  only if the second argument is a 'true' type
@@ -152,7 +161,7 @@ namespace detail {
     };
 
     // This helper class finds the base-class suitable for a specific route. Routes are classified
-    // into two groups: 
+    // into two groups:
     //  1) A forwarding routes is a routed which forwards notifications from a notifySource to a
     //     notifyTarget. Forwarding routes are implemneted using ForwardingRouteImplementation
     //  2) Non-forwarding routes don't forward notifications. They are implemented directly
@@ -165,14 +174,14 @@ namespace detail {
 
         static bool const isForwarding = (srcTrait::notifySource && trgTrait::notifyTarget)
             || (srcTrait::notifyTarget && trgTrait::notifySource);
-        
+
         typedef typename boost::mpl::if_c<
-            isForwarding, 
-            ForwardingRouteImplementation<Source,Target>, 
+            isForwarding,
+            ForwardingRouteImplementation<Source,Target>,
             BaseRouteImplementation<Source,Target,RouteBase> >::type base;
     };
 
-    // RouteImplementation2 has two purposes: 
+    // RouteImplementation2 has two purposes:
     //  1) Ensure, that routing is always from a data source to a data target
     //  2) To find the correct base-class. This is delegated to RouteImplementationBase
     template <class Source, class Target>
@@ -181,7 +190,7 @@ namespace detail {
     {
         typedef typename RouteImplementationBase<Source,Target>::base Base;
 
-        BOOST_STATIC_ASSERT( RoutingTraits<Source>::dataSource && 
+        BOOST_STATIC_ASSERT( RoutingTraits<Source>::dataSource &&
                              RoutingTraits<Target>::dataTarget );
 
     protected:
@@ -207,7 +216,7 @@ namespace detail {
 
 #endif
 
-///////////////////////////////ih.e////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 #endif