Allow polling an empty set of objects

Clean up some old debug prints

diff --git a/source/base.cpp b/source/base.cpp
index 174bace5792e436b75765adea64f1aeff44e03d6..4556b7303aa669da514ef344d2bd2cdb3662b847 100644 (file)
--- a/source/base.cpp
+++ b/source/base.cpp
@@ -9,8 +9,6 @@ Distributed under the LGPL
 
 using namespace std;
 
 
 using namespace std;
 

-#include <iostream>
-

 namespace Msp {
 namespace IO {
 
 namespace Msp {
 namespace IO {
 


@@ -61,7 +59,6 @@ Base::Base():
 
 void Base::set_events(PollEvent e)
 {
 
 void Base::set_events(PollEvent e)
 {

-       //cout<<"object "<<this<<" set_events "<<e<<'\n';

        events=e;
        signal_events_changed.emit(events);
 }
        events=e;
        signal_events_changed.emit(events);
 }

diff --git a/source/eventdispatcher.cpp b/source/eventdispatcher.cpp
index 2150fe23b7055fb0fd1e0d5eb3ae770d60c9b9dc..d7e367c67e7141e34d213a607d3d00c859aa4b71 100644 (file)
--- a/source/eventdispatcher.cpp
+++ b/source/eventdispatcher.cpp
@@ -9,9 +9,6 @@ Distributed under the LGPL
 #include "eventdispatcher.h"
 #include "poll.h"
 
 #include "eventdispatcher.h"
 #include "poll.h"
 

-#include <iostream>
-using namespace std;
-

 namespace Msp {
 namespace IO {
 
 namespace Msp {
 namespace IO {
 


@@ -20,7 +17,6 @@ EventDispatcher::EventDispatcher()
 
 void EventDispatcher::add(Base &obj)
 {
 
 void EventDispatcher::add(Base &obj)
 {

-       //cout<<"evdisp add "<<&obj<<'\n';

        SlotMap::iterator i=objects.find(&obj);
        if(i==objects.end())
        {
        SlotMap::iterator i=objects.find(&obj);
        if(i==objects.end())
        {


@@ -35,7 +31,6 @@ void EventDispatcher::add(Base &obj)
 
 void EventDispatcher::remove(Base &obj)
 {
 
 void EventDispatcher::remove(Base &obj)
 {

-       //cout<<"evdisp remove "<<&obj<<'\n';

        SlotMap::iterator i=objects.find(&obj);
        if(i!=objects.end())
        {
        SlotMap::iterator i=objects.find(&obj);
        if(i!=objects.end())
        {

diff --git a/source/poll.cpp b/source/poll.cpp
index 3b349b4b187f824ab2152cb3fa0d896cad0e59f1..659e2385ff5c5c3dadf0ffea2bde277e1bdfb711 100644 (file)
--- a/source/poll.cpp
+++ b/source/poll.cpp
@@ -100,8 +100,6 @@ void Poller::set_object(Base &obj, PollEvent ev)
        if(ev)
                obj.get_event_handle();
 
        if(ev)
                obj.get_event_handle();
 

-       //cout<<"poller set_object "<<&obj<<' '<<ev<<'\n';
-

        SlotMap::iterator i=objects.find(&obj);
        if(i!=objects.end())
        {
        SlotMap::iterator i=objects.find(&obj);
        if(i!=objects.end())
        {


@@ -162,14 +160,11 @@ int Poller::do_poll(int timeout)
 
        poll_result.clear();
 
 
        poll_result.clear();
 

-       if(pfd.empty())
-               throw InvalidState("Nothing to poll");
-

 #ifdef WIN32
        if(timeout<0)
                timeout=INFINITE;
 
 #ifdef WIN32
        if(timeout<0)
                timeout=INFINITE;
 

-       DWORD ret=WaitForMultipleObjects(pfd.size(), reinterpret_cast<HANDLE *>(&pfd.front()), false, timeout);
+       DWORD ret=WaitForMultipleObjects(pfd.size(), &pfd.front().fd, false, timeout);

        if(/*ret>=WAIT_OBJECT_0 &&*/ ret<WAIT_OBJECT_0+pfd.size())
        {
                SlotMap::iterator i=objects.begin();
        if(/*ret>=WAIT_OBJECT_0 &&*/ ret<WAIT_OBJECT_0+pfd.size())
        {
                SlotMap::iterator i=objects.begin();