fix android compile errors

- explicitly mark override - re-add fix from 74604af that was lost in a merge
mapbox · Jun 2, 2015 · 3dfa317 · 3dfa317
1 parent 4e74867
commit 3dfa317
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/src/mbgl/renderer/symbol_bucket.hpp b/src/mbgl/renderer/symbol_bucket.hpp
@@ -89,7 +89,7 @@ class SymbolBucket : public Bucket {
                            const FilterExpression&,
                            GlyphStore&,
                            Sprite&);
-    void placeFeatures();
+    void placeFeatures() override;
 
 private:
     void addFeature(const std::vector<std::vector<Coordinate>> &lines,
@@ -99,7 +99,7 @@ class SymbolBucket : public Bucket {
     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
@@ -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>