From 99e6763c2f296f635b59142e6b6db884fea3f6be Mon Sep 17 00:00:00 2001 From: fc_botelho Date: Thu, 27 Jul 2006 00:44:14 +0000 Subject: [PATCH] More fixes for C++ compilation proposed by Steffan Webb. --- src/bmz8.c | 2 +- src/brz.c | 2 +- src/main.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/bmz8.c b/src/bmz8.c index 2fb7d88..db4b275 100644 --- a/src/bmz8.c +++ b/src/bmz8.c @@ -324,7 +324,7 @@ static cmph_uint8 bmz8_traverse_critical_nodes_heuristic(bmz8_config_data_t *bmz { if(nunused_g_values == unused_g_values_capacity) { - unused_g_values = realloc(unused_g_values, (unused_g_values_capacity + BUFSIZ)*sizeof(cmph_uint8)); + unused_g_values = (cmph_uint8*)realloc(unused_g_values, (unused_g_values_capacity + BUFSIZ)*sizeof(cmph_uint8)); unused_g_values_capacity += BUFSIZ; } unused_g_values[nunused_g_values++] = next_g; diff --git a/src/brz.c b/src/brz.c index 839081a..a7622ff 100755 --- a/src/brz.c +++ b/src/brz.c @@ -116,7 +116,7 @@ cmph_t *brz_new(cmph_config_t *mph, float c) brz->c = c; brz->m = mph->key_source->nkeys; DEBUGP("m: %u\n", brz->m); - brz->k = ceil(((float)brz->m)/brz->b); + brz->k = (cmph_uint32)ceil(brz->m/((float)brz->b)); DEBUGP("k: %u\n", brz->k); brz->size = (cmph_uint8 *) calloc(brz->k, sizeof(cmph_uint8)); diff --git a/src/main.c b/src/main.c index e381b29..07765d9 100644 --- a/src/main.c +++ b/src/main.c @@ -230,7 +230,7 @@ int main(int argc, char **argv) cmph_config_set_mphf_fd(config, mphf_fd); cmph_config_set_memory_availability(config, memory_availability); cmph_config_set_b(config, b); - if(mph_algo == CMPH_BMZ && c >= 2.0) c=1.15; + if((mph_algo == CMPH_BMZ || mph_algo == CMPH_BRZ) && c >= 2.0) c=1.15; if (c != 0) cmph_config_set_graphsize(config, c); mphf = cmph_new(config); cmph_config_destroy(config);