From cebeb4ea5f62b114f86d1de94dad0fedeccf4d67 Mon Sep 17 00:00:00 2001
From: Peter Dimov <pdimov@gmail.com>
Date: Tue, 21 Dec 2021 00:46:45 +0200
Subject: [PATCH 1/2] Update test/Jamfile

---
 test/Jamfile.v2 | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/test/Jamfile.v2 b/test/Jamfile.v2
index 23022e3f..68617f89 100644
--- a/test/Jamfile.v2
+++ b/test/Jamfile.v2
@@ -7,13 +7,13 @@ import testing ;
 
 project unordered-test/unordered
     : requirements
-        <warnings>all
+        <warnings>pedantic
         <toolset>intel:<warnings>on
         # Would be nice to define -Wundef, but I'm getting warnings from
         # Boost.Preprocessor on trunk.
-        <toolset>gcc:<cxxflags>"-pedantic -Wstrict-aliasing -fstrict-aliasing -Wextra -Wsign-promo -Wunused-parameter -Wconversion -Wfloat-equal -Wshadow -Wno-variadic-macros"
-        <toolset>darwin:<cxxflags>"-pedantic -Wstrict-aliasing -fstrict-aliasing -Wextra -Wsign-promo -Wunused-parameter -Wconversion -Wfloat-equal -Wshadow"
-        <toolset>clang:<cxxflags>"-pedantic -Wstrict-aliasing -fstrict-aliasing -Wextra -Wsign-promo -Wunused-parameter -Wsign-conversion -Wconversion -Wfloat-equal -Wshadow -Wno-c99-extensions -Wno-variadic-macros"
+        <toolset>gcc:<cxxflags>"-Wstrict-aliasing -fstrict-aliasing -Wsign-promo -Wunused-parameter -Wconversion -Wfloat-equal -Wshadow -Wno-variadic-macros"
+        <toolset>darwin:<cxxflags>"-Wstrict-aliasing -fstrict-aliasing -Wsign-promo -Wunused-parameter -Wconversion -Wfloat-equal -Wshadow"
+        <toolset>clang:<cxxflags>"-Wstrict-aliasing -fstrict-aliasing -Wsign-promo -Wunused-parameter -Wsign-conversion -Wconversion -Wfloat-equal -Wshadow -Wno-c99-extensions -Wno-variadic-macros"
         <toolset>msvc:<cxxflags>"/wd4494"
         <toolset>gcc:<c++-template-depth>500
     ;

From 8d98d8752b1bdd0724f3cabdbb49f9137a49084a Mon Sep 17 00:00:00 2001
From: Peter Dimov <pdimov@gmail.com>
Date: Tue, 21 Dec 2021 00:47:54 +0200
Subject: [PATCH 2/2] Remove msvc-14.2 from Appveyor (in GHA); split clang-win
 to avoid timeout

---
 .appveyor.yml | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/.appveyor.yml b/.appveyor.yml
index 1ec2cd97..2f34e41a 100644
--- a/.appveyor.yml
+++ b/.appveyor.yml
@@ -25,12 +25,16 @@ environment:
       CXXSTD: 14,17
       ADDRMD: 32,64
     - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019
-      TOOLSET: msvc-14.2
-      CXXSTD: 14,17,latest
+      TOOLSET: clang-win
+      CXXSTD: 14
       ADDRMD: 32,64
     - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019
       TOOLSET: clang-win
-      CXXSTD: 14,17,latest
+      CXXSTD: 17
+      ADDRMD: 32,64
+    - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019
+      TOOLSET: clang-win
+      CXXSTD: latest
       ADDRMD: 32,64
 
 install: