X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=PPI%2Fpredecl.hh;h=e5b1091badfe87b0db829992ac56b9360bc6a42e;hb=b89e3166f7680755683dccee5e48cb3a820185c0;hp=be9c0533d3a1d935672215eb363ef641536d3ac1;hpb=f539f4271d470794a773a92bacd8ba086c9bc1cd;p=senf.git

diff --git a/PPI/predecl.hh b/PPI/predecl.hh
index be9c053..e5b1091 100644
--- a/PPI/predecl.hh
+++ b/PPI/predecl.hh
@@ -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 <g0dil@berlios.de>
 //
 // This program is free software; you can redistribute it and/or modify
@@ -23,16 +23,18 @@
 /** \file
     \brief predecl public header */
 
-#ifndef HH_predecl_
-#define HH_predecl_ 1
+#ifndef HH_SENF_PPI_predecl_
+#define HH_SENF_PPI_predecl_ 1
 
 // Custom includes
-#include <boost/type_traits.hpp>
 
 //#include "predecl.mpp"
 ///////////////////////////////hh.p////////////////////////////////////////
 
 namespace senf {
+
+    class Packet;
+
 namespace ppi {
 
     class EventDescriptor;
@@ -44,6 +46,8 @@ namespace ppi {
     class QueueingDiscipline;
     class ModuleManager;
 
+#ifndef DOXYGEN
+
     namespace detail {
         class EventBindingBase;
         template <class EvImpl> class EventBinding;
@@ -55,17 +59,20 @@ namespace ppi {
         class BackwardForwardingRouteImplementation;
         class ForwardForwardingRouteToEventImplementation;
         class BackwardForwardingRouteFromEventImplementation;
-        template <class Source, class Target, 
-                  bool srcEvent = boost::is_base_of<EventDescriptor,Source>::value,
-                  bool trgEvent = boost::is_base_of<EventDescriptor,Target>::value>
+        template <class Source, class Target>
             class RouteImplementation;
     }
 
+#endif
+
     namespace module {       
         class Module;       
         namespace detail {
             template <class Source, class Target> class RouteHelper;
         }
+        class PassiveJoin;
+        class PriorityJoin;
+        class ActiveDuplicator;
     }
 
     namespace connector {
@@ -74,10 +81,26 @@ namespace ppi {
         class PassiveConnector;
         class InputConnector;
         class OutputConnector;
-        class ActiveInput;
-        class ActiveOutput;
-        class PassiveInput;
-        class PassiveOutput;
+        class GenericActiveInput;
+        class GenericActiveOutput;
+        class GenericPassiveInput;
+        class GenericPassiveOutput;
+        template <class PacketType=Packet> class PassiveInput;
+        template <class PacketType=Packet> class PassiveOutput;
+        template <class PacketType=Packet> class ActiveInput;
+        template <class PacketType=Packet> class ActiveOutput;
+
+        class Jack;
+
+#ifndef DOXYGEN
+
+        namespace detail {
+            template <class Self, class PacketType> class TypedInputMixin;
+            template <class Self, class PacketType> class TypedOutputMixin;
+        }
+
+#endif
+
     }
 
 }}