X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fio%2Fpoll.cpp;h=7aa41e1c330c9ac41ae5ebdf9fa96eb3678a274c;hb=39da82b967c70282973025e4b12186625e29fe26;hp=4f9b24f8e6340b8111c6a45824b60cecf336216c;hpb=122846f0881673770d88eff7d925ecf25c01b62e;p=libs%2Fcore.git

diff --git a/source/io/poll.cpp b/source/io/poll.cpp
index 4f9b24f..7aa41e1 100644
--- a/source/io/poll.cpp
+++ b/source/io/poll.cpp
@@ -1,4 +1,4 @@
-#include <stdexcept>
+#include <msp/core/except.h>
 #include <msp/core/algorithm.h>
 #include "eventobject.h"
 #include "poll.h"
@@ -44,10 +44,10 @@ void Poller::set_object(EventObject &obj, PollEvent ev)
 
 #ifdef _WIN32
 	if(objects.size()>=MAXIMUM_WAIT_OBJECTS)
-		throw logic_error("Maximum number of wait objects reached");
+		throw invalid_state("too many objects");
 #endif
 
-	objects.push_back(PolledObject(&obj, ev));
+	objects.push_back({ &obj, ev });
 	objs_changed = true;
 }
 
@@ -91,7 +91,7 @@ PollEvent poll(EventObject &obj, PollEvent pe)
 PollEvent poll(EventObject &obj, PollEvent pe, const Time::TimeDelta &timeout)
 {
 	if(timeout<Time::zero)
-		throw invalid_argument("poll");
+		throw invalid_argument("IO::poll");
 
 	return platform_poll(obj, pe, static_cast<int>(timeout/Time::msec));
 }