From baf239aef8bfbc76b2e1b09c5dc59b8463160a3b Mon Sep 17 00:00:00 2001
From: Alex Zolotarev <alex@mapswithme.com>
Date: Thu, 7 Aug 2014 00:45:40 +0300
Subject: [c++11] Migrated from scoped_ptr to unique_ptr

---
 generator/feature_generator.cpp | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

(limited to 'generator/feature_generator.cpp')

diff --git a/generator/feature_generator.cpp b/generator/feature_generator.cpp
index 7030057436..5550812b3b 100644
--- a/generator/feature_generator.cpp
+++ b/generator/feature_generator.cpp
@@ -260,11 +260,11 @@ class MainFeaturesEmitter
 {
   typedef WorldMapGenerator<FeaturesCollector> WorldGenerator;
   typedef CountryMapGenerator<Polygonizer<FeaturesCollector> > CountriesGenerator;
-  scoped_ptr<CountriesGenerator> m_countries;
-  scoped_ptr<WorldGenerator> m_world;
+  unique_ptr<CountriesGenerator> m_countries;
+  unique_ptr<WorldGenerator> m_world;
 
-  scoped_ptr<CoastlineFeaturesGenerator> m_coasts;
-  scoped_ptr<FeaturesCollector> m_coastsHolder;
+  unique_ptr<CoastlineFeaturesGenerator> m_coasts;
+  unique_ptr<FeaturesCollector> m_coastsHolder;
 
   string m_srcCoastsFile;
 
@@ -335,9 +335,7 @@ public:
     }
 
     if (info.m_createWorld)
-    {
       m_world.reset(new WorldGenerator(info));
-    }
   }
 
   void operator() (FeatureBuilder1 fb)
-- 
cgit v1.2.3