summaryrefslogtreecommitdiff
path: root/shared/localization.cpp
diff options
context:
space:
mode:
authorDaniel Wilhelm <daniel@wili.li>2014-04-18 17:14:37 +0200
committerDaniel Wilhelm <daniel@wili.li>2014-04-18 17:14:37 +0200
commit8bf668665b107469086f16cb8ad23e47d479d2b4 (patch)
tree66a91ef06a8caa7cd6819dcbe1860693d3eda8d5 /shared/localization.cpp
parent3.21 (diff)
downloadFreeFileSync-8bf668665b107469086f16cb8ad23e47d479d2b4.tar.gz
FreeFileSync-8bf668665b107469086f16cb8ad23e47d479d2b4.tar.bz2
FreeFileSync-8bf668665b107469086f16cb8ad23e47d479d2b4.zip
4.0
Diffstat (limited to 'shared/localization.cpp')
-rw-r--r--shared/localization.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/shared/localization.cpp b/shared/localization.cpp
index 66b2d97b..73aa5b72 100644
--- a/shared/localization.cpp
+++ b/shared/localization.cpp
@@ -69,7 +69,7 @@ private:
Translation transMapping; //map original text |-> translation
TranslationPlural transMappingPl;
- std::auto_ptr<PluralForm> pluralParser;
+ std::unique_ptr<PluralForm> pluralParser;
wxLanguage langId_;
};
@@ -385,7 +385,7 @@ void zen::setLanguage(int language)
//handle RTL swapping: we need wxWidgets to do this
- static std::auto_ptr<CustomLocale> dummy;
+ static std::unique_ptr<CustomLocale> dummy;
dummy.reset(); //avoid global locale lifetime overlap! wxWidgets cannot handle this and will crash!
dummy.reset(new CustomLocale(languageFile.empty() ? wxLANGUAGE_ENGLISH : language));
bgstack15