Attachment #379652 for bug #515094

Lines 41-47 Link Here

(-)./include/orbit/orb-core/allocators.h.orig (-1 / +1 lines)
41	Below, some magic values of the fnc ptr are defined.	41	Below, some magic values of the fnc ptr are defined.
42	**/	42	**/
43	typedef gpointer (*ORBit_Mem_free_fn) (gpointer mem,	43	typedef gpointer (*ORBit_Mem_free_fn) (gpointer mem,
44	gpointer func_data);	44	gpointer gfunc_data);
45		45
46	#define ORBIT_MEMHOW_HOW(how) ((how) & 0x3)	46	#define ORBIT_MEMHOW_HOW(how) ((how) & 0x3)
47	#define ORBIT_MEMHOW_ELEMENTS(how) ((how) >> 2)	47	#define ORBIT_MEMHOW_ELEMENTS(how) ((how) >> 2)





static void
IDL_tree_traverse_helper(IDL_tree p, GFunc f,
			 gconstpointer gfunc_data,
			 GHashTable *visited_nodes,
			 gboolean    include_self)
{

	for (curitem = IDL_INTERFACE (p).inheritance_spec; curitem;
	     curitem = IDL_LIST (curitem).next) {
		IDL_tree_traverse_helper (IDL_get_parent_node 
			(IDL_LIST (curitem).data, IDLN_INTERFACE, NULL), f, gfunc_data, visited_nodes, TRUE);
	}

	if (include_self)
		f(p, (gpointer)gfunc_data);
}

void
IDL_tree_traverse_parents_full (IDL_tree      p,
				GFunc         f,
				gconstpointer gfunc_data,
				gboolean      include_self)
{
	GHashTable *visited_nodes = g_hash_table_new (NULL, g_direct_equal);

	if (!p)
		return;

	IDL_tree_traverse_helper (p, f, gfunc_data, visited_nodes, include_self);

	g_hash_table_destroy (visited_nodes);
}

void
IDL_tree_traverse_parents (IDL_tree p,
			   GFunc f,
			   gconstpointer gfunc_data)
{
	IDL_tree_traverse_parents_full (p, f, gfunc_data, TRUE);
}

/* For use by below function */

Lines 16-25 Link Here

(-)./src/idl-compiler/orbit-idl2.h.orig (-2 / +2 lines)
16	int indent_level);	16	int indent_level);
17	void IDL_tree_traverse_parents (IDL_tree p,	17	void IDL_tree_traverse_parents (IDL_tree p,
18	GFunc f,	18	GFunc f,
19	gconstpointer func_data);	19	gconstpointer gfunc_data);
20	void IDL_tree_traverse_parents_full (IDL_tree p,	20	void IDL_tree_traverse_parents_full (IDL_tree p,
21	GFunc f,	21	GFunc f,
22	gconstpointer func_data,	22	gconstpointer gfunc_data,
23	gboolean include_self);	23	gboolean include_self);
24	gboolean orbit_cbe_type_contains_complex (IDL_tree ts);	24	gboolean orbit_cbe_type_contains_complex (IDL_tree ts);
25	void orbit_idl_check_oneway_op (IDL_tree op);	25	void orbit_idl_check_oneway_op (IDL_tree op);

Return to bug 515094

Lines 362-368 Link Here

(-)./src/idl-compiler/orbit-idl-utils.c.orig (-7 / +7 lines)
362		362
363	static void	363	static void
364	IDL_tree_traverse_helper(IDL_tree p, GFunc f,	364	IDL_tree_traverse_helper(IDL_tree p, GFunc f,
365	gconstpointer func_data,	365	gconstpointer gfunc_data,
366	GHashTable *visited_nodes,	366	GHashTable *visited_nodes,
367	gboolean include_self)	367	gboolean include_self)
368	{	368	{
Lines 376-392 Link Here
376	for (curitem = IDL_INTERFACE (p).inheritance_spec; curitem;	376	for (curitem = IDL_INTERFACE (p).inheritance_spec; curitem;
377	curitem = IDL_LIST (curitem).next) {	377	curitem = IDL_LIST (curitem).next) {
378	IDL_tree_traverse_helper (IDL_get_parent_node	378	IDL_tree_traverse_helper (IDL_get_parent_node
379	(IDL_LIST (curitem).data, IDLN_INTERFACE, NULL), f, func_data, visited_nodes, TRUE);	379	(IDL_LIST (curitem).data, IDLN_INTERFACE, NULL), f, gfunc_data, visited_nodes, TRUE);
380	}	380	}
381		381
382	if (include_self)	382	if (include_self)
383	f(p, (gpointer)func_data);	383	f(p, (gpointer)gfunc_data);
384	}	384	}
385		385
386	void	386	void
387	IDL_tree_traverse_parents_full (IDL_tree p,	387	IDL_tree_traverse_parents_full (IDL_tree p,
388	GFunc f,	388	GFunc f,
389	gconstpointer func_data,	389	gconstpointer gfunc_data,
390	gboolean include_self)	390	gboolean include_self)
391	{	391	{
392	GHashTable *visited_nodes = g_hash_table_new (NULL, g_direct_equal);	392	GHashTable *visited_nodes = g_hash_table_new (NULL, g_direct_equal);
Lines 400-406 Link Here
400	if (!p)	400	if (!p)
401	return;	401	return;
402		402
403	IDL_tree_traverse_helper (p, f, func_data, visited_nodes, include_self);	403	IDL_tree_traverse_helper (p, f, gfunc_data, visited_nodes, include_self);
404		404
405	g_hash_table_destroy (visited_nodes);	405	g_hash_table_destroy (visited_nodes);
406	}	406	}
Lines 408-416 Link Here
408	void	408	void
409	IDL_tree_traverse_parents (IDL_tree p,	409	IDL_tree_traverse_parents (IDL_tree p,
410	GFunc f,	410	GFunc f,
411	gconstpointer func_data)	411	gconstpointer gfunc_data)
412	{	412	{
413	IDL_tree_traverse_parents_full (p, f, func_data, TRUE);	413	IDL_tree_traverse_parents_full (p, f, gfunc_data, TRUE);
414	}	414	}
415		415
416	/* For use by below function */	416	/* For use by below function */