From a18464d7f5cd9933bd0cc311f18f61de9ced9d31 Mon Sep 17 00:00:00 2001
From: Alex Zolotarev <deathbaba@gmail.com>
Date: Tue, 16 Aug 2011 20:24:31 +0300
Subject: [PATCH] Fixed some warnings

---
 platform/apple_location_service.mm | 2 +-
 search/query.cpp                   | 2 +-
 search/search_trie.hpp             | 2 +-
 yg/rendercontext.hpp               | 1 +
 4 files changed, 4 insertions(+), 3 deletions(-)

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<TrieIterator> m_iterator;
     FeaturesVector m_features;
+    scoped_ptr<TrieIterator> 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.