Fix some warnings with gcc 4.3

PPI: Fix IntervalTimer unit test

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

diff --git a/PPI/IntervalTimer.test.cc b/PPI/IntervalTimer.test.cc
index 631915c..e7e9882 100644 (file)
--- a/PPI/IntervalTimer.test.cc
+++ b/PPI/IntervalTimer.test.cc
@@ -65,7 +65,7 @@ namespace {
     };
 
     bool is_close_clock(senf::ClockService::clock_type a, senf::ClockService::clock_type b,
-                        unsigned long delta)
+                        senf::ClockService::clock_type delta)
     {
         return (a<b ? b-a : a-b ) < delta;
     }
@@ -78,7 +78,7 @@ BOOST_AUTO_UNIT_TEST(intervalTimer)
     senf::ppi::run();
     BOOST_CHECK_PREDICATE( is_close_clock,
                            (senf::ClockService::now())
-                           (start+senf::ClockService::milliseconds(400))
+                           (start+senf::ClockService::milliseconds(300))
                            (senf::ClockService::milliseconds(100)) );
 }
 

diff --git a/Scheduler/ClockService.test.cc b/Scheduler/ClockService.test.cc
index 8ffa717..a67761c 100644 (file)
--- a/Scheduler/ClockService.test.cc
+++ b/Scheduler/ClockService.test.cc
@@ -39,7 +39,7 @@
 namespace {
 
     bool is_close_clock(senf::ClockService::clock_type a, senf::ClockService::clock_type b, 
-                        unsigned long delta)
+                        senf::ClockService::clock_type delta)
     {
         return (a<b ? b-a : a-b ) < delta;
     }

diff --git a/Utils/Termlib/Editor.cc b/Utils/Termlib/Editor.cc
index 8d16f4d..9fc6e68 100644 (file)
--- a/Utils/Termlib/Editor.cc
+++ b/Utils/Termlib/Editor.cc
@@ -465,7 +465,7 @@ prefix_ void senf::term::LineEditor::nextHistory()
     }
 }
 
-prefix_ void senf::term::LineEditor::auxDisplay(int line, std::string const & text)
+prefix_ void senf::term::LineEditor::auxDisplay(unsigned line, std::string const & text)
 {
     toLine(line+1);
     clearLine();

diff --git a/Utils/Termlib/Editor.hh b/Utils/Termlib/Editor.hh
index a2221b8..ead9a06 100644 (file)
--- a/Utils/Termlib/Editor.hh
+++ b/Utils/Termlib/Editor.hh
@@ -265,7 +265,7 @@ namespace term {
         ///\name Aux Display
         ///\{
 
-        void auxDisplay(int line, std::string const & text);
+        void auxDisplay(unsigned line, std::string const & text);
                                         ///< Display \a text on aux display line \a lilne
         unsigned maxAuxDisplayHeight(); ///< Get maximum height of the aux display area
         void clearAuxDisplay();         ///< Clear the aux display area