Merge branch 'develop'

boostorg · Nov 5, 2023 · fa32a52 · fa32a52
2 parents 51efec4 + a9cea73
commit fa32a52
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 9 deletions.
diff --git a/.appveyor.yml b/.appveyor.yml
@@ -138,7 +138,7 @@ environment:
       CMAKE_FLAGS: -DBOOST_NOWIDE_DISABLE_CIN_TEST=ON
       GENERATOR: Visual Studio 17 2022
       configuration: Debug
-      BOOST_ROOT: C:\Libraries\boost_1_77_0
+      BOOST_ROOT: C:\Libraries\boost_1_83_0
 
     # Coverity
     - COVERITY: true

diff --git a/.azure-pipelines.yml b/.azure-pipelines.yml
@@ -50,8 +50,8 @@ parameters:
       - { compiler: clang-8,   cxxstd: '14,17',    os: ubuntu-20.04 }
       - { compiler: clang-9,   cxxstd: '14,17,2a', os: ubuntu-20.04 }
       - { compiler: clang-10,  cxxstd: '14,17,20', os: ubuntu-20.04 }
-      - { compiler: clang-11,  cxxstd: '14,17,20', os: ubuntu-22.04 }
-      - { compiler: clang-12,  cxxstd: '14,17,20', os: ubuntu-22.04 }
+      - { compiler: clang-11,  cxxstd: '14,17,20', os: ubuntu-20.04 }
+      - { compiler: clang-14,  cxxstd: '14,17,20', os: ubuntu-22.04, gcc_toolchain: 12 }
       - { name: Linux_clang_6_libcxx,
           compiler: clang-6.0, cxxstd: '11,14,17', os: ubuntu-20.04, container: 'ubuntu:18.04', install: 'clang-6.0 libc++-dev libc++abi-dev', env: {B2_STDLIB: libc++ } }
       # OSX
@@ -94,6 +94,8 @@ stages:
               XCODE_APP: /Applications/Xcode_${{ item.xcode }}.app
             ${{ if item.install }}:
               PACKAGES: ${{ item.install }}
+            ${{ if item.gcc_toolchain }}:
+              GCC_TOOLCHAIN: ${{ item.gcc_toolchain }}
             ${{ each var in item.env }}:
               ${{var.Key}}: ${{var.Value}}
           steps:

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -78,8 +78,9 @@ jobs:
           - { compiler: clang-10,  cxxstd: '03,11,14,17,20', os: ubuntu-20.04 }
           - { compiler: clang-11,  cxxstd: '03,11,14,17,20', os: ubuntu-20.04 }
           - { compiler: clang-12,  cxxstd: '03,11,14,17,20', os: ubuntu-20.04 }
-          - { compiler: clang-13,  cxxstd: '03,11,14,17,20', os: ubuntu-22.04 }
-          - { compiler: clang-14,  cxxstd: '03,11,14,17,20', os: ubuntu-22.04 }
+          # Clang isn't compatible with libstdc++-13, so use the slightly older one
+          - { compiler: clang-13,  cxxstd: '03,11,14,17,20', os: ubuntu-22.04, install: 'clang-13 g++-12', gcc_toolchain: 12 }
+          - { compiler: clang-14,  cxxstd: '03,11,14,17,20', os: ubuntu-22.04, install: 'clang-14 g++-12', gcc_toolchain: 12 }
 
           # libc++
           - { compiler: clang-6.0, cxxstd: '03,11,14',       os: ubuntu-22.04, container: 'ubuntu:18.04', stdlib: libc++, install: 'clang-6.0 libc++-dev libc++abi-dev' }
@@ -104,9 +105,9 @@ jobs:
             fi
             if [ -n "${{matrix.container}}" ] && [ -f "/etc/debian_version" ]; then
                 apt-get -o Acquire::Retries=$NET_RETRY_COUNT update
-                apt-get -o Acquire::Retries=$NET_RETRY_COUNT install -y sudo software-properties-common
+                apt-get -o Acquire::Retries=$NET_RETRY_COUNT install -y sudo software-properties-common curl
                 # Need (newer) git, and the older Ubuntu container may require requesting the key manually using port 80
-                apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys E1DD270288B4E6030699E45FA1715D88E1DF1F24
+                curl -sSL --retry ${NET_RETRY_COUNT:-5} 'http://keyserver.ubuntu.com/pks/lookup?op=get&search=0xE1DD270288B4E6030699E45FA1715D88E1DF1F24' | sudo gpg --dearmor > /etc/apt/trusted.gpg.d/git-core_ubuntu_ppa.gpg
                 for i in {1..${NET_RETRY_COUNT:-3}}; do sudo -E add-apt-repository -y ppa:git-core/ppa && break || sleep 10; done
                 apt-get -o Acquire::Retries=$NET_RETRY_COUNT update
                 apt-get -o Acquire::Retries=$NET_RETRY_COUNT install -y g++ python libpython-dev git

diff --git a/test/test_fs.cpp b/test/test_fs.cpp
@@ -13,10 +13,15 @@
 #include <boost/nowide/convert.hpp>
 #include <boost/nowide/cstdio.hpp>
 #include <boost/nowide/fstream.hpp>
-#include <boost/nowide/quoted.hpp>
 #include <boost/nowide/utf/convert.hpp>
 #include "test.hpp"
-#include <iomanip>
+
+#include <iomanip> // Required for feature macro check below
+// Conditional include to avoid warning/message
+#if defined(__cpp_lib_quoted_string_io) && __cpp_lib_quoted_string_io >= 201304
+#include <boost/nowide/quoted.hpp>
+#endif
+
 #include <sstream>
 #include <type_traits>
 #if defined(_MSC_VER)