Mercurial > hg > orthanc
comparison Core/Toolbox.cpp @ 2373:68380777f9a6
fix
author | Sebastien Jodogne <s.jodogne@gmail.com> |
---|---|
date | Tue, 22 Aug 2017 21:51:24 +0200 |
parents | 2aff870c2c58 |
children | cad393b41bc3 |
comparison
equal
deleted
inserted
replaced
2372:39600af9fec3 | 2373:68380777f9a6 |
---|---|
1324 | 1324 |
1325 void Toolbox::FinalizeGlobalLocale() | 1325 void Toolbox::FinalizeGlobalLocale() |
1326 { | 1326 { |
1327 globalLocale_.reset(); | 1327 globalLocale_.reset(); |
1328 } | 1328 } |
1329 #endif | |
1330 | 1329 |
1331 | 1330 |
1332 std::string Toolbox::ToUpperCaseWithAccents(const std::string& source) | 1331 std::string Toolbox::ToUpperCaseWithAccents(const std::string& source) |
1333 { | 1332 { |
1334 if (globalLocale_.get() == NULL) | 1333 if (globalLocale_.get() == NULL) |
1366 | 1365 |
1367 std::wstring w = boost::locale::conv::utf_to_utf<wchar_t>(source); | 1366 std::wstring w = boost::locale::conv::utf_to_utf<wchar_t>(source); |
1368 w = boost::algorithm::to_upper_copy<std::wstring>(w, *globalLocale_); | 1367 w = boost::algorithm::to_upper_copy<std::wstring>(w, *globalLocale_); |
1369 return boost::locale::conv::utf_to_utf<char>(w); | 1368 return boost::locale::conv::utf_to_utf<char>(w); |
1370 } | 1369 } |
1370 #endif | |
1371 } | 1371 } |