From 1e00b4fec395187781b602c592d8b57704d566cc Mon Sep 17 00:00:00 2001
From: Dmitry Kunin <dkunin@mapswith.me>
Date: Tue, 21 Jan 2014 11:57:58 +0300
Subject: [PATCH] [codereview]

---
 drape_frontend/frontend_renderer.cpp    |  2 +-
 drape_frontend/memory_feature_index.cpp |  6 +++---
 drape_frontend/memory_feature_index.hpp |  2 +-
 drape_frontend/read_manager.cpp         | 10 +++++-----
 drape_frontend/read_manager.hpp         |  4 ++--
 indexer/feature_decl.hpp                |  5 +++++
 6 files changed, 17 insertions(+), 12 deletions(-)

diff --git a/drape_frontend/frontend_renderer.cpp b/drape_frontend/frontend_renderer.cpp
index 7457468092..43f6afd4ed 100644
--- a/drape_frontend/frontend_renderer.cpp
+++ b/drape_frontend/frontend_renderer.cpp
@@ -90,7 +90,7 @@ namespace df
         if (!descr.DoDropAll())
         {
           vector<TileKey> const & tilesToDrop = descr.GetTilesToDrop();
-          for (int i = 0; i < tilesToDrop.size(); ++i)
+          for (size_t i = 0; i < tilesToDrop.size(); ++i)
           {
             tile_data_range_t range = m_tileData.equal_range(tilesToDrop[i]);
             for (tile_data_iter eraseIter = range.first; eraseIter != range.second; ++eraseIter)
diff --git a/drape_frontend/memory_feature_index.cpp b/drape_frontend/memory_feature_index.cpp
index eba7f2e1bd..0f43ca2568 100644
--- a/drape_frontend/memory_feature_index.cpp
+++ b/drape_frontend/memory_feature_index.cpp
@@ -9,8 +9,8 @@ namespace df
     for (size_t i = 0; i < features.size(); ++i)
     {
       FeatureInfo & info = features[i];
-      ASSERT(!(m_features.find(info.m_id) == m_features.end() && info.m_isOwner == true), ());
-      if (info.m_isOwner == false && m_features.insert(info.m_id).second == true)
+      ASSERT(m_features.find(info.m_id) != m_features.end() || !info.m_isOwner,());
+      if (!info.m_isOwner && m_features.insert(info.m_id).second)
       {
         indexes.push_back(i);
         info.m_isOwner = true;
@@ -25,7 +25,7 @@ namespace df
     for (size_t i = 0; i < features.size(); ++i)
     {
       FeatureInfo & info = features[i];
-      if (info.m_isOwner == true)
+      if (info.m_isOwner)
       {
         VERIFY(m_features.erase(info.m_id) == 1, ());
         info.m_isOwner = false;
diff --git a/drape_frontend/memory_feature_index.hpp b/drape_frontend/memory_feature_index.hpp
index 0d0b4ca457..69a71ba4c4 100644
--- a/drape_frontend/memory_feature_index.hpp
+++ b/drape_frontend/memory_feature_index.hpp
@@ -17,7 +17,7 @@ namespace df
 
     bool operator < (FeatureInfo const & other) const
     {
-      if (!(m_id == other.m_id))
+      if (m_id != other.m_id)
         return m_id < other.m_id;
 
       return m_isOwner < other.m_isOwner;
diff --git a/drape_frontend/read_manager.cpp b/drape_frontend/read_manager.cpp
index 44054358b1..8c7acff1dc 100644
--- a/drape_frontend/read_manager.cpp
+++ b/drape_frontend/read_manager.cpp
@@ -21,7 +21,7 @@ void CancelTaskFn(shared_ptr<TileInfo> tinfo)
   tinfo->Cancel();
 }
 
-struct CoverageCellComparer
+struct LessCoverageCell
 {
   bool operator()(shared_ptr<TileInfo> const & l, TileKey const & r) const
   {
@@ -30,7 +30,7 @@ struct CoverageCellComparer
 
   bool operator()(TileKey const & l, shared_ptr<TileInfo> const & r) const
   {
-    return r->GetTileKey() < l;
+    return l < r->GetTileKey();
   }
 };
 
@@ -48,7 +48,7 @@ ReadManager::ReadManager(double visualScale, int w, int h,
   , m_model(model)
 {
   m_scalesProcessor.SetParams(visualScale, ScalesProcessor::CalculateTileSize(w, h));
-  m_pool = MasterPointer<threads::ThreadPool>(new threads::ThreadPool(ReadCount(), bind(&ReadManager::OnTaskFinished, this, _1)));
+  m_pool.Reset(new threads::ThreadPool(ReadCount(), bind(&ReadManager::OnTaskFinished, this, _1)));
 }
 
 void ReadManager::OnTaskFinished(threads::IRoutine * task)
@@ -80,13 +80,13 @@ void ReadManager::UpdateCoverage(const ScreenBase & screen, CoverageUpdateDescri
     buffer_vector<tileinfo_ptr, 8> outdatedTiles;
     set_difference(m_tileInfos.begin(), m_tileInfos.end(),
                    tiles.begin(), tiles.end(),
-                   back_inserter(outdatedTiles), CoverageCellComparer());
+                   back_inserter(outdatedTiles), LessCoverageCell());
 
     // Find rects that go in into viewport
     buffer_vector<TileKey, 8> inputRects;
     set_difference(tiles.begin(), tiles.end(),
                    m_tileInfos.begin(), m_tileInfos.end(),
-                   back_inserter(inputRects), CoverageCellComparer());
+                   back_inserter(inputRects), LessCoverageCell());
 
     for_each(outdatedTiles.begin(), outdatedTiles.end(), bind(&ReadManager::ClearTileInfo, this, _1));
 
diff --git a/drape_frontend/read_manager.hpp b/drape_frontend/read_manager.hpp
index c422e39484..09dd9607da 100644
--- a/drape_frontend/read_manager.hpp
+++ b/drape_frontend/read_manager.hpp
@@ -57,7 +57,7 @@ private:
   ScreenBase m_currentViewport;
 
 
-  struct LessByTileKeyComparator
+  struct LessByTileKey
   {
     bool operator ()(tileinfo_ptr const & l, tileinfo_ptr const & r) const
     {
@@ -65,7 +65,7 @@ private:
     }
   };
 
-  set<tileinfo_ptr, LessByTileKeyComparator> m_tileInfos;
+  set<tileinfo_ptr, LessByTileKey> m_tileInfos;
 
   void ClearTileInfo(tileinfo_ptr & tileToClear);
 };
diff --git a/indexer/feature_decl.hpp b/indexer/feature_decl.hpp
index 82b5a9a6e2..8e2db502f0 100644
--- a/indexer/feature_decl.hpp
+++ b/indexer/feature_decl.hpp
@@ -25,4 +25,9 @@ struct FeatureID
   {
     return (m_mwm == r.m_mwm && m_offset == r.m_offset);
   }
+
+  inline bool operator != (FeatureID const & r) const
+  {
+    return !(*this == r);
+  }
 };