Fix SCons 1.2.0 build failure

[senf.git] / PPI / AnnotationRouter.hh

diff --git a/PPI/AnnotationRouter.hh b/PPI/AnnotationRouter.hh
index 7badaaf..e438755 100644 (file)
--- a/PPI/AnnotationRouter.hh
+++ b/PPI/AnnotationRouter.hh
@@ -31,7 +31,7 @@
 #include "../Utils/String.hh"
 #include "Module.hh"
 #include "Connectors.hh"
-#include "DynamicConnectorMixin.hh"
+#include "MultiConnectorMixin.hh"
 
 //#include "AnnotationRouter.mpp"
 ///////////////////////////////hh.p////////////////////////////////////////
@@ -96,7 +96,7 @@ namespace module {
     template <class AnnotationType>
     class AnnotationRouter 
         : public Module, 
-          public DynamicConnectorMixin< AnnotationRouter<AnnotationType>,
+          public MultiConnectorMixin< AnnotationRouter<AnnotationType>,
                                         connector::ActiveOutput<>,
                                         AnnotationType >
     {
@@ -115,11 +115,8 @@ namespace module {
     private:
         AnnotationType connectorSetup(connector::ActiveOutput<> & conn, AnnotationType const & key);
         void request();
-        
-        typedef boost::ptr_map<AnnotationType, connector::ActiveOutput<> > Outputs;
-        Outputs outputs_;
 
-        friend class DynamicConnectorMixin< AnnotationRouter<AnnotationType>,
+        friend class MultiConnectorMixin< AnnotationRouter<AnnotationType>,
                                             connector::ActiveOutput<>,
                                             AnnotationType >;
     };