From 654c34a1a6a4aeb975a86bf42878fc0201d8b54a Mon Sep 17 00:00:00 2001 From: "Celine Mercier celine.mercier@ujf-grenoble.fr" Date: Tue, 26 Apr 2016 15:40:12 +0200 Subject: [PATCH] changed inline functions to macros to make it work on Luke --- src/obiblob_indexer.c | 14 +++++++------- src/obiblob_indexer.h | 35 +++++++---------------------------- 2 files changed, 14 insertions(+), 35 deletions(-) diff --git a/src/obiblob_indexer.c b/src/obiblob_indexer.c index 807993c..73b791f 100644 --- a/src/obiblob_indexer.c +++ b/src/obiblob_indexer.c @@ -22,19 +22,19 @@ #define DEBUG_LEVEL 0 // TODO has to be defined somewhere else (cython compil flag?) -inline int obi_indexer_exists(OBIDMS_p dms, const char* name); +//inline int obi_indexer_exists(OBIDMS_p dms, const char* name); -inline Obi_indexer_p obi_indexer(OBIDMS_p dms, const char* name); +//inline Obi_indexer_p obi_indexer(OBIDMS_p dms, const char* name); -inline Obi_indexer_p obi_create_indexer(OBIDMS_p dms, const char* name); +//inline Obi_indexer_p obi_create_indexer(OBIDMS_p dms, const char* name); -inline Obi_indexer_p obi_open_indexer(OBIDMS_p dms, const char* name); +//inline Obi_indexer_p obi_open_indexer(OBIDMS_p dms, const char* name); -inline int obi_close_indexer(Obi_indexer_p indexer); +//inline int obi_close_indexer(Obi_indexer_p indexer); -inline index_t obi_indexer_add(Obi_indexer_p indexer, Obi_blob_p value); +//inline index_t obi_indexer_add(Obi_indexer_p indexer, Obi_blob_p value); -inline Obi_blob_p obi_indexer_get(Obi_indexer_p indexer, index_t idx); +//inline Obi_blob_p obi_indexer_get(Obi_indexer_p indexer, index_t idx); char* obi_build_indexer_name(const char* column_name, obiversion_t column_version) diff --git a/src/obiblob_indexer.h b/src/obiblob_indexer.h index f9ae233..8f4d7e5 100644 --- a/src/obiblob_indexer.h +++ b/src/obiblob_indexer.h @@ -47,10 +47,7 @@ typedef OBIDMS_avl_group_p Obi_indexer_p; /**< Typedef to refer to the pointer * @since April 2016 * @author Celine Mercier (celine.mercier@metabarcoding.org) */ -inline int obi_indexer_exists(OBIDMS_p dms, const char* name) -{ - return obi_avl_exists(dms, name); -} +#define obi_indexer_exists obi_avl_exists /** @@ -65,10 +62,7 @@ inline int obi_indexer_exists(OBIDMS_p dms, const char* name) * @since April 2016 * @author Celine Mercier (celine.mercier@metabarcoding.org) */ -inline Obi_indexer_p obi_indexer(OBIDMS_p dms, const char* name) -{ - return obi_avl_group(dms, name); -} +#define obi_indexer obi_avl_group /** @@ -83,10 +77,7 @@ inline Obi_indexer_p obi_indexer(OBIDMS_p dms, const char* name) * @since April 2016 * @author Celine Mercier (celine.mercier@metabarcoding.org) */ -inline Obi_indexer_p obi_create_indexer(OBIDMS_p dms, const char* name) -{ - return obi_create_avl_group(dms, name); -} +#define obi_create_indexer obi_create_avl_group /** @@ -101,10 +92,7 @@ inline Obi_indexer_p obi_create_indexer(OBIDMS_p dms, const char* name) * @since April 2016 * @author Celine Mercier (celine.mercier@metabarcoding.org) */ -inline Obi_indexer_p obi_open_indexer(OBIDMS_p dms, const char* name) -{ - return obi_open_avl_group(dms, name); -} +#define obi_open_indexer obi_open_avl_group /** @@ -118,10 +106,7 @@ inline Obi_indexer_p obi_open_indexer(OBIDMS_p dms, const char* name) * @since April 2016 * @author Celine Mercier (celine.mercier@metabarcoding.org) */ -inline int obi_close_indexer(Obi_indexer_p indexer) -{ - return obi_close_avl_group(indexer); -} +#define obi_close_indexer obi_close_avl_group /** @@ -136,10 +121,7 @@ inline int obi_close_indexer(Obi_indexer_p indexer) * @since April 2016 * @author Celine Mercier (celine.mercier@metabarcoding.org) */ -inline index_t obi_indexer_add(Obi_indexer_p indexer, Obi_blob_p value) -{ - return obi_avl_group_add(indexer, value); -} +#define obi_indexer_add obi_avl_group_add /** @@ -153,10 +135,7 @@ inline index_t obi_indexer_add(Obi_indexer_p indexer, Obi_blob_p value) * @since April 2016 * @author Celine Mercier (celine.mercier@metabarcoding.org) */ -inline Obi_blob_p obi_indexer_get(Obi_indexer_p indexer, index_t idx) -{ - return obi_avl_group_get(indexer, idx); -} +#define obi_indexer_get obi_avl_group_get /**