From 3d4a284682ac780f60845a14cb1de1c14cfb9cea Mon Sep 17 00:00:00 2001
From: Vladimir Byko-Ianko <v.bykoianko@corp.mail.ru>
Date: Tue, 11 Sep 2018 20:17:31 +0300
Subject: [PATCH] Review fixes.

---
 generator/generator_tool/generator_tool.cpp | 2 +-
 routing/city_roads_loader.cpp               | 2 ++
 routing/city_roads_loader.hpp               | 1 -
 routing/city_roads_serialization.hpp        | 9 +++++----
 4 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/generator/generator_tool/generator_tool.cpp b/generator/generator_tool/generator_tool.cpp
index 9bd80a9b88..b2cc1a56c5 100644
--- a/generator/generator_tool/generator_tool.cpp
+++ b/generator/generator_tool/generator_tool.cpp
@@ -131,7 +131,7 @@ DEFINE_string(transit_path, "", "Path to directory with transit graphs in json."
 DEFINE_bool(generate_cameras, false, "Generate section with speed cameras info.");
 DEFINE_bool(
     make_city_roads, false,
-    "Calculates which roads lie inside cities and makes a section with ids of these features.");
+    "Calculates which roads lie inside cities and makes a section with ids of these roads.");
 
 // Sponsored-related.
 DEFINE_string(booking_data, "", "Path to booking data in .tsv format.");
diff --git a/routing/city_roads_loader.cpp b/routing/city_roads_loader.cpp
index f77bfae3f6..f4a3435ab5 100644
--- a/routing/city_roads_loader.cpp
+++ b/routing/city_roads_loader.cpp
@@ -10,6 +10,8 @@
 
 #include <utility>
 
+#include "defines.hpp"
+
 namespace routing
 {
 CityRoadsLoader::CityRoadsLoader(DataSource const & dataSource, MwmSet::MwmId const & mwmId)
diff --git a/routing/city_roads_loader.hpp b/routing/city_roads_loader.hpp
index b95da89c09..525857810f 100644
--- a/routing/city_roads_loader.hpp
+++ b/routing/city_roads_loader.hpp
@@ -6,7 +6,6 @@
 
 #include <cstdint>
 #include <memory>
-#include <vector>
 
 #include "3party/succinct/elias_fano.hpp"
 
diff --git a/routing/city_roads_serialization.hpp b/routing/city_roads_serialization.hpp
index 994e49b870..63ef257c94 100644
--- a/routing/city_roads_serialization.hpp
+++ b/routing/city_roads_serialization.hpp
@@ -19,7 +19,7 @@ namespace routing
 {
 struct CityRoadsHeader
 {
-  template <class Sink>
+  template <typename Sink>
   void Serialize(Sink & sink) const
   {
     WriteToSink(sink, m_version);
@@ -27,7 +27,7 @@ struct CityRoadsHeader
     WriteToSink(sink, m_dataSize);
   }
 
-  template <class Source>
+  template <typename Source>
   void Deserialize(Source & src)
   {
     m_version = ReadPrimitiveFromSource<uint16_t>(src);
@@ -48,7 +48,7 @@ class CityRoadsSerializer
 public:
   CityRoadsSerializer() = delete;
 
-  template <class Sink>
+  template <typename Sink>
   static void Serialize(Sink & sink, std::vector<uint64_t> && cityRoadFeatureIds)
   {
     CityRoadsHeader header;
@@ -78,12 +78,13 @@ public:
         "road feature ids in cities. Size:", endOffset - startOffset, "bytes."));
   }
 
-  template <class Source>
+  template <typename Source>
   static void Deserialize(Source & src, std::unique_ptr<CopiedMemoryRegion> & cityRoadsRegion,
                           succinct::elias_fano & cityRoads)
   {
     CityRoadsHeader header;
     header.Deserialize(src);
+    CHECK_EQUAL(header.m_version, 0, ());
 
     std::vector<uint8_t> data(header.m_dataSize);
     src.Read(data.data(), data.size());