From baf19dc56c601b3e36d486c2e6bf7b5cd7fe4524 Mon Sep 17 00:00:00 2001 From: Alexander Grund Date: Mon, 10 Feb 2020 15:12:08 +0100 Subject: [PATCH 1/2] Return old locale from nowide_filesystem --- include/boost/nowide/integration/filesystem.hpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/include/boost/nowide/integration/filesystem.hpp b/include/boost/nowide/integration/filesystem.hpp index e06c688..2dd1ccc 100644 --- a/include/boost/nowide/integration/filesystem.hpp +++ b/include/boost/nowide/integration/filesystem.hpp @@ -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()); - boost::filesystem::path::imbue(tmp); + return boost::filesystem::path::imbue(tmp); } } // namespace nowide } // namespace boost From 636c813b1a5027c6596470d0c035f2f4d4d20ed9 Mon Sep 17 00:00:00 2001 From: Alexander Grund Date: Mon, 10 Feb 2020 19:12:44 +0100 Subject: [PATCH 2/2] [CI] Don't fail if build dir can't be removed --- .github/workflows/ci_tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci_tests.yml b/.github/workflows/ci_tests.yml index 38bf859..6683bd5 100644 --- a/.github/workflows/ci_tests.yml +++ b/.github/workflows/ci_tests.yml @@ -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