boost/nowide
2
0
Fork 0
mirror of https://github.com/boostorg/nowide.git synced 2026-02-21 15:12:30 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #67 from boostorg/return_old_locale

Browse Source 
Return old locale from nowide_filesystem
This commit is contained in:
Alexander Grund
2020-02-19 14:19:44 +01:00
committed by GitHub
parent 514d027ba7 636c813b1a
commit c8e387ab8b
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.github/workflows/ci_tests.yml vendored
View File

@@ -66,7 +66,7 @@ jobs:
./b2 link=static toolset=$toolset address-model=64 -j$(nproc) --prefix="$BOOST_ROOT" install
cd "$DEP_DIR"
# Workaround for "Device or resource busy" error
if ! rm -r build; then sleep 30s; rm -r build; fi
if ! rm -r build; then sleep 30s; rm -r build || true; fi
- name: Configure
working-directory: build
run: cmake .. -DBoost_DEBUG=ON -DCMAKE_BUILD_TYPE=${{matrix.buildType}} -DBUILD_SHARED_LIBS=${{matrix.shared_lib}} -DCMAKE_INSTALL_PREFIX=${{runner.workspace}}/../install -G "${{matrix.generator}}" -DCMAKE_SH="CMAKE_SH-NOTFOUND" -DBoost_NO_BOOST_CMAKE=ON

4
include/boost/nowide/integration/filesystem.hpp
View File

@@ -18,10 +18,10 @@ namespace nowide {
///
/// Install utf8_codecvt facet into boost::filesystem::path such all char strings are interpreted as utf-8 strings
///
inline void nowide_filesystem()
inline std::locale nowide_filesystem()
{
std::locale tmp = std::locale(std::locale(), new boost::nowide::utf8_codecvt<wchar_t>());
boost::filesystem::path::imbue(tmp);
return boost::filesystem::path::imbue(tmp);
}
} // namespace nowide
} // namespace boost