summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKonstantin Käfer <mail@kkaefer.com>2014-03-10 18:47:16 +0100
committerKonstantin Käfer <mail@kkaefer.com>2014-03-11 12:10:07 +0100
commit420cb58a5d423d3c964f51340872eec53061e8da (patch)
tree3ad66498e0dca88bfc0be2df598bdeff6926401d
parentb7b2812d30197feb715df8d7bfd439037e930a27 (diff)
downloadqtlocation-mapboxgl-420cb58a5d423d3c964f51340872eec53061e8da.tar.gz
fix pedantic warnings
-rwxr-xr-xinclude/libtess2/tesselator.h2
-rw-r--r--include/llmr/util/math.hpp2
-rwxr-xr-xsrc/clipper/clipper.cpp2
-rw-r--r--src/map/map.cpp4
4 files changed, 5 insertions, 5 deletions
diff --git a/include/libtess2/tesselator.h b/include/libtess2/tesselator.h
index a3e5528660..74ca18e27d 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 8ea4a6b792..a7aeb6345a 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 e52d4f422f..95975450e3 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 ebe10c76e4..bf64d65bd5 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() {