From adffaf0e873552c5a0156d31cc99b828ad9b9c4f Mon Sep 17 00:00:00 2001 From: Patrick Pelissier Date: Fri, 15 May 2020 21:45:02 +0200 Subject: [PATCH] Fix illegal usage of oplist for function object --- tests/test-malgo.c | 8 ++++---- tests/test-mfuncobj.c | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/tests/test-malgo.c b/tests/test-malgo.c index fc8a6b31..7acf7761 100644 --- a/tests/test-malgo.c +++ b/tests/test-malgo.c @@ -572,25 +572,25 @@ FUNC_OBJ_INS_DEF(fo_test, algo_array_fo_test_obj, (a), { return a == self->x; }, (x, int)) -#define M_OPL_fo_test_t() FUNC_OBJ_INS_OPLIST(fo_test, int) +#define M_OPL_fo_test_t() FUNC_OBJ_INS_OPLIST(fo_test, M_DEFAULT_OPLIST) FUNC_OBJ_INS_DEF(fo_eq, algo_array_fo_eq_obj, (a, b), { return a == b && self->x != a; }, (x, int)) -#define M_OPL_fo_eq_t() FUNC_OBJ_INS_OPLIST(fo_eq, int) +#define M_OPL_fo_eq_t() FUNC_OBJ_INS_OPLIST(fo_eq, M_DEFAULT_OPLIST) FUNC_OBJ_INS_DEF(fo_cmp, algo_array_fo_cmp_obj, (a, b), { return a < b ? -self->x : a > b ? self->x : 0; }, (x, int)) -#define M_OPL_fo_cmp_t() FUNC_OBJ_INS_OPLIST(fo_cmp, int) +#define M_OPL_fo_cmp_t() FUNC_OBJ_INS_OPLIST(fo_cmp, M_DEFAULT_OPLIST) FUNC_OBJ_INS_DEF(fol_cmp, algo_list_fo_cmp_obj, (a, b), { return a < b ? -self->x : a > b ? self->x : 0; }, (x, int)) -#define M_OPL_fol_cmp_t() FUNC_OBJ_INS_OPLIST(fol_cmp, int) +#define M_OPL_fol_cmp_t() FUNC_OBJ_INS_OPLIST(fol_cmp, M_DEFAULT_OPLIST) static void test_fo(void) { diff --git a/tests/test-mfuncobj.c b/tests/test-mfuncobj.c index ad3c047e..a2e411ea 100644 --- a/tests/test-mfuncobj.c +++ b/tests/test-mfuncobj.c @@ -63,7 +63,7 @@ FUNC_OBJ_INS_DEF(instance22, return self->a; }, (a, int) ) -#define M_OPL_instance22_t() FUNC_OBJ_INS_OPLIST(instance22, int) +#define M_OPL_instance22_t() FUNC_OBJ_INS_OPLIST(instance22, M_DEFAULT_OPLIST) static void test_instance11(void)