Attachment #871870 for bug #894376

View | Details | Raw Unified | Return to bug 894376
Collapse All | Expand All

Lines 4086-4092 gee_hash_map_map_iterator_gee_map_iterator_interface_init (GeeMapIteratorIface * Link Here

(-)a/gee/hashmap.c (-1 / +1 lines)
4086	iface->next = (gboolean () (GeeMapIterator)) gee_hash_map_node_iterator_next;	4086	iface->next = (gboolean () (GeeMapIterator)) gee_hash_map_node_iterator_next;
4087	iface->has_next = (gboolean () (GeeMapIterator)) gee_hash_map_node_iterator_has_next;	4087	iface->has_next = (gboolean () (GeeMapIterator)) gee_hash_map_node_iterator_has_next;
4088	iface->get_mutable = gee_hash_map_map_iterator_real_get_mutable;	4088	iface->get_mutable = gee_hash_map_map_iterator_real_get_mutable;
4089	iface->get_read_only = gee_hash_map_map_iterator_real_get_read_only;	4089	iface->get_read_only = (gboolean () (GeeMapIterator)) gee_hash_map_map_iterator_real_get_read_only;
4090	iface->get_valid = (gboolean () (GeeMapIterator )) gee_hash_map_node_iterator_get_valid;	4090	iface->get_valid = (gboolean () (GeeMapIterator )) gee_hash_map_node_iterator_get_valid;
4091	}	4091	}
4092		4092




static const gchar* gee_test_case_adaptor_get_name (GeeTestCaseAdaptor* self);
static void gee_test_case_adaptor_set_up (GeeTestCaseAdaptor* self,
                                   void* fixture);
static void _gee_test_case_adaptor_set_up_gtest_fixture_func (gpointer fixture,
                                                       gconstpointer self);
static void gee_test_case_adaptor_run (GeeTestCaseAdaptor* self,
                                void* fixture);
static void _gee_test_case_adaptor_run_gtest_fixture_func (gpointer fixture,
                                                    gconstpointer self);
static void gee_test_case_adaptor_tear_down (GeeTestCaseAdaptor* self,
                                      void* fixture);
static void _gee_test_case_adaptor_tear_down_gtest_fixture_func (gpointer fixture,
                                                          gconstpointer self);
static void gee_test_case_real_set_up (GeeTestCase* self);
static void gee_test_case_real_tear_down (GeeTestCase* self);
VALA_EXTERN GTestSuite* gee_test_case_get_suite (GeeTestCase* self);

}

static void
_gee_test_case_adaptor_set_up_gtest_fixture_func (gpointer fixture,
                                                  gconstpointer self)
{
	gee_test_case_adaptor_set_up ((GeeTestCaseAdaptor*) self, fixture);
}

static void
_gee_test_case_adaptor_run_gtest_fixture_func (gpointer fixture,
                                               gconstpointer self)
{
	gee_test_case_adaptor_run ((GeeTestCaseAdaptor*) self, fixture);
}

static void
_gee_test_case_adaptor_tear_down_gtest_fixture_func (gpointer fixture,
                                                     gconstpointer self)
{
	gee_test_case_adaptor_tear_down ((GeeTestCaseAdaptor*) self, fixture);
}

Return to bug 894376

Lines 160-175 static void _vala_array_add1 (GeeTestCaseAdaptor** * array, Link Here

(-)a/tests/testcase.c (-12 / +12 lines)
160	static const gchar* gee_test_case_adaptor_get_name (GeeTestCaseAdaptor* self);	160	static const gchar* gee_test_case_adaptor_get_name (GeeTestCaseAdaptor* self);
161	static void gee_test_case_adaptor_set_up (GeeTestCaseAdaptor* self,	161	static void gee_test_case_adaptor_set_up (GeeTestCaseAdaptor* self,
162	void* fixture);	162	void* fixture);
163	static void _gee_test_case_adaptor_set_up_gtest_fixture_func (void* fixture,	163	static void _gee_test_case_adaptor_set_up_gtest_fixture_func (gpointer fixture,
164	gpointer self);	164	gconstpointer self);
165	static void gee_test_case_adaptor_run (GeeTestCaseAdaptor* self,	165	static void gee_test_case_adaptor_run (GeeTestCaseAdaptor* self,
166	void* fixture);	166	void* fixture);
167	static void _gee_test_case_adaptor_run_gtest_fixture_func (void* fixture,	167	static void _gee_test_case_adaptor_run_gtest_fixture_func (gpointer fixture,
168	gpointer self);	168	gconstpointer self);
169	static void gee_test_case_adaptor_tear_down (GeeTestCaseAdaptor* self,	169	static void gee_test_case_adaptor_tear_down (GeeTestCaseAdaptor* self,
170	void* fixture);	170	void* fixture);
171	static void _gee_test_case_adaptor_tear_down_gtest_fixture_func (void* fixture,	171	static void _gee_test_case_adaptor_tear_down_gtest_fixture_func (gpointer fixture,
172	gpointer self);	172	gconstpointer self);
173	static void gee_test_case_real_set_up (GeeTestCase* self);	173	static void gee_test_case_real_set_up (GeeTestCase* self);
174	static void gee_test_case_real_tear_down (GeeTestCase* self);	174	static void gee_test_case_real_tear_down (GeeTestCase* self);
175	VALA_EXTERN GTestSuite* gee_test_case_get_suite (GeeTestCase* self);	175	VALA_EXTERN GTestSuite* gee_test_case_get_suite (GeeTestCase* self);
Lines 226-247 _vala_array_add1 (GeeTestCaseAdaptor** * array, Link Here
226	}	226	}
227		227
228	static void	228	static void
229	_gee_test_case_adaptor_set_up_gtest_fixture_func (void* fixture,	229	_gee_test_case_adaptor_set_up_gtest_fixture_func (gpointer fixture,
230	gpointer self)	230	gconstpointer self)
231	{	231	{
232	gee_test_case_adaptor_set_up ((GeeTestCaseAdaptor*) self, fixture);	232	gee_test_case_adaptor_set_up ((GeeTestCaseAdaptor*) self, fixture);
233	}	233	}
234		234
235	static void	235	static void
236	_gee_test_case_adaptor_run_gtest_fixture_func (void* fixture,	236	_gee_test_case_adaptor_run_gtest_fixture_func (gpointer fixture,
237	gpointer self)	237	gconstpointer self)
238	{	238	{
239	gee_test_case_adaptor_run ((GeeTestCaseAdaptor*) self, fixture);	239	gee_test_case_adaptor_run ((GeeTestCaseAdaptor*) self, fixture);
240	}	240	}
241		241
242	static void	242	static void
243	_gee_test_case_adaptor_tear_down_gtest_fixture_func (void* fixture,	243	_gee_test_case_adaptor_tear_down_gtest_fixture_func (gpointer fixture,
244	gpointer self)	244	gconstpointer self)
245	{	245	{
246	gee_test_case_adaptor_tear_down ((GeeTestCaseAdaptor*) self, fixture);	246	gee_test_case_adaptor_tear_down ((GeeTestCaseAdaptor*) self, fixture);
247	}	247	}

Lines 13955-13961 gee_tree_map_map_iterator_gee_map_iterator_interface_init (GeeMapIteratorIface * Link Here

(-)a/gee/treemap.c (-2 / +2 lines)
13955	iface->next = (gboolean () (GeeMapIterator)) gee_tree_map_node_iterator_next;	13955	iface->next = (gboolean () (GeeMapIterator)) gee_tree_map_node_iterator_next;
13956	iface->has_next = (gboolean () (GeeMapIterator)) gee_tree_map_node_iterator_has_next;	13956	iface->has_next = (gboolean () (GeeMapIterator)) gee_tree_map_node_iterator_has_next;
13957	iface->unset = (void () (GeeMapIterator)) gee_tree_map_node_iterator_unset;	13957	iface->unset = (void () (GeeMapIterator)) gee_tree_map_node_iterator_unset;
13958	iface->get_read_only = gee_tree_map_map_iterator_real_get_read_only;	13958	iface->get_read_only = (gboolean () (GeeMapIterator)) gee_tree_map_map_iterator_real_get_read_only;
13959	iface->get_mutable = gee_tree_map_map_iterator_real_get_mutable;	13959	iface->get_mutable = gee_tree_map_map_iterator_real_get_mutable;
13960	iface->get_valid = (gboolean () (GeeMapIterator )) gee_tree_map_node_iterator_get_valid;	13960	iface->get_valid = (gboolean () (GeeMapIterator )) gee_tree_map_node_iterator_get_valid;
13961	}	13961	}
Lines 14320-14326 gee_tree_map_sub_map_iterator_gee_map_iterator_interface_init (GeeMapIteratorIfa Link Here
14320	iface->next = (gboolean () (GeeMapIterator)) gee_tree_map_sub_node_iterator_next;	14320	iface->next = (gboolean () (GeeMapIterator)) gee_tree_map_sub_node_iterator_next;
14321	iface->has_next = (gboolean () (GeeMapIterator)) gee_tree_map_sub_node_iterator_has_next;	14321	iface->has_next = (gboolean () (GeeMapIterator)) gee_tree_map_sub_node_iterator_has_next;
14322	iface->unset = (void () (GeeMapIterator)) gee_tree_map_sub_node_iterator_unset;	14322	iface->unset = (void () (GeeMapIterator)) gee_tree_map_sub_node_iterator_unset;
14323	iface->get_read_only = gee_tree_map_sub_map_iterator_real_get_read_only;	14323	iface->get_read_only = (gboolean () (GeeMapIterator)) gee_tree_map_sub_map_iterator_real_get_read_only;
14324	iface->get_mutable = gee_tree_map_sub_map_iterator_real_get_mutable;	14324	iface->get_mutable = gee_tree_map_sub_map_iterator_real_get_mutable;
14325	iface->get_valid = (gboolean () (GeeMapIterator )) gee_tree_map_sub_node_iterator_get_valid;	14325	iface->get_valid = (gboolean () (GeeMapIterator )) gee_tree_map_sub_node_iterator_get_valid;
14326	}	14326	}