X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=senf%2FPPI%2FMultiConnectorMixin.ih;h=ece03b9c1741a4345875b49e089e5c92df7988f5;hb=8a6697d11e9a6557d9a5c42b4052666fce32bc10;hp=eff87698c7247b8fbf1ff123be69617d6d675101;hpb=2d88e6b3f5a6f3906e42264f58859e6bf9c12dae;p=senf.git

diff --git a/senf/PPI/MultiConnectorMixin.ih b/senf/PPI/MultiConnectorMixin.ih
index eff8769..ece03b9 100644
--- a/senf/PPI/MultiConnectorMixin.ih
+++ b/senf/PPI/MultiConnectorMixin.ih
@@ -1,24 +1,29 @@
 // $Id$
 //
-// Copyright (C) 2009 
+// Copyright (C) 2009
 // 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
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 2 of the License, or
-// (at your option) any later version.
+// The contents of this file are subject to the Fraunhofer FOKUS Public License
+// Version 1.0 (the "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at 
+// http://senf.berlios.de/license.html
 //
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
+// The Fraunhofer FOKUS Public License Version 1.0 is based on, 
+// but modifies the Mozilla Public License Version 1.1.
+// See the full license text for the amendments.
 //
-// You should have received a copy of the GNU General Public License
-// along with this program; if not, write to the
-// Free Software Foundation, Inc.,
-// 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+// Software distributed under the License is distributed on an "AS IS" basis, 
+// WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License 
+// for the specific language governing rights and limitations under the License.
+//
+// The Original Code is Fraunhofer FOKUS code.
+//
+// The Initial Developer of the Original Code is Fraunhofer-Gesellschaft e.V. 
+// (registered association), Hansastraße 27 c, 80686 Munich, Germany.
+// All Rights Reserved.
+//
+// Contributor(s):
+//   Stefan Bund <g0dil@berlios.de>
 
 /** \file
     \brief MultiConnectorMixin internal header */
@@ -27,8 +32,9 @@
 #define IH_SENF_PPI_MultiConnectorMixin_ 1
 
 // Custom includes
+#include "Setup.hh"
 
-///////////////////////////////ih.p////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 
 namespace senf {
 namespace ppi {
@@ -46,16 +52,24 @@ namespace detail {
     };
 
     template <class KeyType, class ConnectorType>
-    struct MultiConnectorDefaultContainer 
-    { 
-        typedef boost::ptr_map<KeyType, ConnectorType> type; 
+    struct MultiConnectorDefaultContainer
+    {
+        typedef boost::ptr_map<KeyType, ConnectorType> type;
+    };
+
+    template <class Module, class Connector>
+    class MultiConnectorWrapper
+        : public Connector
+    {
+    private:
+        virtual void v_disconnected();
     };
 
 #ifndef DOXYGEN
 
     template <class ConnectorType>
-    struct MultiConnectorDefaultContainer<void,ConnectorType> 
-    { 
+    struct MultiConnectorDefaultContainer<void,ConnectorType>
+    {
         typedef boost::ptr_vector<ConnectorType> type;
     };
 
@@ -63,60 +77,56 @@ namespace detail {
 
     template <class ConnectorType>
     struct MultiConnectorSelectBase
-        : public boost::mpl::if_< 
+        : public boost::mpl::if_<
               boost::is_base_of<connector::InputConnector, ConnectorType>,
               ppi::detail::DisableStandardInput, ppi::detail::DisableStandardOutput >
     {};
 
-    template <class T> senf::mpl::rv<0> is_multiconnector_(T *, ...);
-    template <class T> senf::mpl::rv<1> is_multiconnector_(
-        T *,
-        typename boost::enable_if<boost::is_base_of<connector::OutputConnector, 
-                                                    typename T::ConnectorType>, 
-        int>::type);
-    template <class T> senf::mpl::rv<2> is_multiconnector_(
-        T *,
-        typename boost::enable_if<boost::is_base_of<connector::InputConnector, 
-                                                    typename T::ConnectorType>, 
-        int>::type);
+    template <class T> senf::mpl::rv<0> isMulticonnector(...);
+    template <class T> senf::mpl::rv<1> isMulticonnector(
+        typename boost::enable_if<boost::is_base_of<connector::OutputConnector,
+                                                    typename T::ConnectorType>,
+                                  int>::type);
+    template <class T> senf::mpl::rv<2> isMulticonnector(
+        typename boost::enable_if<boost::is_base_of<connector::InputConnector,
+                                                    typename T::ConnectorType>,
+                                  int>::type);
 
     template <class T, unsigned N>
-    struct is_multiconnector_source_
+    struct IsMulticonnectorSource_
         : public boost::false_type
     {};
 
     template <class T>
-    struct is_multiconnector_source_<T, 1u>
+    struct IsMulticonnectorSource_<T, 1u>
         : public boost::true_type
     {};
 
     template <class T>
-    struct is_multiconnector_source
-        : public is_multiconnector_source_<
-              T, SENF_MPL_RV(is_multiconnector_<T>(static_cast<T*>(0),0))>
+    struct IsMulticonnectorSource
+        : public IsMulticonnectorSource_<T, SENF_MPL_RV(isMulticonnector<T>(0))>
     {};
 
     template <class T, unsigned N>
-    struct is_multiconnector_target_
+    struct IsMulticonnectorTarget_
         : public boost::false_type
     {};
 
     template <class T>
-    struct is_multiconnector_target_<T, 2u>
+    struct IsMulticonnectorTarget_<T, 2u>
         : public boost::true_type
     {};
 
     template <class T>
-    struct is_multiconnector_target
-        : public is_multiconnector_target_<
-              T, SENF_MPL_RV(is_multiconnector_<T>(static_cast<T*>(0),0))>
+    struct IsMulticonnectorTarget
+        : public IsMulticonnectorTarget_<T, SENF_MPL_RV(isMulticonnector<T>(0))>
     {};
 
 
 
 }}}}
 
-///////////////////////////////ih.e////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 #endif