3rd-party/libfort
1
0
Fork 0
Code Releases Activity

[F] Fixed compilation errors

Browse Source
This commit is contained in:
seleznevae 2018-11-03 09:14:02 +03:00
parent 1827fe982a
commit 78db8dd788
4 changed files with 8 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
lib/fort.c
View File

@ -237,10 +237,9 @@ fort_status_t vector_swap(vector_t *cur_vec, vector_t *mv_vec, size_t pos);
#define FOR_EACH(type, item, vector) \ #define FOR_EACH(type, item, vector) \
FOR_EACH_(type, item, vector, UNIQUE_NAME(i)) FOR_EACH_(type, item, vector, UNIQUE_NAME(i))
FT_INTERNAL
vector_t *copy_vector(vector_t *);
#ifdef FT_TEST_BUILD #ifdef FT_TEST_BUILD
vector_t *copy_vector(vector_t *);
size_t vector_index_of(const vector_t *, const void *item); size_t vector_index_of(const vector_t *, const void *item);
int vector_erase(vector_t *, size_t index); int vector_erase(vector_t *, size_t index);
void vector_clear(vector_t *); void vector_clear(vector_t *);
@ -1408,8 +1407,6 @@ fort_cell_opt_container_t *copy_cell_options(fort_cell_opt_container_t *cont)
FT_INTERNAL FT_INTERNAL
fort_table_options_t *copy_table_options(const fort_table_options_t *option) fort_table_options_t *copy_table_options(const fort_table_options_t *option)
{ {
// todo: normal implementation, do deep copy of col options
fort_table_options_t *new_opt = create_table_options(); fort_table_options_t *new_opt = create_table_options();
if (new_opt == NULL) if (new_opt == NULL)
return NULL; return NULL;
@ -2923,6 +2920,9 @@ fort_status_t vector_swap(vector_t *cur_vec, vector_t *mv_vec, size_t pos)
return FT_SUCCESS; return FT_SUCCESS;
} }
#ifdef FT_TEST_BUILD
vector_t *copy_vector(vector_t *v) vector_t *copy_vector(vector_t *v)
{ {
if (v == NULL) if (v == NULL)
@ -2938,8 +2938,6 @@ vector_t *copy_vector(vector_t *v)
return new_vector; return new_vector;
} }
#ifdef FT_TEST_BUILD
size_t vector_index_of(const vector_t *vector, const void *item) size_t vector_index_of(const vector_t *vector, const void *item)
{ {
assert(vector); assert(vector);

2
src/options.c
View File

@ -659,8 +659,6 @@ fort_cell_opt_container_t *copy_cell_options(fort_cell_opt_container_t *cont)
FT_INTERNAL FT_INTERNAL
fort_table_options_t *copy_table_options(const fort_table_options_t *option) fort_table_options_t *copy_table_options(const fort_table_options_t *option)
{ {
// todo: normal implementation, do deep copy of col options
fort_table_options_t *new_opt = create_table_options(); fort_table_options_t *new_opt = create_table_options();
if (new_opt == NULL) if (new_opt == NULL)
return NULL; return NULL;

5
src/vector.c
View File

@ -178,6 +178,9 @@ fort_status_t vector_swap(vector_t *cur_vec, vector_t *mv_vec, size_t pos)
return FT_SUCCESS; return FT_SUCCESS;
} }
#ifdef FT_TEST_BUILD
vector_t *copy_vector(vector_t *v) vector_t *copy_vector(vector_t *v)
{ {
if (v == NULL) if (v == NULL)
@ -193,8 +196,6 @@ vector_t *copy_vector(vector_t *v)
return new_vector; return new_vector;
} }
#ifdef FT_TEST_BUILD
size_t vector_index_of(const vector_t *vector, const void *item) size_t vector_index_of(const vector_t *vector, const void *item)
{ {
assert(vector); assert(vector);

3
src/vector.h
View File

@ -38,10 +38,9 @@ fort_status_t vector_swap(vector_t *cur_vec, vector_t *mv_vec, size_t pos);
#define FOR_EACH(type, item, vector) \ #define FOR_EACH(type, item, vector) \
FOR_EACH_(type, item, vector, UNIQUE_NAME(i)) FOR_EACH_(type, item, vector, UNIQUE_NAME(i))
FT_INTERNAL
vector_t *copy_vector(vector_t *);
#ifdef FT_TEST_BUILD #ifdef FT_TEST_BUILD
vector_t *copy_vector(vector_t *);
size_t vector_index_of(const vector_t *, const void *item); size_t vector_index_of(const vector_t *, const void *item);
int vector_erase(vector_t *, size_t index); int vector_erase(vector_t *, size_t index);
void vector_clear(vector_t *); void vector_clear(vector_t *);