From 70a31baf5c78b9dad4f2dcdc7920b7eb1453e402 Mon Sep 17 00:00:00 2001 From: John Firebaugh Date: Thu, 7 Aug 2014 13:02:40 -0700 Subject: [PATCH] Eliminate warnings --- common.gypi | 2 +- common/glfw_view.cpp | 2 +- include/mbgl/platform/event.hpp | 1 + macosx/main.mm | 2 ++ src/geometry/interpolate.cpp | 2 +- src/map/map.cpp | 2 +- src/map/raster_tile_data.cpp | 2 +- src/renderer/debug_bucket.cpp | 2 +- src/renderer/painter_prerender.cpp | 2 +- src/renderer/painter_raster.cpp | 4 ++-- src/renderer/painter_symbol.cpp | 2 +- src/style/style_parser.cpp | 2 +- 12 files changed, 14 insertions(+), 11 deletions(-) diff --git a/common.gypi b/common.gypi index a38a279ef..513d8688f 100644 --- a/common.gypi +++ b/common.gypi @@ -7,7 +7,7 @@ 'GCC_VERSION': 'com.apple.compilers.llvm.clang.1_0', 'GCC_ENABLE_CPP_EXCEPTIONS': 'YES', 'GCC_ENABLE_CPP_RTTI':'YES', - 'OTHER_CPLUSPLUSFLAGS': [ '-Wall', '-Wextra' ], + 'OTHER_CPLUSPLUSFLAGS': [ '-Wall', '-Wextra', '-Wno-variadic-macros' ], 'GCC_WARN_PEDANTIC': 'YES', 'GCC_WARN_UNINITIALIZED_AUTOS': 'YES_AGGRESSIVE' }, diff --git a/common/glfw_view.cpp b/common/glfw_view.cpp index f6a1c1ae7..f53090a00 100644 --- a/common/glfw_view.cpp +++ b/common/glfw_view.cpp @@ -202,7 +202,7 @@ void GLFWView::swap() { glfwSetWindowTitle(window, title.c_str()); } -void GLFWView::notify_map_change(mbgl::MapChange change, mbgl::timestamp delay) { +void GLFWView::notify_map_change(mbgl::MapChange /*change*/, mbgl::timestamp /*delay*/) { // no-op } diff --git a/include/mbgl/platform/event.hpp b/include/mbgl/platform/event.hpp index b55c721c9..01a23aa25 100644 --- a/include/mbgl/platform/event.hpp +++ b/include/mbgl/platform/event.hpp @@ -68,6 +68,7 @@ constexpr EventSeverity disabledEventSeverities[] = { constexpr Event disabledEvents[] = { + Event(-1) // Avoid zero size array }; constexpr EventPermutation disabledEventPermutations[] = { diff --git a/macosx/main.mm b/macosx/main.mm index a1b01de7b..c61c9decb 100644 --- a/macosx/main.mm +++ b/macosx/main.mm @@ -15,6 +15,8 @@ - (void)handleGetURLEvent:(NSAppleEventDescriptor *)event withReplyEvent:(NSAppleEventDescriptor *)replyEvent { + (void)replyEvent; + NSString* urlString = [[event paramDescriptorForKeyword:keyDirectObject] stringValue]; NSURL *url = [NSURL URLWithString:urlString]; NSMutableDictionary *params = [[NSMutableDictionary alloc] init]; diff --git a/src/geometry/interpolate.cpp b/src/geometry/interpolate.cpp index af62bd921..618136ff4 100644 --- a/src/geometry/interpolate.cpp +++ b/src/geometry/interpolate.cpp @@ -16,7 +16,7 @@ const std::array, 4> minScaleArrays = {{ Anchors interpolate(const std::vector &vertices, float spacing, - const float minScale, float maxScale, const float tilePixelRatio, + const float /*minScale*/, float maxScale, const float tilePixelRatio, const int start) { maxScale = std::round(std::fmax(std::fmin(8.0f, maxScale / 2.0f), 1.0f)); diff --git a/src/map/map.cpp b/src/map/map.cpp index bcdcd8479..b7a9db505 100644 --- a/src/map/map.cpp +++ b/src/map/map.cpp @@ -169,7 +169,7 @@ void Map::render(uv_async_t *async) { void Map::terminate(uv_async_t *async) { // Closes all open handles on the loop. This means that the loop will automatically terminate. uv_loop_t *loop = static_cast(async->data); - uv_walk(loop, [](uv_handle_t *handle, void *arg) { + uv_walk(loop, [](uv_handle_t *handle, void */*arg*/) { if (!uv_is_closing(handle)) { uv_close(handle, NULL); } diff --git a/src/map/raster_tile_data.cpp b/src/map/raster_tile_data.cpp index 26c122da6..a3c6d21a6 100644 --- a/src/map/raster_tile_data.cpp +++ b/src/map/raster_tile_data.cpp @@ -29,6 +29,6 @@ void RasterTileData::render(Painter &painter, std::shared_ptr layer_ bucket.render(painter, layer_desc, id); } -bool RasterTileData::hasData(std::shared_ptr layer_desc) const { +bool RasterTileData::hasData(std::shared_ptr /*layer_desc*/) const { return bucket.hasData(); } diff --git a/src/renderer/debug_bucket.cpp b/src/renderer/debug_bucket.cpp index c9a68e2ef..e51dd75b1 100644 --- a/src/renderer/debug_bucket.cpp +++ b/src/renderer/debug_bucket.cpp @@ -14,7 +14,7 @@ DebugBucket::DebugBucket(DebugFontBuffer& fontBuffer) : fontBuffer(fontBuffer) { } -void DebugBucket::render(Painter& painter, std::shared_ptr layer_desc, const Tile::ID& /*id*/) { +void DebugBucket::render(Painter& painter, std::shared_ptr /*layer_desc*/, const Tile::ID& /*id*/) { painter.renderDebugText(*this); } diff --git a/src/renderer/painter_prerender.cpp b/src/renderer/painter_prerender.cpp index ea461ca5d..5d61b9553 100644 --- a/src/renderer/painter_prerender.cpp +++ b/src/renderer/painter_prerender.cpp @@ -17,7 +17,7 @@ void Painter::preparePrerender(PrerenderedTexture &texture) { glViewport(0, 0, texture.properties.size, texture.properties.size); } -void Painter::finishPrerender(PrerenderedTexture &texture) { +void Painter::finishPrerender(PrerenderedTexture &/*texture*/) { glEnable(GL_DEPTH_TEST); glEnable(GL_STENCIL_TEST); diff --git a/src/renderer/painter_raster.cpp b/src/renderer/painter_raster.cpp index 228d609aa..ef2eab2a6 100644 --- a/src/renderer/painter_raster.cpp +++ b/src/renderer/painter_raster.cpp @@ -5,10 +5,10 @@ using namespace mbgl; -void Painter::renderRaster(RasterBucket& bucket, std::shared_ptr layer_desc, const Tile::ID& /*id*/) { +void Painter::renderRaster(RasterBucket& bucket, std::shared_ptr /*layer_desc*/, const Tile::ID& /*id*/) { if (pass == Translucent) return; - const RasterProperties &properties = layer_desc->getProperties(); + // const RasterProperties &properties = layer_desc->getProperties(); depthMask(false); diff --git a/src/renderer/painter_symbol.cpp b/src/renderer/painter_symbol.cpp index d17841501..2b7eef323 100644 --- a/src/renderer/painter_symbol.cpp +++ b/src/renderer/painter_symbol.cpp @@ -10,7 +10,7 @@ namespace mbgl { void Painter::renderSymbol(SymbolBucket &bucket, std::shared_ptr layer_desc, - const Tile::ID &id) { + const Tile::ID &/*id*/) { // Abort early. if (pass == Opaque) { return; diff --git a/src/style/style_parser.cpp b/src/style/style_parser.cpp index f71506546..f72b47d1f 100644 --- a/src/style/style_parser.cpp +++ b/src/style/style_parser.cpp @@ -377,7 +377,7 @@ template<> std::tuple StyleParser::parseProperty { true, RotateAnchorTypeClass({ value.GetString(), value.GetStringLength() }) }; } -template<> std::tuple StyleParser::parseProperty(JSVal value, const char *property_name) { +template<> std::tuple StyleParser::parseProperty(JSVal value, const char */*property_name*/) { PropertyTransition transition; if (value.IsObject()) { if (value.HasMember("duration") && value["duration"].IsNumber()) {