X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=Scheduler%2FReadHelper.hh;h=85965e57b61ea0d4967c27bd530b0b18247b3fbe;hb=a4ebeef29f8eb69dc2dad10668d762540002b924;hp=2b7bdb30e41aaa816b25b552c5e2b98c8cb26928;hpb=31d85cd6b8e03c5ecc924ca8892906be1bab702f;p=senf.git

diff --git a/Scheduler/ReadHelper.hh b/Scheduler/ReadHelper.hh
index 2b7bdb3..85965e5 100644
--- a/Scheduler/ReadHelper.hh
+++ b/Scheduler/ReadHelper.hh
@@ -30,7 +30,7 @@
 #include <boost/intrusive_ptr.hpp>
 #include <boost/scoped_ptr.hpp>
 
-#include "Utils/intrusive_refcount.hh"
+#include "../Utils/intrusive_refcount.hh"
 #include "Scheduler.hh"
 
 //#include "ReadHelper.mpp"
@@ -113,7 +113,7 @@ namespace senf {
         ///////////////////////////////////////////////////////////////////////////
 
         Handle handle() const;          ///< Access the handle object
-        unsigned maxSize() const;       ///< Return maximum number of bytes to be read
+        std::string::size_type maxSize() const; ///< Return maximum number of bytes to be read
 
         std::string const & data() const; ///< return data read
         std::string const & tail() const; ///< return data read but not matched by the predicate
@@ -129,13 +129,15 @@ namespace senf {
     private:
         struct InternalPredicate;
 
-        ReadHelper(Handle handle, unsigned maxSize,  InternalPredicate * predicate, Callback cb);
+        ReadHelper(Handle handle, std::string::size_type maxSize,  
+                   InternalPredicate * predicate, Callback cb);
 
-        static void dispatchProcess(ptr helper, Handle handle, senf::Scheduler::EventId event);
-        void process(Handle handle, senf::Scheduler::EventId event);
+        static void dispatchProcess(ptr helper, Handle handle, int event);
+        void process(Handle handle, int event);
         void done();
 
         Handle handle_;
+        scheduler::FdEvent fde_;
         std::string::size_type maxSize_;
         boost::scoped_ptr<InternalPredicate> predicate_;
         Callback callback_;
@@ -178,4 +180,5 @@ namespace senf {
 // indent-tabs-mode: nil
 // ispell-local-dictionary: "american"
 // compile-command: "scons -u test"
+// comment-column: 40
 // End: