fujin/rtorrent
1
0
Fork 0
mirror of https://github.com/rakshasa/rtorrent.git synced 2026-08-13 05:32:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into c++11

Browse Source 
Conflicts:
	src/core/manager.cc
	src/thread_base.cc
This commit is contained in:
Jari Sundell
2011-12-13 19:49:10 +09:00
parent 41d49b7c18 ee859a6137
commit 1fc70a733d
20 changed files with 60 additions and 665 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/core/manager.cc
+2 -4
View File
@@ -71,9 +71,7 @@
#include "download_store.h"
#include "http_queue.h"
#include "manager.h"
#include "poll_manager_epoll.h"
#include "poll_manager_kqueue.h"
#include "poll_manager_select.h"
#include "poll_manager.h"
#include "view.h"
namespace core {
@@ -204,7 +202,7 @@ Manager::get_address_throttle(const sockaddr* addr) {
// Most of this should be possible to move out.
void
Manager::initialize_second() {
torrent::Http::set_factory(tr1::bind(&CurlStack::new_object, m_httpStack));
torrent::Http::slot_factory() = std::tr1::bind(&CurlStack::new_object, m_httpStack);
m_httpQueue->slot_factory(sigc::mem_fun(m_httpStack, &CurlStack::new_object));
CurlStack::global_init();