fixed boost/intrusive/iset includes

git-svn-id: https://svn.berlios.de/svnroot/repos/senf/trunk@1284 270642c3-0616-0410-b53a-bc976706d245

diff --git a/PPI/AnnotationRouter.hh b/PPI/AnnotationRouter.hh
index ff12b97..e438755 100644 (file)
--- a/PPI/AnnotationRouter.hh
+++ b/PPI/AnnotationRouter.hh
@@ -115,9 +115,6 @@ 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 MultiConnectorMixin< AnnotationRouter<AnnotationType>,
                                             connector::ActiveOutput<>,

diff --git a/Packets/80221Bundle/MIHPacket.hh b/Packets/80221Bundle/MIHPacket.hh
index fa819b5..adff97e 100644 (file)
--- a/Packets/80221Bundle/MIHPacket.hh
+++ b/Packets/80221Bundle/MIHPacket.hh
@@ -241,9 +241,6 @@ namespace senf {
         static void dump(packet p, std::ostream &os);
         static void finalize(packet p);
         static factory_t nextPacketType(packet p);
-        
-        enum ResponseStatus { Success, UnspecifiedFailure, Rejected, AuthorizationFailure, NetworkError };
-        enum Opcode { Request=1, Response, Indication }; 
     };
 
     /** \brief MIH packet typedef */

diff --git a/Packets/PacketInterpreter.hh b/Packets/PacketInterpreter.hh
index ac38e7d..490d853 100644 (file)
--- a/Packets/PacketInterpreter.hh
+++ b/Packets/PacketInterpreter.hh
@@ -27,7 +27,7 @@
 #define HH_SENF_Packets_PacketInterpreter_ 1
 
 // Custom includes
-#include "../boost/intrusive/ilist.hpp"
+#include <boost/intrusive/ilist.hpp>
 #include <boost/optional.hpp>
 #include <boost/range.hpp>
 #include "../Utils/intrusive_refcount.hh"

diff --git a/Packets/PacketTypes.hh b/Packets/PacketTypes.hh
index fe229a6..87c6df4 100644 (file)
--- a/Packets/PacketTypes.hh
+++ b/Packets/PacketTypes.hh
@@ -30,8 +30,8 @@
 #include <vector>
 #include <boost/intrusive_ptr.hpp>
 #include <boost/cstdint.hpp>
-#include "../boost/intrusive/ilist.hpp"
-#include "../boost/intrusive/ilist_hook.hpp"
+#include <boost/intrusive/ilist.hpp>
+#include <boost/intrusive/ilist_hook.hpp>
 
 //#include "PacketTypes.mpp"
 ///////////////////////////////hh.p////////////////////////////////////////

diff --git a/Scheduler/EventHook.hh b/Scheduler/EventHook.hh
index 0ab24c9..bec8be1 100644 (file)
--- a/Scheduler/EventHook.hh
+++ b/Scheduler/EventHook.hh
@@ -28,7 +28,7 @@
 
 // Custom includes
 #include <boost/function.hpp>
-#include "../boost/intrusive/ilist_hook.hpp"
+#include <boost/intrusive/ilist_hook.hpp>
 #include "FIFORunner.hh"
 
 //#include "EventHook.mpp"

diff --git a/Scheduler/EventManager.hh b/Scheduler/EventManager.hh
index 099ebae..cd6cb87 100644 (file)
--- a/Scheduler/EventManager.hh
+++ b/Scheduler/EventManager.hh
@@ -29,8 +29,8 @@
 // Custom includes
 #include <string>
 #include <boost/iterator/filter_iterator.hpp>
-#include "../boost/intrusive/ilist.hpp"
-#include "../boost/intrusive/ilist_hook.hpp"
+#include <boost/intrusive/ilist.hpp>
+#include <boost/intrusive/ilist_hook.hpp>
 #include "../Utils/singleton.hh"
 #include "../Utils/Console/LazyDirectory.hh"
 

diff --git a/Scheduler/FIFORunner.hh b/Scheduler/FIFORunner.hh
index 23f0620..1bfdd16 100644 (file)
--- a/Scheduler/FIFORunner.hh
+++ b/Scheduler/FIFORunner.hh
@@ -29,8 +29,8 @@
 // Custom includes
 #include <signal.h>
 #include <boost/utility.hpp>
-#include "../boost/intrusive/ilist.hpp"
-#include "../boost/intrusive/ilist_hook.hpp"
+#include <boost/intrusive/ilist.hpp>
+#include <boost/intrusive/ilist_hook.hpp>
 #include "../Utils/singleton.hh"
 #include "EventManager.hh"
 

diff --git a/Scheduler/FdEvent.hh b/Scheduler/FdEvent.hh
index 1c05878..f4f55da 100644 (file)
--- a/Scheduler/FdEvent.hh
+++ b/Scheduler/FdEvent.hh
@@ -27,7 +27,7 @@
 #define HH_SENF_Scheduler_FdEvent_ 1
 
 // Custom includes
-#include "../boost/intrusive/iset_hook.hpp"
+#include <boost/intrusive/iset_hook.hpp>
 #include "../Utils/Exception.hh"
 #include "FdManager.hh"
 #include "FIFORunner.hh"

diff --git a/Scheduler/FdEvent.ih b/Scheduler/FdEvent.ih
index 6e2cacd..039ee76 100644 (file)
--- a/Scheduler/FdEvent.ih
+++ b/Scheduler/FdEvent.ih
@@ -27,7 +27,7 @@
 #define IH_SENF_Scheduler_FdEvent_ 1
 
 // Custom includes
-#include "../boost/intrusive/iset.hpp"
+#include <boost/intrusive/iset.hpp>
 
 ///////////////////////////////ih.p////////////////////////////////////////
 

diff --git a/Scheduler/IdleEvent.hh b/Scheduler/IdleEvent.hh
index de079c6..ead11de 100644 (file)
--- a/Scheduler/IdleEvent.hh
+++ b/Scheduler/IdleEvent.hh
@@ -28,7 +28,7 @@
 
 // Custom includes
 #include <boost/function.hpp>
-#include "../boost/intrusive/ilist_hook.hpp"
+#include <boost/intrusive/ilist_hook.hpp>
 #include "FIFORunner.hh"
 
 //#include "IdleEvent.mpp"

diff --git a/Scheduler/SignalEvent.hh b/Scheduler/SignalEvent.hh
index cc4e989..d3ff3ab 100644 (file)
--- a/Scheduler/SignalEvent.hh
+++ b/Scheduler/SignalEvent.hh
@@ -30,7 +30,7 @@
 #include <signal.h>
 #include <boost/function.hpp>
 #include "FIFORunner.hh"
-#include "../boost/intrusive/iset_hook.hpp"
+#include <boost/intrusive/iset_hook.hpp>
 
 //#include "SignalEvent.mpp"
 ///////////////////////////////hh.p////////////////////////////////////////

diff --git a/Scheduler/SignalEvent.ih b/Scheduler/SignalEvent.ih
index 23ef3e7..29e663c 100644 (file)
--- a/Scheduler/SignalEvent.ih
+++ b/Scheduler/SignalEvent.ih
@@ -28,7 +28,7 @@
 
 // Custom includes
 #include "FdManager.hh"
-#include "../boost/intrusive/iset.hpp"
+#include <boost/intrusive/iset.hpp>
 #include "../Utils/Exception.hh"
 #include "../Utils/singleton.hh"
 

diff --git a/Scheduler/TimerEvent.hh b/Scheduler/TimerEvent.hh
index 6084f11..1f30611 100644 (file)
--- a/Scheduler/TimerEvent.hh
+++ b/Scheduler/TimerEvent.hh
@@ -28,7 +28,7 @@
 
 // Custom includes
 #include <signal.h>
-#include "../boost/intrusive/iset_hook.hpp"
+#include <boost/intrusive/iset_hook.hpp>
 #include "ClockService.hh"
 #include "FdManager.hh"
 #include "FIFORunner.hh"

diff --git a/Scheduler/TimerEvent.ih b/Scheduler/TimerEvent.ih
index fdb62f2..5ce5b74 100644 (file)
--- a/Scheduler/TimerEvent.ih
+++ b/Scheduler/TimerEvent.ih
@@ -28,7 +28,7 @@
 
 // Custom includes
 #include <boost/scoped_ptr.hpp>
-#include "../boost/intrusive/iset.hpp"
+#include <boost/intrusive/iset.hpp>
 #include "TimerSource.hh"
 
 ///////////////////////////////ih.p////////////////////////////////////////

diff --git a/Utils/Daemon/Daemon.ih b/Utils/Daemon/Daemon.ih
index bd29a9b..2198d03 100644 (file)
--- a/Utils/Daemon/Daemon.ih
+++ b/Utils/Daemon/Daemon.ih
@@ -28,8 +28,8 @@
 
 // Custom includes
 #include <deque>
-#include "../boost/intrusive/iset.hpp"
-#include "../boost/intrusive/iset_hook.hpp"
+#include <boost/intrusive/iset.hpp>
+#include <boost/intrusive/iset_hook.hpp>
 #include <boost/utility.hpp>
 #include <boost/function.hpp>
 #include "../../Scheduler/Scheduler.hh"