Platform::GetReader returns unique_ptr. Fix leaks.

1 files changed, 17 insertions, 18 deletions

diff --git a/indexer/classificator_loader.cpp b/indexer/classificator_loader.cpp
index 6387be4d00..54acb5930d 100644
--- a/indexer/classificator_loader.cpp
+++ b/indexer/classificator_loader.cpp
@@ -14,29 +14,29 @@
 
 namespace
 {
-  void ReadCommon(Reader * classificator,
-                  Reader * types)
-  {
-    Classificator & c = classif();
-    c.Clear();
+void ReadCommon(unique_ptr<Reader> classificator,
+                unique_ptr<Reader> types)
+{
+  Classificator & c = classif();
+  c.Clear();
 
-    {
-      //LOG(LINFO, ("Reading classificator"));
-      ReaderStreamBuf buffer(classificator);
+  {
+    //LOG(LINFO, ("Reading classificator"));
+    ReaderStreamBuf buffer(move(classificator));
 
-      istream s(&buffer);
-      c.ReadClassificator(s);
-    }
+    istream s(&buffer);
+    c.ReadClassificator(s);
+  }
 
-    {
-      //LOG(LINFO, ("Reading types mapping"));
-      ReaderStreamBuf buffer(types);
+  {
+    //LOG(LINFO, ("Reading types mapping"));
+    ReaderStreamBuf buffer(move(types));
 
-      istream s(&buffer);
-      c.ReadTypesMapping(s);
-    }
+    istream s(&buffer);
+    c.ReadTypesMapping(s);
   }
 }
+}
 
 namespace classificator
 {
@@ -55,7 +55,6 @@ namespace classificator
       if (mapStyle != MapStyleMerged || originMapStyle == MapStyleMerged)
       {
         GetStyleReader().SetCurrentStyle(mapStyle);
-
         ReadCommon(p.GetReader("classificator.txt"),
                    p.GetReader("types.txt"));