diff options
| author | Mikhail Gorbushin <m.gorbushin@corp.mail.ru> | 2018-08-31 11:35:44 +0300 |
|---|---|---|
| committer | Vlad Mihaylenko <vxmihaylenko@gmail.com> | 2018-08-31 15:34:54 +0300 |
| commit | 7b1b6d68940678abe4b182e7eaab425f8e8f5bfa (patch) | |
| tree | 1a60cef3101193a11f346727ead8f8dd1a58199d /drape | |
| parent | e73f3c434b1040685c365383baebab93411205bb (diff) | |
remove my::make_unique
Diffstat (limited to 'drape')
| -rw-r--r-- | drape/drape_tests/glyph_mng_tests.cpp | 4 | ||||
| -rw-r--r-- | drape/glyph_manager.cpp | 4 |
2 files changed, 3 insertions, 5 deletions
diff --git a/drape/drape_tests/glyph_mng_tests.cpp b/drape/drape_tests/glyph_mng_tests.cpp index 8ba3689f36..ad156dc0ba 100644 --- a/drape/drape_tests/glyph_mng_tests.cpp +++ b/drape/drape_tests/glyph_mng_tests.cpp @@ -5,8 +5,6 @@ #include "platform/platform.hpp" -#include "base/stl_add.hpp" - #include <QtGui/QPainter> #include "qt_tstfrm/test_main_loop.hpp" @@ -31,7 +29,7 @@ public: args.m_blacklist = "fonts_blacklist.txt"; GetPlatform().GetFontNames(args.m_fonts); - m_mng = my::make_unique<dp::GlyphManager>(args); + m_mng = std::make_unique<dp::GlyphManager>(args); } void RenderGlyphs(QPaintDevice * device) diff --git a/drape/glyph_manager.cpp b/drape/glyph_manager.cpp index b8bceabc27..781bf31295 100644 --- a/drape/glyph_manager.cpp +++ b/drape/glyph_manager.cpp @@ -410,8 +410,8 @@ GlyphManager::GlyphManager(GlyphManager::Params const & params) std::vector<FT_ULong> charCodes; try { - m_impl->m_fonts.emplace_back(my::make_unique<Font>(params.m_sdfScale, GetPlatform().GetReader(fontName), - m_impl->m_library)); + m_impl->m_fonts.emplace_back(std::make_unique<Font>(params.m_sdfScale, GetPlatform().GetReader(fontName), + m_impl->m_library)); m_impl->m_fonts.back()->GetCharcodes(charCodes); } catch(RootException const & e) |