X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=PPI%2FJoins.cti;h=1e77d161f5a00ee80a5095fe56cb1673a5beb3b9;hb=f2f5d59e83863f3b513950173baee1b6da2aee3c;hp=e100b0846a94f2b5556831963244aa5469bb866c;hpb=914af680a37d303da51e3877972ca9bd68d6190b;p=senf.git diff --git a/PPI/Joins.cti b/PPI/Joins.cti index e100b08..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; } @@ -58,20 +58,24 @@ senf::ppi::module::PriorityJoin::connect(Source & source) /////////////////////////////////////////////////////////////////////////// // namespace members +#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 + ///////////////////////////////cti.e/////////////////////////////////////// #undef prefix_