diff options
| author | vng <viktor.govako@gmail.com> | 2011-05-07 02:48:28 +0400 |
|---|---|---|
| committer | Alex Zolotarev <alex@maps.me> | 2015-09-23 01:17:03 +0300 |
| commit | 63e3f9ab467413fd64865cfd48a3c9478df196aa (patch) | |
| tree | d67ead54f09e8392e2632947ece34b3a1280f742 | |
| parent | c399e6d9fe8e827e24dcdc4d270e7dc9e686df9f (diff) | |
[msvc] Compilation fixes.
| -rw-r--r-- | 3party/3party.pro | 2 | ||||
| -rw-r--r-- | platform/location_manager.cpp | 2 | ||||
| -rw-r--r-- | platform/wifi_location_service.cpp | 2 | ||||
| -rw-r--r-- | yg/glyph_layout.cpp | 2 |
4 files changed, 6 insertions, 2 deletions
diff --git a/3party/3party.pro b/3party/3party.pro index 27584e3b46..0f2e537dcc 100644 --- a/3party/3party.pro +++ b/3party/3party.pro @@ -2,7 +2,7 @@ TEMPLATE = subdirs -SUBDIRS = expat freetype fribidi zlib bzip2 jansson protobuf tomcrypt +SUBDIRS = expat freetype fribidi zlib bzip2 jansson tomcrypt !iphone*:!bada* { SUBDIRS += gflags \ diff --git a/platform/location_manager.cpp b/platform/location_manager.cpp index f85e47c1a3..969242d848 100644 --- a/platform/location_manager.cpp +++ b/platform/location_manager.cpp @@ -3,6 +3,8 @@ #include "../std/target_os.hpp" #include "../std/vector.hpp" #include "../std/bind.hpp" +#include "../std/ctime.hpp" + double ApproxDistanceSquareInMetres(double lat1, double lon1, double lat2, double lon2) { diff --git a/platform/wifi_location_service.cpp b/platform/wifi_location_service.cpp index 1befdd6c72..700d33d62d 100644 --- a/platform/wifi_location_service.cpp +++ b/platform/wifi_location_service.cpp @@ -5,11 +5,13 @@ #include "../base/logging.hpp" #include "../std/bind.hpp" +#include "../std/ctime.hpp" #include "../3party/jansson/myjansson.hpp" #define MWM_GEOLOCATION_SERVER "http://geolocation.server/" + namespace location { class WiFiLocationService : public LocationService diff --git a/yg/glyph_layout.cpp b/yg/glyph_layout.cpp index d728ad62f5..1686964b0d 100644 --- a/yg/glyph_layout.cpp +++ b/yg/glyph_layout.cpp @@ -200,7 +200,7 @@ namespace yg return; m_entries[symPos].m_angle = pivotPt.m_angle; - double centerOffset = metrics.m_xOffset + metrics.m_width / 2.0; + //double centerOffset = metrics.m_xOffset + metrics.m_width / 2.0; //m_entries[symPos].m_pt = pivotPt.m_pp.m_pt.Move(-centerOffset, pivotPt.m_angle); m_entries[symPos].m_pt = startPt.m_pt; } |