From 0c172aa453e0c66da7bb20166e5903d8d925f8a8 Mon Sep 17 00:00:00 2001 From: MWM Planet Generator cdn3 Date: Mon, 29 Dec 2014 06:50:55 -0800 Subject: [PATCH] [linux] Fixed compilation. --- .../DataStructures/Coordinate.cpp | 22 ++----------------- drape/texture_of_colors.cpp | 3 +++ 2 files changed, 5 insertions(+), 20 deletions(-) diff --git a/3party/osrm/osrm-backend/DataStructures/Coordinate.cpp b/3party/osrm/osrm-backend/DataStructures/Coordinate.cpp index 3bd27df109..fee8c9648f 100644 --- a/3party/osrm/osrm-backend/DataStructures/Coordinate.cpp +++ b/3party/osrm/osrm-backend/DataStructures/Coordinate.cpp @@ -26,20 +26,16 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ #include + #include "../Util/MercatorUtil.h" -#ifndef NDEBUG -#include "../Util/simple_logger.hpp" -#endif #include "../Util/StringUtil.h" #include -#ifndef NDEBUG -#include -#endif #include #include + FixedPointCoordinate::FixedPointCoordinate() : lat(std::numeric_limits::min()), lon(std::numeric_limits::min()) { @@ -47,20 +43,6 @@ FixedPointCoordinate::FixedPointCoordinate() FixedPointCoordinate::FixedPointCoordinate(int lat, int lon) : lat(lat), lon(lon) { -#ifndef NDEBUG - if (0 != (std::abs(lat) >> 30)) - { - std::bitset<32> y_coordinate_vector(lat); - SimpleLogger().Write(logDEBUG) << "broken lat: " << lat - << ", bits: " << y_coordinate_vector; - } - if (0 != (std::abs(lon) >> 30)) - { - std::bitset<32> x_coordinate_vector(lon); - SimpleLogger().Write(logDEBUG) << "broken lon: " << lon - << ", bits: " << x_coordinate_vector; - } -#endif } void FixedPointCoordinate::Reset() diff --git a/drape/texture_of_colors.cpp b/drape/texture_of_colors.cpp index cfa2458e8b..94d7e7d8f7 100644 --- a/drape/texture_of_colors.cpp +++ b/drape/texture_of_colors.cpp @@ -3,6 +3,9 @@ #include "../base/shared_buffer_manager.hpp" #include "../base/stl_add.hpp" +#include "../std/cstring.hpp" + + namespace dp {