new timer class

[chaz/yoink] / src / Moof / Dispatcher.cc

diff --git a/src/Moof/Dispatcher.cc b/src/Moof/Dispatcher.cc
index 7e33c270d848050caf7fe43c8a17633106928fb0..2d9d3377011a5d6eef4f9984633f17da738b1c0c 100644 (file)
--- a/src/Moof/Dispatcher.cc
+++ b/src/Moof/Dispatcher.cc
@@ -30,8 +30,6 @@
 
 #include "Dispatcher.hh"
 
-#include <iostream>
-
 
 namespace Mf {
 
@@ -78,7 +76,7 @@ struct Dispatcher::Impl
 
                        for (CallbackIter jt = first; jt != last; ++jt)
                        {
-                               if (((*jt).second).first == id)
+                               if ((*jt).second.first == id)
                                {
                                        callbacks.erase(jt);
                                        break;
@@ -137,7 +135,7 @@ void Dispatcher::dispatch(const std::string& message, const Notification* param)
 
        for (Impl::CallbackIter it = callbacks.first; it != callbacks.second; ++it)
        {
-               Function callback = ((*it).second).second;
+               Function callback = (*it).second.second;
                callback(param);
        }
 }