Merge branch 'master' into xirvik

This commit is contained in:
rakshasa
2012-03-19 19:05:01 +09:00
-3
View File
@@ -137,9 +137,6 @@ Manager::handshake_log(const sockaddr* sa, int msg, int err, const torrent::Hash
void
Manager::push_log(const char* msg) {
if (!pthread_equal(pthread_self(), torrent::main_thread()->pthread()))
throw torrent::internal_error("Manager::push_log(...): Cannot call this function from other threads than 'main'.");
m_log_important->lock_and_push_log(msg, strlen(msg), 0);
m_log_complete->lock_and_push_log(msg, strlen(msg), 0);
}