fujin/rtorrent
1
0
Fork 0
mirror of https://github.com/rakshasa/rtorrent.git synced 2026-08-17 23:52:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

Converted sigc++ slots to std::tr1::function.

Browse Source
This commit is contained in:
rakshasa
2013-08-24 00:14:25 +09:00
parent 629ebcbd54
commit 529eda5aab
39 changed files with 267 additions and 290 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/signal_handler.cc
+6 -6
View File
@@ -46,7 +46,7 @@
//extern "C" void (*signal (int sig, void (*disp)(int)))(int);
#endif
SignalHandler::Slot SignalHandler::m_handlers[HIGHEST_SIGNAL];
SignalHandler::slot_void SignalHandler::m_handlers[HIGHEST_SIGNAL];
void
SignalHandler::set_default(unsigned int signum) {
@@ -54,7 +54,7 @@ SignalHandler::set_default(unsigned int signum) {
throw std::logic_error("SignalHandler::set_default(...) received invalid signal value.");
signal(signum, SIG_DFL);
m_handlers[signum].disconnect();
m_handlers[signum] = slot_void();
}
void
@@ -63,15 +63,15 @@ SignalHandler::set_ignore(unsigned int signum) {
throw std::logic_error("SignalHandler::set_ignore(...) received invalid signal value.");
signal(signum, SIG_IGN);
m_handlers[signum].disconnect();
m_handlers[signum] = slot_void();
}
void
SignalHandler::set_handler(unsigned int signum, Slot slot) {
SignalHandler::set_handler(unsigned int signum, slot_void slot) {
if (signum > HIGHEST_SIGNAL)
throw std::logic_error("SignalHandler::set_handler(...) received invalid signal value.");
if (slot.empty())
if (!slot)
throw std::logic_error("SignalHandler::set_handler(...) received an empty slot.");
signal(signum, &SignalHandler::caught);
@@ -98,7 +98,7 @@ SignalHandler::caught(int signum) {
if ((unsigned)signum > HIGHEST_SIGNAL)
throw std::logic_error("SignalHandler::caught(...) received invalid signal from the kernel, bork bork bork.");
if (m_handlers[signum].empty())
if (!m_handlers[signum])
throw std::logic_error("SignalHandler::caught(...) received a signal we don't have a handler for.");
m_handlers[signum]();