From 56e1f55bb6b40c13196e7c5ec87ad91354e7962b Mon Sep 17 00:00:00 2001 From: Eric Fischer Date: Tue, 13 Dec 2016 17:46:38 -0800 Subject: [PATCH] Fix warnings identified by g++ --- tile.cpp | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-) diff --git a/tile.cpp b/tile.cpp index c61859c..d2ebeb6 100644 --- a/tile.cpp +++ b/tile.cpp @@ -1263,11 +1263,6 @@ long long write_tile(FILE *geoms, long long *geompos_in, char *metabase, char *s long long count = 0; double accum_area = 0; - double interval = 0; - if (z < basezoom) { - interval = std::exp(std::log(droprate) * (basezoom - z)); - } - double fraction_accum = 0; unsigned long long previndex = 0, density_previndex = 0, merge_previndex = 0; @@ -1285,8 +1280,8 @@ long long write_tile(FILE *geoms, long long *geompos_in, char *metabase, char *s int within[child_shards]; long long geompos[child_shards]; - memset(within, '\0', sizeof(within)); - memset(geompos, '\0', sizeof(geompos)); + memset(within, '\0', child_shards * sizeof(int)); + memset(geompos, '\0', child_shards * sizeof(long long)); if (*geompos_in != og) { if (fseek(geoms, og, SEEK_SET) != 0) { @@ -2096,13 +2091,13 @@ int traverse_zooms(int *geomfd, off_t *geom_size, char *metabase, char *stringpo // Round down to a power of 2 for (int e = 0; e < 30; e++) { - if (threads >= (1 << e) && threads < (1 << (e + 1))) { - threads = 1 << e; + if (threads >= (1U << e) && threads < (1U << (e + 1))) { + threads = 1U << e; break; } } - if (threads >= (1 << 30)) { - threads = 1 << 30; + if (threads >= (1U << 30)) { + threads = 1U << 30; } // Assign temporary files to threads