From 59db6a2dcf7344ad2a21927535c2cd9a865267cd Mon Sep 17 00:00:00 2001 From: Murray Cumming Date: Fri, 22 Apr 2016 09:51:22 +0200 Subject: connection_add_exception_handler(): Use list instead of signal. Because libsigc++ 2.10 deprecates signal::slots() and libsigc++ 3.0 now has no signal<>::slots() method. Using a signal for the list of slots seems rather non-obvious anyway. --- glib/glibmm/exceptionhandler.cc | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/glib/glibmm/exceptionhandler.cc b/glib/glibmm/exceptionhandler.cc index 31ddb39b..95032a3c 100644 --- a/glib/glibmm/exceptionhandler.cc +++ b/glib/glibmm/exceptionhandler.cc @@ -32,7 +32,7 @@ namespace { -using HandlerList = sigc::signal; +using HandlerList = std::list>; // Each thread has its own list of exception handlers // to avoid thread synchronization problems. @@ -108,8 +108,9 @@ add_exception_handler(const sigc::slot& slot) #endif } - handler_list->slots().push_front(slot); - return handler_list->slots().begin(); + handler_list->emplace_back(slot); + auto& added_slot = handler_list->back(); + return sigc::connection(added_slot); } // internal @@ -135,15 +136,15 @@ exception_handlers_invoke() noexcept if(HandlerList *const handler_list = thread_specific_handler_list.get()) #endif { - HandlerList::iterator pslot = handler_list->slots().begin(); + HandlerList::iterator pslot = handler_list->begin(); - while (pslot != handler_list->slots().end()) + while (pslot != handler_list->end()) { // Calling an empty slot would mean ignoring the exception, // thus we have to check for dead slots explicitly. if (pslot->empty()) { - pslot = handler_list->slots().erase(pslot); + pslot = handler_list->erase(pslot); continue; } -- cgit v1.2.1