diff --git a/drape/texture_of_colors.cpp b/drape/texture_of_colors.cpp index 6e5da04ab5..ead21d2931 100644 --- a/drape/texture_of_colors.cpp +++ b/drape/texture_of_colors.cpp @@ -1,5 +1,7 @@ #include "texture_of_colors.hpp" +#include "../base/stl_add.hpp" + namespace dp { @@ -11,9 +13,7 @@ ColorPalette::ColorPalette(m2::PointU const & canvasSize) ColorPalette::~ColorPalette() { - TPalette::iterator it = m_palette.begin(); - for (; it != m_palette.end(); ++it) - it->second.Destroy(); + DeleteRange(m_palette, MasterPointerDeleter()); } ColorResourceInfo const * ColorPalette::MapResource(const ColorKey &key) diff --git a/drape/texture_of_colors.hpp b/drape/texture_of_colors.hpp index d31d5a4269..95b10ce106 100644 --- a/drape/texture_of_colors.hpp +++ b/drape/texture_of_colors.hpp @@ -35,9 +35,7 @@ public: private: typedef MasterPointer TResourcePtr; typedef map TPalette; - typedef pair TInserted; - void Move(uint32_t step); TPalette m_palette; vector m_pendingNodes; m2::PointU m_textureSize;