diff options
Diffstat (limited to 'glib/glibmm/main.cc')
| -rw-r--r-- | glib/glibmm/main.cc | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/glib/glibmm/main.cc b/glib/glibmm/main.cc index 30a294c4..ff609a43 100644 --- a/glib/glibmm/main.cc +++ b/glib/glibmm/main.cc @@ -27,6 +27,7 @@ #include <glibmm/exceptionhandler.h> #include <glibmm/wrap.h> #include <glibmm/iochannel.h> +#include <glibmm/utility.h> #include <algorithm> #include <map> // Needed until the next ABI break. @@ -540,8 +541,8 @@ SignalChildWatch::connect(const sigc::slot<void, GPid, int>& slot, GPid pid, int if (priority != G_PRIORITY_DEFAULT) g_source_set_priority(source, priority); - g_source_set_callback(source, (GSourceFunc)&glibmm_child_watch_callback, conn_node, - &SourceConnectionNode::destroy_notify_callback); + g_source_set_callback(source, Glib::bitwise_equivalent_cast<GSourceFunc>(&glibmm_child_watch_callback), + conn_node, &SourceConnectionNode::destroy_notify_callback); conn_node->install(source); g_source_attach(source, context_); @@ -1309,7 +1310,7 @@ IOSource::IOSource(PollFD::fd_t fd, IOCondition condition) : poll_fd_(fd, condit IOSource::IOSource(const Glib::RefPtr<IOChannel>& channel, IOCondition condition) : Source(g_io_create_watch(channel->gobj(), (GIOCondition)condition), - (GSourceFunc)&glibmm_iosource_callback) + Glib::bitwise_equivalent_cast<GSourceFunc>(&glibmm_iosource_callback)) { } |