X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=senf%2FPPI%2FMultiConnectorMixin.mpp;h=0de3682d7a57fc3000750fa71eeb59ee2ee094ac;hb=78a6e233083efa63a9cd0684a92abc64202a9ee7;hp=8000c671938f13c373e44ce039688019ef3d18b6;hpb=45b346fa3a120720280b67b0f405b1954c0885d4;p=senf.git diff --git a/senf/PPI/MultiConnectorMixin.mpp b/senf/PPI/MultiConnectorMixin.mpp index 8000c67..0de3682 100644 --- a/senf/PPI/MultiConnectorMixin.mpp +++ b/senf/PPI/MultiConnectorMixin.mpp @@ -1,6 +1,6 @@ // $Id$ // -// Copyright (C) 2009 +// Copyright (C) 2009 // Fraunhofer Institute for Open Communication Systems (FOKUS) // Competence Center NETwork research (NET), St. Augustin, GERMANY // Stefan Bund @@ -29,11 +29,11 @@ // Custom includes #include #include -#include +#include #include #include #include -#include +#include #include #include #include @@ -140,7 +140,7 @@ connect(Source & source mpp_FnParamsKomma(), Target & target mpp_FnParamsKomma2( // senf::ppi::module::detail::MultiConnectorMixinAccess member declaration 1..MAX_ARGS template -static typename Module::ConnectorType & +static typename Module::ConnectorType & newConnector(Module & module mpp_FnParamsKomma()); // //////////////////////////////////////////////////////////////////////// @@ -228,7 +228,7 @@ senf::ppi::connect(Source & source, Target & target mpp_FnParamsKomma()) // senf::ppi::module::detail::MultiConnectorMixinAccess members template -typename Module::ConnectorType & +typename Module::ConnectorType & senf::ppi::module::detail::MultiConnectorMixinAccess::newConnector( Module & module mpp_FnParamsKomma()) { @@ -280,13 +280,13 @@ senf::ppi::connect(Source & source mpp_FnParamsKomma(), Target & target mpp_FnPa #undef mpp_TplParamsKomma #undef mpp_TplParams_ #undef mpp_TplParams - + // //////////////////////////////////////////////////////////////////////// /* (save-excursion (re-search-backward "^// Undefine local Macros") (forward-line 1) (delete-region (point) (progn (search-forward "// ////") (forward-line -1) (point))) (insert "\n") (let ((b (point)) - (e (progn (insert (save-excursion (re-search-backward + (e (progn (insert (save-excursion (re-search-backward "^// Local Macros") (search-forward "#define") (beginning-of-line) (buffer-substring (point) (progn (search-forward "// ////") (search-backward "#define") (forward-line 1) (point))))) (point))))