Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/mapsme/omim.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'generator/osm_source.cpp')
-rw-r--r--generator/osm_source.cpp6
1 files changed, 4 insertions, 2 deletions
diff --git a/generator/osm_source.cpp b/generator/osm_source.cpp
index 64eac80005..2a3f1cab94 100644
--- a/generator/osm_source.cpp
+++ b/generator/osm_source.cpp
@@ -29,6 +29,8 @@
#include "defines.hpp"
+using namespace std;
+
SourceReader::SourceReader()
: m_file(unique_ptr<istream, Deleter>(&cin, Deleter(false)))
{
@@ -336,7 +338,7 @@ public:
new feature::FeaturesCollector(info.GetTmpFileName(WORLD_COASTS_FILE_NAME)));
if (info.m_splitByPolygons || !info.m_fileName.empty())
- m_countries = make_unique<TCountriesGenerator>(info);
+ m_countries = my::make_unique<TCountriesGenerator>(info);
if (info.m_createWorld)
m_world.reset(new TWorldGenerator(info));
@@ -527,7 +529,7 @@ private:
unique_ptr<EmitterBase> MakeMainFeatureEmitter(feature::GenerateInfo const & info)
{
LOG(LINFO, ("Processing booking data from", info.m_bookingDatafileName, "done."));
- return make_unique<MainFeaturesEmitter>(info);
+ return my::make_unique<MainFeaturesEmitter>(info);
}
template <typename TElement, typename TCache>