X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=PPI%2FJoins.hh;h=266e80740975b2e1ecb22616f2cf6efaffddd3f2;hb=92f8630b75f3ef50e73c48cde58645dcd1534e27;hp=3f7087cc2d19acec7183ff579a42739a081d9e2c;hpb=69255c0f1669fc80b0e4a2bf524715f336b127ad;p=senf.git diff --git a/PPI/Joins.hh b/PPI/Joins.hh index 3f7087c..266e807 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 // // 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 @@ -42,7 +42,7 @@ namespace ppi { template connector::GenericPassiveInput & connect(Source & source, module::PassiveJoin & target); - + template connector::GenericActiveInput & connect(Source & source, module::PriorityJoin & target); @@ -120,7 +120,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