X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=PPI%2FJoins.cti;h=1e77d161f5a00ee80a5095fe56cb1673a5beb3b9;hb=fd3a0e8ac95d1158e9ea661ddf9187b67c70169f;hp=f664d70b6fb8b6fff90827b24748bc513af51c3f;hpb=0327b3f303ea2a61d44a30bfaac022874dcf2a0d;p=senf.git diff --git a/PPI/Joins.cti b/PPI/Joins.cti index f664d70..1e77d16 100644 --- a/PPI/Joins.cti +++ b/PPI/Joins.cti @@ -1,8 +1,8 @@ // $Id$ // -// Copyright (C) 2007 -// Fraunhofer Institut fuer offene Kommunikationssysteme (FOKUS) -// Kompetenzzentrum fuer Satelitenkommunikation (SatCom) +// 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 @@ -35,10 +35,10 @@ // senf::ppi::module::PassiveJoin template -prefix_ senf::ppi::connector::PassiveInput & +prefix_ senf::ppi::connector::GenericPassiveInput & senf::ppi::module::PassiveJoin::connect(Source & source) { - connector::PassiveInput & input (newInput()); + connector::GenericPassiveInput & input (newInput()); ppi::connect(source,input); return input; } @@ -47,10 +47,10 @@ senf::ppi::module::PassiveJoin::connect(Source & source) // senf::ppi::module::PriorityJoin template -prefix_ senf::ppi::connector::ActiveInput & -senf::ppi::module::PriorityJoin::connect(Source & source) +prefix_ senf::ppi::connector::GenericActiveInput & +senf::ppi::module::PriorityJoin::connect(Source & source, int priority) { - connector::ActiveInput & input (newInput()); + connector::GenericActiveInput & input (newInput(priority)); ppi::connect(source,input); return input; } @@ -61,17 +61,17 @@ senf::ppi::module::PriorityJoin::connect(Source & source) #ifndef DOXYGEN template -prefix_ senf::ppi::connector::PassiveInput & senf::ppi::connect(Source & source, - module::PassiveJoin & target) +prefix_ senf::ppi::connector::GenericPassiveInput & +senf::ppi::connect(Source & source, module::PassiveJoin & target) { return target.connect(source); } template -prefix_ senf::ppi::connector::ActiveInput & senf::ppi::connect(Source & source, - module::PriorityJoin & target) +prefix_ senf::ppi::connector::GenericActiveInput & +senf::ppi::connect(Source & source, module::PriorityJoin & target, int priority) { - return target.connect(source); + return target.connect(source, priority); } #endif