Index: ps/trunk/source/i18n/L10n.h =================================================================== --- ps/trunk/source/i18n/L10n.h +++ ps/trunk/source/i18n/L10n.h @@ -480,11 +480,6 @@ Status ReloadChangedFile(const VfsPath& path); private: - struct DictionaryDeleter - { - void operator()(tinygettext::Dictionary* dictionary); - }; - /** * Dictionary that contains the translations for the * @link L10n::GetCurrentLocale() current locale@endlink and the matching @@ -492,7 +487,7 @@ * * @sa LoadDictionaryForCurrentLocale() */ - std::unique_ptr m_Dictionary; + std::unique_ptr m_Dictionary; /** * Locale that the game is currently using. Index: ps/trunk/source/i18n/L10n.cpp =================================================================== --- ps/trunk/source/i18n/L10n.cpp +++ ps/trunk/source/i18n/L10n.cpp @@ -134,13 +134,8 @@ } // anonymous namespace -void L10n::DictionaryDeleter::operator()(tinygettext::Dictionary* dictionary) -{ - delete dictionary; -} - L10n::L10n() - : m_Dictionary(new tinygettext::Dictionary()) + : m_Dictionary(std::make_unique()) { // Determine whether or not to print tinygettext messages to the standard // error output, which it tinygettext's default behavior, but not ours. @@ -567,7 +562,7 @@ void L10n::LoadDictionaryForCurrentLocale() { - m_Dictionary.reset(new tinygettext::Dictionary()); + m_Dictionary = std::make_unique(); VfsPaths filenames; if (m_UseLongStrings)