From f3f8e348a1930dc5bd3f96f28b176e25402aee56 Mon Sep 17 00:00:00 2001 From: "Thiago Marcos P. Santos" Date: Wed, 11 Mar 2015 14:37:28 +0200 Subject: [PATCH 1/3] Fix build warnings on GCC Apperently boost has a few quirks on its headers. --- bin/render.cpp | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/bin/render.cpp b/bin/render.cpp index fad6600cf..9129a4bcf 100644 --- a/bin/render.cpp +++ b/bin/render.cpp @@ -14,7 +14,14 @@ #include #endif +#pragma GCC diagnostic push +#ifndef __clang__ +#pragma GCC diagnostic ignored "-Wunused-local-typedefs" +#pragma GCC diagnostic ignored "-Wshadow" +#endif #include +#pragma GCC diagnostic pop + namespace po = boost::program_options; #include From 71ccb7b0138d62984bb03700319bcc988157f1ed Mon Sep 17 00:00:00 2001 From: "Thiago Marcos P. Santos" Date: Wed, 11 Mar 2015 14:39:02 +0200 Subject: [PATCH 2/3] Trivial build fix, do not call private method Resize is internally called by the view now. --- bin/render.cpp | 1 - 1 file changed, 1 deletion(-) diff --git a/bin/render.cpp b/bin/render.cpp index 9129a4bcf..71981b9d9 100644 --- a/bin/render.cpp +++ b/bin/render.cpp @@ -102,7 +102,6 @@ int main(int argc, char *argv[]) { map.setClasses(classes); view.resize(width, height, pixelRatio); - map.resize(width, height, pixelRatio); map.setLatLngZoom({ lat, lon }, zoom); map.setBearing(bearing); From 3b4f08b0606a2084a40062e39c23653e3e66266b Mon Sep 17 00:00:00 2001 From: "Thiago Marcos P. Santos" Date: Wed, 11 Mar 2015 14:40:16 +0200 Subject: [PATCH 3/3] Update the docs libboost-program-options-dev is not automatically installed as a dependency of libboost-dev, which will cause a link error when building on Linux. --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 05a9d41c0..c3a6b0efd 100644 --- a/README.md +++ b/README.md @@ -86,7 +86,7 @@ Finally, install Boost. If you're running Ubuntu 12.04 or older, you need to ins Otherwise, you can just install - sudo apt-get install libboost-dev + sudo apt-get install libboost-dev libboost-program-options-dev Once you're done installing the build dependencies, you can get started by running