PPI: Small inline fixes

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

diff --git a/PPI/IOEvent.ct b/PPI/IOEvent.ct
new file mode 100644 (file)
index 0000000..0f94c3c
--- /dev/null
+++ b/PPI/IOEvent.ct
@@ -0,0 +1,60 @@
+// $Id$
+//
+// 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.
+//
+// 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.
+//
+// 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.
+
+/** \file
+    \brief IOEvent non-inline template implementation  */
+
+//#include "IOEvent.ih"
+
+// Custom includes
+
+#define prefix_
+///////////////////////////////ct.p////////////////////////////////////////
+
+template <class Handle>
+prefix_ void senf::ppi::IOEvent::set(Handle handle, unsigned events)
+{
+    if (handle) {
+        fd_ = senf::scheduler::get_descriptor(handle);
+        event_.events(events).handle(fd_);
+        event_.enable();
+    }
+    else {
+        event_.disable();
+        event_.events(0).handle(-1);
+        fd_ = -1;
+    }
+}
+
+///////////////////////////////ct.e////////////////////////////////////////
+#undef prefix_
+
+\f
+// Local Variables:
+// mode: c++
+// fill-column: 100
+// comment-column: 40
+// c-file-style: "senf"
+// indent-tabs-mode: nil
+// ispell-local-dictionary: "american"
+// compile-command: "scons -u test"
+// End:

diff --git a/PPI/IOEvent.cti b/PPI/IOEvent.cti
index 5f36a06..7372e36 100644 (file)
--- a/PPI/IOEvent.cti
+++ b/PPI/IOEvent.cti
@@ -40,19 +40,6 @@ prefix_ senf::ppi::IOEvent::IOEvent(Handle handle, unsigned events)
       event_ ("senf::ppi::IOEvent", boost::bind(&IOEvent::cb,this,_1), fd_, events, false) 
 {}
 
-template <class Handle>
-prefix_ void senf::ppi::IOEvent::set(Handle handle, unsigned events)
-{
-    if (handle) {
-        fd_ = senf::scheduler::get_descriptor(handle);
-        event_.events(events).handle(fd_);
-    }
-    else {
-        event_.disable();
-        fd_ = -1;
-    }
-}
-
 ///////////////////////////////cti.e///////////////////////////////////////
 #undef prefix_
 

diff --git a/PPI/IOEvent.hh b/PPI/IOEvent.hh
index b6bb619..0d19eb3 100644 (file)
--- a/PPI/IOEvent.hh
+++ b/PPI/IOEvent.hh
@@ -124,7 +124,7 @@ namespace ppi {
 
 ///////////////////////////////hh.e////////////////////////////////////////
 #include "IOEvent.cci"
-//#include "IOEvent.ct"
+#include "IOEvent.ct"
 #include "IOEvent.cti"
 #endif
 

diff --git a/PPI/RateFilter.test.cc b/PPI/RateFilter.test.cc
index 923eb86..f7e1663 100644 (file)
--- a/PPI/RateFilter.test.cc
+++ b/PPI/RateFilter.test.cc
@@ -65,7 +65,7 @@ BOOST_AUTO_UNIT_TEST(rateFilter)
     senf::ppi::run();
 
     BOOST_CHECK_EQUAL( rateFilter.interval(), senf::ClockService::milliseconds(100) );
-    BOOST_CHECK_EQUAL( sink.size(), 2);
+    BOOST_CHECK_EQUAL( sink.size(), 2u );
 }
 
 namespace {