obitools/obitools3
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 66 Wiki Activity

changed inline functions to macros to make it work on Luke

Browse Source
This commit is contained in:
Celine Mercier celine.mercier@ujf-grenoble.fr
2016-04-26 15:40:12 +02:00
parent a6c8d35491
commit 654c34a1a6
2 changed files with 14 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/obiblob_indexer.c
View File

@ -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)

35
src/obiblob_indexer.h
View File

@ -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
/**