diff --git a/platform/apple_location_service.mm b/platform/apple_location_service.mm index c083299fe3..c0363456b2 100644 --- a/platform/apple_location_service.mm +++ b/platform/apple_location_service.mm @@ -169,7 +169,7 @@ public: - (void)locationManager:(CLLocationManager *)manager didFailWithError:(NSError *)error { - NSLog(@"locationManager failed with error: %d, %@", error.code, error.description); + NSLog(@"locationManager failed with error: %ld, %@", error.code, error.description); if (error.code == kCLErrorDenied) { GpsInfo info; diff --git a/search/query.cpp b/search/query.cpp index e4d169c4c5..ebfd01cc44 100644 --- a/search/query.cpp +++ b/search/query.cpp @@ -127,8 +127,8 @@ Query::Query(string const & query, m2::RectD const & viewport, IndexType const * m_viewport(viewport), m_pCategories(pCategories), m_pTrieRoot(pTrieRoot), - m_pIndex(pIndex ? new IndexType(*pIndex) : NULL), m_pFeatures(pFeatures), + m_pIndex(pIndex ? new IndexType(*pIndex) : NULL), m_resultsRemaining(10), m_pEngine(pEngine), m_bTerminate(false) { diff --git a/search/search_trie.hpp b/search/search_trie.hpp index 1fd4ff7c07..bf515cc481 100644 --- a/search/search_trie.hpp +++ b/search/search_trie.hpp @@ -46,8 +46,8 @@ struct EdgeValueReader class SearchInfo { - scoped_ptr m_iterator; FeaturesVector m_features; + scoped_ptr m_iterator; public: SearchInfo(FilesContainerR const & cont) diff --git a/yg/rendercontext.hpp b/yg/rendercontext.hpp index d553439d64..97232debda 100644 --- a/yg/rendercontext.hpp +++ b/yg/rendercontext.hpp @@ -9,6 +9,7 @@ namespace yg class RenderContext { public: + virtual ~RenderContext() {} /// Make this context current for the specified thread virtual void makeCurrent() = 0; /// Create a render context which is shared with this one.