zeldon/htop
1
0
Fork 0
mirror of https://github.com/xzeldon/htop.git synced 2025-07-12 12:14:36 +03:00
Code Issues Packages Projects Releases Wiki Activity

Resolve DEBUG compilation issues

Browse Source 
Use NDEBUG conditional instead of DEBUG.

Do not call static functions in extern inline ones.
    Vector.c:67:11: error: static function 'Vector_isConsistent' is used in an inline function with external linkage [-Werror,-Wstatic-in-inline]
This commit is contained in:
Christian Göttsche
2020-09-17 22:27:33 +02:00
committed by cgzones
parent b7f63292e5
commit d69585b82a
8 changed files with 32 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
Vector.c
View File

@ -38,9 +38,9 @@ void Vector_delete(Vector* this) {
free(this);
}
#ifdef DEBUG
#ifndef NDEBUG
static inline bool Vector_isConsistent(Vector* this) {
static bool Vector_isConsistent(Vector* this) {
assert(this->items <= this->arraySize);
if (this->owner) {
for (int i = 0; i < this->items; i++)
@ -62,7 +62,18 @@ int Vector_count(Vector* this) {
return items;
}
#endif
Object* Vector_get(Vector* this, int idx) {
assert(idx < this->items);
assert(Vector_isConsistent(this));
return this->array[idx];
}
int Vector_size(Vector* this) {
assert(Vector_isConsistent(this));
return this->items;
}
#endif /* NDEBUG */
void Vector_prune(Vector* this) {
assert(Vector_isConsistent(this));
@ -251,33 +262,6 @@ void Vector_set(Vector* this, int idx, void* data_) {
assert(Vector_isConsistent(this));
}
#ifdef DEBUG
inline Object* Vector_get(Vector* this, int idx) {
assert(idx < this->items);
assert(Vector_isConsistent(this));
return this->array[idx];
}
#else
// In this case, Vector_get is defined as a macro in vector.h
#endif
#ifdef DEBUG
inline int Vector_size(Vector* this) {
assert(Vector_isConsistent(this));
return this->items;
}
#else
// In this case, Vector_size is defined as a macro in vector.h
#endif
/*
static void Vector_merge(Vector* this, Vector* v2) {
@ -303,7 +287,7 @@ void Vector_add(Vector* this, void* data_) {
assert(Vector_isConsistent(this));
}
inline int Vector_indexOf(Vector* this, void* search_, Object_Compare compare) {
int Vector_indexOf(Vector* this, void* search_, Object_Compare compare) {
Object* search = search_;
assert(Object_isA((Object*)search, this->type));
assert(compare);