2 files changed, 73 insertions, 4 deletions

diff --git a/glib/src/nodetree.ccg b/glib/src/nodetree.ccg
index 6ee2218c..dbfc52e5 100644
--- a/glib/src/nodetree.ccg
+++ b/glib/src/nodetree.ccg
@@ -1 +1,39 @@
+/* Copyright (C) 2007 glibmm development team
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
 #include <glibmm/nodetree.h>
+
+namespace Glib
+{
+extern "C"
+{
+// A function with external linkage and C linkage does not get a mangled name.
+// Even though glibmm_NodeTree_c_callback_traverse() and glibmm_NodeTree_c_callback_foreach()
+// are declared in a named namespace, the linker does not see the namespace name.
+// Therefore the function names shall have a prefix, hopefully unique.
+gboolean glibmm_NodeTree_c_callback_traverse(GNode* node, gpointer data)
+{
+  auto traverse_data = reinterpret_cast<NodeTreeCallbackTraverseData*>(data);
+  return (*traverse_data->func)(node, traverse_data->data);
+}
+
+void glibmm_NodeTree_c_callback_foreach(GNode* node, gpointer data)
+{
+  auto foreach_data = reinterpret_cast<NodeTreeCallbackForeachData*>(data);
+  (*foreach_data->func)(node, foreach_data->data);
+}
+} // extern "C"
+} // namespace Glib
diff --git a/glib/src/nodetree.hg b/glib/src/nodetree.hg
index 300b7f31..62353574 100644
--- a/glib/src/nodetree.hg
+++ b/glib/src/nodetree.hg
@@ -29,6 +29,33 @@ _DEFS(glibmm,glib)
 
 namespace Glib
 {
+#ifndef DOXYGEN_SHOULD_SKIP_THIS
+extern "C"
+{
+/// Wrapper for invoking a TraverseFunc.
+gboolean glibmm_NodeTree_c_callback_traverse(GNode* node, gpointer data);
+
+/// Wrapper for invoking a ForeachFunc.
+void glibmm_NodeTree_c_callback_foreach(GNode* node, gpointer data);
+
+} // extern "C"
+
+// Like GNodeTraverseFunc and GNodeForeachFunc, but with C++ linkage.
+using NodeTreeCallbackTraverseFuncType = gboolean (*)(GNode *node, gpointer user_data);
+using NodeTreeCallbackForeachFuncType = void (*)(GNode *node, gpointer user_data);
+
+struct NodeTreeCallbackTraverseData
+{
+  NodeTreeCallbackTraverseFuncType func;
+  gpointer data;
+};
+
+struct NodeTreeCallbackForeachData
+{
+  NodeTreeCallbackForeachFuncType func;
+  gpointer data;
+};
+#endif /* DOXYGEN_SHOULD_SKIP_THIS */
 
 /** N-ary Trees - trees of data with any number of branches
  * The NodeTree class and its associated functions provide an N-ary tree data structure, in which nodes in the tree can contain arbitrary data.
@@ -300,7 +327,8 @@ public:
   void traverse(const TraverseFunc& func, TraverseType order = TraverseType::IN_ORDER, TraverseFlags flags = TraverseFlags::ALL, int max_depth = -1)
   {
     TraverseFunc func_copy = func;
-    g_node_traverse(gobj(), (GTraverseType)order, (GTraverseFlags)flags, max_depth, c_callback_traverse, reinterpret_cast<gpointer>(&func_copy));
+    NodeTreeCallbackTraverseData traverse_data = { &c_callback_traverse, &func_copy };
+    g_node_traverse(gobj(), (GTraverseType)order, (GTraverseFlags)flags, max_depth, glibmm_NodeTree_c_callback_traverse, &traverse_data);
   }
   _IGNORE(g_node_traverse);
 
@@ -313,7 +341,8 @@ public:
   void foreach(const ForeachFunc& func, TraverseFlags flags = TraverseFlags::ALL)
   {
     ForeachFunc func_copy = func;
-    g_node_children_foreach(gobj(), (GTraverseFlags)flags, c_callback_foreach, reinterpret_cast<gpointer>(&func_copy));
+    NodeTreeCallbackForeachData foreach_data = { &c_callback_foreach, &func_copy };
+    g_node_children_foreach(gobj(), (GTraverseFlags)flags, glibmm_NodeTree_c_callback_foreach, &foreach_data);
   }
   _IGNORE(g_node_children_foreach)
 
@@ -331,7 +360,8 @@ public:
     using type_foreach_gnode_slot = sigc::slot<void(GNode*)>;
     type_foreach_gnode_slot bound_slot = sigc::bind(real_slot, the_data, &child);
 
-    g_node_children_foreach(gobj(), (GTraverseFlags)flags, c_callback_foreach_compare_child, reinterpret_cast<gpointer>(&bound_slot));
+    NodeTreeCallbackForeachData foreach_data = { &c_callback_foreach_compare_child, &bound_slot };
+    g_node_children_foreach(gobj(), (GTraverseFlags)flags, glibmm_NodeTree_c_callback_foreach, &foreach_data);
 
     return wrap(child);
   }
@@ -365,7 +395,8 @@ public:
     using type_traverse_gnode_slot = sigc::slot<gboolean(GNode*)>;
     type_traverse_gnode_slot bound_slot = sigc::bind(real_slot, the_data, &child);
 
-    g_node_traverse(const_cast<GNode*>(gobj()), (GTraverseType)order, (GTraverseFlags)flags, -1, c_callback_traverse_compare_node, reinterpret_cast<gpointer>(&bound_slot));
+    NodeTreeCallbackTraverseData traverse_data = { &c_callback_traverse_compare_node, &bound_slot };
+    g_node_traverse(const_cast<GNode*>(gobj()), (GTraverseType)order, (GTraverseFlags)flags, -1, glibmm_NodeTree_c_callback_traverse, &traverse_data);
 
     return wrap(child);
   }