diff options
Diffstat (limited to 'glib/glibmm/main.cc')
| -rw-r--r-- | glib/glibmm/main.cc | 23 |
1 files changed, 20 insertions, 3 deletions
diff --git a/glib/glibmm/main.cc b/glib/glibmm/main.cc index 30a294c4..45ba817e 100644 --- a/glib/glibmm/main.cc +++ b/glib/glibmm/main.cc @@ -278,6 +278,19 @@ glibmm_iosource_callback(GIOChannel*, GIOCondition condition, void* data) return 0; } +GSourceFunc glibmm_iosource_cb_as_gsourcefunc() +{ + // Conversion between different types of function pointers with + // reinterpret_cast can make gcc8 print a warning. + // https://github.com/libsigcplusplus/libsigcplusplus/issues/1 + union { + GSourceFunc ps; + decltype(&glibmm_iosource_callback) pios; + } u; + u.pios = &glibmm_iosource_callback; + return u.ps; +} + /* Only used by SignalChildWatch::connect(). * These don't use Glib::Source, to avoid the unnecessary overhead * of a completely unused wrapper object. @@ -540,8 +553,12 @@ 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); + union { + GSourceFunc ps; + decltype(&glibmm_child_watch_callback) pcw; + } u; + u.pcw = &glibmm_child_watch_callback; + g_source_set_callback(source, u.ps, conn_node, &SourceConnectionNode::destroy_notify_callback); conn_node->install(source); g_source_attach(source, context_); @@ -1309,7 +1326,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) + glibmm_iosource_cb_as_gsourcefunc()) { } |