pastk/organicmaps
1
Fork 0
forked from organicmaps/organicmaps
Code Pull requests Activity

Use our std headers instead of native <boost/...>

Browse source
This commit is contained in:
vng 2011-03-06 16:14:47 +02:00 • committed by Alex Zolotarev
parent 6759a25348
commit c3c1269232
1 changed files with 4 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
indexer/indexer_tool/world_map_generator.hpp
View file

@ -11,13 +11,10 @@
#include "../../indexer/point_to_int64.hpp"
#include "../../std/map.hpp"
#include "../../std/list.hpp"
#include "../../std/vector.hpp"
#include "../../std/functional.hpp"
#include "../../std/iostream.hpp"
#include <boost/scoped_ptr.hpp>
#include <boost/unordered_map.hpp>
#include "../../std/scoped_ptr.hpp"
#include "../../std/unordered_map.hpp"
namespace m2
{
@ -31,7 +28,7 @@ template <class FeatureOutT>
class WorldMapGenerator
{
/// if NULL, separate world data file is not generated
boost::scoped_ptr<FeatureOutT> m_worldBucket;
scoped_ptr<FeatureOutT> m_worldBucket;
/// features visible before or at this scale level will go to World map
int m_maxWorldScale;
bool m_mergeCoastlines;
@ -39,7 +36,7 @@ class WorldMapGenerator
size_t m_mergedCounter;
size_t m_areasCounter;
typedef boost::unordered_map<m2::PointD, FeatureBuilder1Merger> FeaturesContainerT;
typedef unordered_map<m2::PointD, FeatureBuilder1Merger> FeaturesContainerT;
typedef map<vector<uint32_t>, FeaturesContainerT> TypesContainerT;
TypesContainerT m_features;