enable FLUID_ASSERT macro

This commit is contained in:
derselbst 2018-04-26 16:38:12 +02:00
parent 7ebdabae0c
commit ba9da3b790
2 changed files with 9 additions and 6 deletions

View file

@ -116,7 +116,7 @@ delete_fluid_str_setting(fluid_setting_node_t* node)
{ {
fluid_return_if_fail(node != NULL); fluid_return_if_fail(node != NULL);
FLUID_ASSERT(node->type, FLUID_STR_TYPE); FLUID_ASSERT(node->type == FLUID_STR_TYPE);
FLUID_FREE(node->str.value); FLUID_FREE(node->str.value);
FLUID_FREE(node->str.def); FLUID_FREE(node->str.def);
@ -169,7 +169,7 @@ delete_fluid_num_setting(fluid_setting_node_t* node)
{ {
fluid_return_if_fail(node != NULL); fluid_return_if_fail(node != NULL);
FLUID_ASSERT (node->type, FLUID_NUM_TYPE); FLUID_ASSERT (node->type == FLUID_NUM_TYPE);
FLUID_FREE(node); FLUID_FREE(node);
} }
@ -205,7 +205,7 @@ delete_fluid_int_setting(fluid_setting_node_t* node)
{ {
fluid_return_if_fail(node != NULL); fluid_return_if_fail(node != NULL);
FLUID_ASSERT (node->type, FLUID_INT_TYPE); FLUID_ASSERT (node->type == FLUID_INT_TYPE);
FLUID_FREE(node); FLUID_FREE(node);
} }
@ -243,7 +243,7 @@ delete_fluid_set_setting(fluid_setting_node_t* node)
{ {
fluid_return_if_fail(node != NULL); fluid_return_if_fail(node != NULL);
FLUID_ASSERT (node->type, FLUID_SET_TYPE); FLUID_ASSERT (node->type == FLUID_SET_TYPE);
delete_fluid_hashtable(node->set.hashtable); delete_fluid_hashtable(node->set.hashtable);
FLUID_FREE(node); FLUID_FREE(node);
} }

View file

@ -335,8 +335,11 @@ do { strncpy(_dst,_src,_n); \
#define M_LN10 2.3025850929940456840179914546844 #define M_LN10 2.3025850929940456840179914546844
#endif #endif
#define FLUID_ASSERT(a,b) #ifdef NDEBUG
#define FLUID_ASSERT_P(a,b) #define FLUID_ASSERT(a)
#else
#define FLUID_ASSERT(a) g_assert(a)
#endif
#define FLUID_LIKELY G_LIKELY #define FLUID_LIKELY G_LIKELY
#define FLUID_UNLIKELY G_UNLIKELY #define FLUID_UNLIKELY G_UNLIKELY