Merge branch 'master' into c++11

src/core/poll_manager.cc

@@ -38,7 +38,7 @@
 
 #include <stdexcept>
 #include <unistd.h>
-#include <rak/error_number.h>
+#include <torrent/exceptions.h>
 #include <torrent/poll_epoll.h>
 #include <torrent/poll_kqueue.h>
 #include <torrent/poll_select.h>
@@ -85,7 +85,7 @@ create_poll() {
     log->push_front("Using 'select' based polling.");
 
   else
-    throw std::runtime_error("Could not create any Poll object.");
+    throw torrent::internal_error("Could not create any Poll object.");
 
   return poll;
 }

src/core/poll_manager.h

@@ -37,12 +37,12 @@
 #ifndef RTORRENT_CORE_POLL_MANAGER_H
 #define RTORRENT_CORE_POLL_MANAGER_H
 
-#include <rak/timer.h>
-#include <sigc++/signal.h>
-#include <torrent/poll.h>
-
 #include "curl_stack.h"
 
+namespace torrent {
+class Poll;
+}
+
 namespace core {
 
 torrent::Poll* create_poll();