From d162b877e8f2d4ec9703638eacc7cbd9bec082c9 Mon Sep 17 00:00:00 2001
From: Arsentiy Milchakov <milcars@mapswithme.com>
Date: Mon, 12 Aug 2019 12:59:45 +0300
Subject: [PATCH] [coding] fixes related to file container writers refactoring.

---
 coding/file_container.cpp           |  3 +--
 coding/file_container.hpp           |  4 ++--
 generator/altitude_generator.cpp    | 18 +++++++++---------
 generator/restriction_generator.cpp |  2 +-
 4 files changed, 13 insertions(+), 14 deletions(-)

diff --git a/coding/file_container.cpp b/coding/file_container.cpp
index 434d9c7c80..ac2e764a28 100644
--- a/coding/file_container.cpp
+++ b/coding/file_container.cpp
@@ -1,6 +1,5 @@
 #include "coding/file_container.hpp"
 
-#include "coding/file_container_writers.hpp"
 #include "coding/internal/file_data.hpp"
 #include "coding/read_write_utils.hpp"
 #include "coding/varint.hpp"
@@ -386,7 +385,7 @@ void FilesContainerW::DeleteSection(Tag const & tag)
   Open(FileWriter::OP_WRITE_EXISTING);
 }
 
-std::unique_ptr<FileWriter> FilesContainerW::GetWriter(Tag const & tag)
+std::unique_ptr<FileContainerWriter> FilesContainerW::GetWriter(Tag const & tag)
 {
   ASSERT(!m_finished, ());
 
diff --git a/coding/file_container.hpp b/coding/file_container.hpp
index 24c8319a6e..ce2a61823e 100644
--- a/coding/file_container.hpp
+++ b/coding/file_container.hpp
@@ -1,7 +1,7 @@
 #pragma once
 
 #include "coding/file_reader.hpp"
-#include "coding/file_writer.hpp"
+#include "coding/file_container_writers.hpp"
 
 #include "base/assert.hpp"
 #include "base/macros.hpp"
@@ -241,7 +241,7 @@ public:
                   FileWriter::Op op = FileWriter::OP_WRITE_TRUNCATE);
   ~FilesContainerW();
 
-  std::unique_ptr<FileWriter> GetWriter(Tag const & tag);
+  std::unique_ptr<FileContainerWriter> GetWriter(Tag const & tag);
 
   void Write(std::string const & fPath, Tag const & tag);
   void Write(ModelReaderPtr reader, Tag const & tag);
diff --git a/generator/altitude_generator.cpp b/generator/altitude_generator.cpp
index b676ac1438..d7517eaa30 100644
--- a/generator/altitude_generator.cpp
+++ b/generator/altitude_generator.cpp
@@ -184,7 +184,7 @@ void BuildRoadAltitudes(std::string const & mwmPath, AltitudeGetter & altitudeGe
       succinct::bit_vector_builder & builder = processor.GetAltitudeAvailabilityBuilder();
       succinct::rs_bit_vector(&builder).map(visitor);
     }
-    header.m_featureTableOffset = base::checked_cast<uint32_t>(w.Pos() - startOffset);
+    header.m_featureTableOffset = base::checked_cast<uint32_t>(w->Pos() - startOffset);
 
     std::vector<uint32_t> offsets;
     std::vector<uint8_t> deltas;
@@ -207,20 +207,20 @@ void BuildRoadAltitudes(std::string const & mwmPath, AltitudeGetter & altitudeGe
       for (uint32_t offset : offsets)
         builder.push_back(offset);
 
-      coding::FreezeVisitor<Writer> visitor(w);
+      coding::FreezeVisitor<Writer> visitor(*w);
       succinct::elias_fano(&builder).map(visitor);
     }
     // Writing altitude info.
-    header.m_altitudesOffset = base::checked_cast<uint32_t>(w.Pos() - startOffset);
-    w.Write(deltas.data(), deltas.size());
-    w.WritePaddingByEnd(8);
-    header.m_endOffset = base::checked_cast<uint32_t>(w.Pos() - startOffset);
+    header.m_altitudesOffset = base::checked_cast<uint32_t>(w->Pos() - startOffset);
+    w->Write(deltas.data(), deltas.size());
+    w->WritePaddingByEnd(8);
+    header.m_endOffset = base::checked_cast<uint32_t>(w->Pos() - startOffset);
 
     // Rewriting header info.
-    auto const endOffset = w.Pos();
-    w.Seek(startOffset);
+    auto const endOffset = w->Pos();
+    w->Seek(startOffset);
     header.Serialize(w);
-    w.Seek(endOffset);
+    w->Seek(endOffset);
     LOG(LINFO, (ALTITUDES_FILE_TAG, "section is ready. The size is", header.m_endOffset));
     if (processor.HasAltitudeInfo())
       LOG(LINFO, ("Min altitude is", processor.GetMinAltitude()));
diff --git a/generator/restriction_generator.cpp b/generator/restriction_generator.cpp
index 05d1421e48..3bd4982c36 100644
--- a/generator/restriction_generator.cpp
+++ b/generator/restriction_generator.cpp
@@ -121,7 +121,7 @@ void SerializeRestrictions(RestrictionCollector & restrictionCollector,
   header.Serialize(*w);
 
   base::SortUnique(restrictions);
-  RestrictionSerializer::Serialize(header, restrictions.begin(), restrictions.end(), w);
+  RestrictionSerializer::Serialize(header, restrictions.begin(), restrictions.end(), *w);
 }
 
 bool BuildRoadRestrictions(std::string const & targetPath,