From 3dfa317cf9689c5bbd0994f86bdf6b068b1c6716 Mon Sep 17 00:00:00 2001
From: Ansis Brammanis <brammanis@gmail.com>
Date: Tue, 2 Jun 2015 10:53:53 -0400
Subject: fix android compile errors

- explicitly mark override
- re-add fix from 74604af that was lost in a merge
---
 src/mbgl/renderer/symbol_bucket.hpp | 4 ++--
 src/mbgl/text/collision_tile.hpp    | 5 +++--
 2 files changed, 5 insertions(+), 4 deletions(-)

(limited to 'src')

diff --git a/src/mbgl/renderer/symbol_bucket.hpp b/src/mbgl/renderer/symbol_bucket.hpp
index bebbedb395..5654f9b2ba 100644
--- a/src/mbgl/renderer/symbol_bucket.hpp
+++ b/src/mbgl/renderer/symbol_bucket.hpp
@@ -89,7 +89,7 @@ public:
                            const FilterExpression&,
                            GlyphStore&,
                            Sprite&);
-    void placeFeatures();
+    void placeFeatures() override;
 
 private:
     void addFeature(const std::vector<std::vector<Coordinate>> &lines,
@@ -99,7 +99,7 @@ private:
     void addToDebugBuffers();
 
     void placeFeatures(bool swapImmediately);
-    void swapRenderData();
+    void swapRenderData() override;
 
     // Adds placed items to the buffer.
     template <typename Buffer, typename GroupType>
diff --git a/src/mbgl/text/collision_tile.hpp b/src/mbgl/text/collision_tile.hpp
index b0c56e6f5b..882f347b46 100644
--- a/src/mbgl/text/collision_tile.hpp
+++ b/src/mbgl/text/collision_tile.hpp
@@ -9,12 +9,13 @@
 #pragma GCC diagnostic ignored "-Wunused-variable"
 #pragma GCC diagnostic ignored "-Wshadow"
 #ifdef __clang__
+#pragma GCC diagnostic ignored "-Wunknown-pragmas"
+#endif
+#pragma GCC diagnostic ignored "-Wpragmas"
 #pragma GCC diagnostic ignored "-Wdeprecated-register"
 #pragma GCC diagnostic ignored "-Wshorten-64-to-32"
-#else
 #pragma GCC diagnostic ignored "-Wunused-local-typedefs"
 #pragma GCC diagnostic ignored "-Wmaybe-uninitialized"
-#endif
 #include <boost/geometry.hpp>
 #include <boost/geometry/geometries/point.hpp>
 #include <boost/geometry/geometries/box.hpp>
-- 
cgit v1.2.1