diff options
author | Alex Zolotarev <alex@mapswithme.com> | 2014-08-07 01:45:40 +0400 |
---|---|---|
committer | Alex Zolotarev <alex@maps.me> | 2015-09-23 02:25:03 +0300 |
commit | baf239aef8bfbc76b2e1b09c5dc59b8463160a3b (patch) | |
tree | c9896e450a4a8a7113b94a74809d7dbc7cb98eeb /generator/feature_generator.cpp | |
parent | 180657e756fefbe5d601c64b860ee470217b4956 (diff) |
[c++11] Migrated from scoped_ptr to unique_ptr
Diffstat (limited to 'generator/feature_generator.cpp')
-rw-r--r-- | generator/feature_generator.cpp | 10 |
1 files changed, 4 insertions, 6 deletions
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) |