X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=PPI%2FJoins.hh;h=8960551b24d73f12060f4259c621acf8f33c2119;hb=b8ca4a544cce3e6023bb56b712a03d6362f2bb79;hp=3f7087cc2d19acec7183ff579a42739a081d9e2c;hpb=69255c0f1669fc80b0e4a2bf524715f336b127ad;p=senf.git

diff --git a/PPI/Joins.hh b/PPI/Joins.hh
index 3f7087c..8960551 100644
--- a/PPI/Joins.hh
+++ b/PPI/Joins.hh
@@ -1,8 +1,8 @@
 // $Id$
 //
-// Copyright (C) 2007 
-// Fraunhofer Institute for Open Communication Systems (FOKUS) 
-// Competence Center NETwork research (NET), St. Augustin, GERMANY 
+// Copyright (C) 2007
+// Fraunhofer Institute for Open Communication Systems (FOKUS)
+// Competence Center NETwork research (NET), St. Augustin, GERMANY
 //     Stefan Bund <g0dil@berlios.de>
 //
 // This program is free software; you can redistribute it and/or modify
@@ -23,8 +23,8 @@
 /** \file
     \brief Joins public header */
 
-#ifndef HH_Joins_
-#define HH_Joins_ 1
+#ifndef HH_SENF_PPI_Joins_
+#define HH_SENF_PPI_Joins_ 1
 
 // Custom includes
 #include <boost/ptr_container/ptr_vector.hpp>
@@ -42,9 +42,10 @@ namespace ppi {
 
     template <class Source>
     connector::GenericPassiveInput & connect(Source & source, module::PassiveJoin & target);
-    
+
     template <class Source>
-    connector::GenericActiveInput & connect(Source & source, module::PriorityJoin & target);
+    connector::GenericActiveInput & connect(Source & source, module::PriorityJoin & target,
+                                            int priority = -1);
 
 #endif
 
@@ -120,7 +121,7 @@ namespace module {
         \endcode
         Here, \a module1 has higher priority than \a module2 which will only be queried if \a
         module1 is throttled.
-        
+
         \ingroup routing_modules
      */
     class PriorityJoin
@@ -133,13 +134,13 @@ namespace module {
         PriorityJoin();
 
     private:
-        connector::ActiveInput<> & newInput();
+        connector::ActiveInput<> & newInput(int priority);
 
 #ifndef DOXYGEN
     public:
 #endif
         template <class Source>
-        connector::GenericActiveInput & connect(Source & source);
+        connector::GenericActiveInput & connect(Source & source, int prioricty);
 
     private:
         void request();