From 420cb58a5d423d3c964f51340872eec53061e8da Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Konstantin=20Ka=CC=88fer?= Date: Mon, 10 Mar 2014 18:47:16 +0100 Subject: [PATCH] fix pedantic warnings --- include/libtess2/tesselator.h | 2 +- include/llmr/util/math.hpp | 2 +- src/clipper/clipper.cpp | 2 +- src/map/map.cpp | 4 ++-- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/include/libtess2/tesselator.h b/include/libtess2/tesselator.h index a3e552866..74ca18e27 100755 --- a/include/libtess2/tesselator.h +++ b/include/libtess2/tesselator.h @@ -203,7 +203,7 @@ int tessGetElementCount( TESStesselator *tess ); const TESSindex* tessGetElements( TESStesselator *tess ); #ifdef __cplusplus -}; +} #endif #endif // TESSELATOR_H diff --git a/include/llmr/util/math.hpp b/include/llmr/util/math.hpp index 8ea4a6b79..a7aeb6345 100644 --- a/include/llmr/util/math.hpp +++ b/include/llmr/util/math.hpp @@ -26,7 +26,7 @@ inline T dist(const S1& a, const S2& b) { T dy = b.y - a.y; T c = sqrt(dx * dx + dy * dy); return c; -}; +} } } diff --git a/src/clipper/clipper.cpp b/src/clipper/clipper.cpp index e52d4f422..95975450e 100755 --- a/src/clipper/clipper.cpp +++ b/src/clipper/clipper.cpp @@ -437,7 +437,7 @@ Int128 Int128Mul (cInt lhs, cInt rhs) if (tmp.lo < b) tmp.hi++; if (negate) tmp = -tmp; return tmp; -}; +} #endif //------------------------------------------------------------------------------ diff --git a/src/map/map.cpp b/src/map/map.cpp index ebe10c76e..bf64d65bd 100644 --- a/src/map/map.cpp +++ b/src/map/map.cpp @@ -306,7 +306,7 @@ bool Map::findLoadedChildren(const Tile::ID& id, int32_t maxCoveringZoom, std::f } } return complete; -}; +} /** * Find a loaded parent of the given tile. @@ -327,7 +327,7 @@ bool Map::findLoadedParent(const Tile::ID& id, int32_t minCoveringZoom, std::for } } return false; -}; +} bool Map::updateTiles() {