Comments were addressed.

1 files changed, 14 insertions, 35 deletions

diff --git a/indexer/features_offsets_table.cpp b/indexer/features_offsets_table.cpp
index 552a9f1e1c..ce0bf95de2 100644
--- a/indexer/features_offsets_table.cpp
+++ b/indexer/features_offsets_table.cpp
@@ -1,80 +1,59 @@
 #include "features_offsets_table.hpp"
 
-#include "../../std/string.hpp"
+#include "../coding/file_writer.hpp"
 #include "../base/assert.hpp"
 #include "../base/scope_guard.hpp"
-#include "../coding/file_writer.hpp"
+#include "../../std/string.hpp"
 #include "../defines.hpp"
 
 namespace feature
 {
-  FeaturesOffsetsTable::Builder::Builder()
-  {
-  }
-
-  FeaturesOffsetsTable::Builder::~Builder()
-  {
-  }
-
-  void FeaturesOffsetsTable::Builder::PushOffset(uint64_t offset)
+  void FeaturesOffsetsTable::Builder::PushOffset(uint64_t const offset)
   {
     ASSERT(m_offsets.empty() || m_offsets.back() < offset, ());
     m_offsets.push_back(offset);
   }
 
-  FeaturesOffsetsTable::FeaturesOffsetsTable(
-      succinct::elias_fano::elias_fano_builder & builder)
+  FeaturesOffsetsTable::FeaturesOffsetsTable(succinct::elias_fano::elias_fano_builder & builder)
       : m_table(&builder)
   {
   }
 
-  FeaturesOffsetsTable::FeaturesOffsetsTable(
-      FilesMappingContainer::Handle && handle)
+  FeaturesOffsetsTable::FeaturesOffsetsTable(FilesMappingContainer::Handle && handle)
       : m_handle(move(handle))
   {
     succinct::mapper::map(m_table, m_handle.GetData<char>());
   }
 
-  FeaturesOffsetsTable::~FeaturesOffsetsTable()
-  {
-  }
-
   // static
-  unique_ptr<FeaturesOffsetsTable> FeaturesOffsetsTable::Build(
-      Builder & builder)
+  unique_ptr<FeaturesOffsetsTable> FeaturesOffsetsTable::Build(Builder & builder)
   {
     vector<uint64_t> const & offsets = builder.m_offsets;
 
-    uint64_t numOffsets = offsets.size();
-    uint64_t maxOffset = offsets.empty() ? 0 : offsets.back();
+    uint64_t const numOffsets = offsets.size();
+    uint64_t const maxOffset = offsets.empty() ? 0 : offsets.back();
 
-    succinct::elias_fano::elias_fano_builder elias_fano_builder(maxOffset,
-                                                                numOffsets);
+    succinct::elias_fano::elias_fano_builder elias_fano_builder(maxOffset, numOffsets);
     for (uint64_t offset : offsets)
       elias_fano_builder.push_back(offset);
 
-    return unique_ptr<FeaturesOffsetsTable>(
-        new FeaturesOffsetsTable(elias_fano_builder));
+    return unique_ptr<FeaturesOffsetsTable>(new FeaturesOffsetsTable(elias_fano_builder));
   }
 
   // static
   unique_ptr<FeaturesOffsetsTable> FeaturesOffsetsTable::Load(
       FilesMappingContainer const & container)
   {
-    FilesMappingContainer::Handle handle(
-        container.Map(FEATURES_OFFSETS_TABLE_FILE_TAG));
+    FilesMappingContainer::Handle handle(container.Map(FEATURES_OFFSETS_TABLE_FILE_TAG));
     if (!handle.IsValid())
       return unique_ptr<FeaturesOffsetsTable>();
-    return unique_ptr<FeaturesOffsetsTable>(
-        new FeaturesOffsetsTable(std::move(handle)));
+    return unique_ptr<FeaturesOffsetsTable>(new FeaturesOffsetsTable(std::move(handle)));
   }
 
   void FeaturesOffsetsTable::Save(FilesContainerW & container)
   {
-    string const fileName =
-        container.GetFileName() + "." FEATURES_OFFSETS_TABLE_FILE_TAG;
-    MY_SCOPE_GUARD(deleteFileGuard,
-                   bind(&FileWriter::DeleteFileX, cref(fileName)));
+    string const fileName = container.GetFileName() + "." FEATURES_OFFSETS_TABLE_FILE_TAG;
+    MY_SCOPE_GUARD(deleteFileGuard, bind(&FileWriter::DeleteFileX, cref(fileName)));
     succinct::mapper::freeze(m_table, fileName.c_str());
     container.Write(fileName, FEATURES_OFFSETS_TABLE_FILE_TAG);
   }