Add some more windows checks, remove outdated CI tests

(Xenial is no longer supported).

.github/workflows/ci.yml

@@ -108,57 +108,6 @@ jobs:
       - name: Test
         run: ../../../b2 toolset=$TOOLSET define=CI_SUPPRESS_KNOWN_ISSUES define=SLOW_COMPILER
         working-directory: ../boost-root/libs/regex/test
-  ubuntu-xenial:
-    runs-on: ubuntu-16.04
-    strategy:
-      fail-fast: false
-      matrix:
-        compiler: [ g++-5, g++-6, clang++-5.0, clang++-6.0 ]
-        standard: [ c++03 c++11, c++14, c++1z ]
-    steps:
-      - uses: actions/checkout@v2
-        with:
-          fetch-depth: '0'
-      - uses: mstachniuk/ci-skip@v1
-        with:
-          commit-filter: '[skip ci];[ci skip];[CI SKIP];[SKIP CI];***CI SKIP***;***SKIP CI***;[windows];[Windows];[WINDOWS];[apple];[Apple];[APPLE]'
-          commit-filter-separator: ';'
-          fail-fast: true
-      - name: Set TOOLSET
-        run: echo ${{ matrix.compiler }} | awk '/^g/ { print "TOOLSET=gcc" } /^clang/ { print "TOOLSET=clang" }' >> $GITHUB_ENV
-      - name: Add repository
-        run: sudo apt-add-repository -y "ppa:ubuntu-toolchain-r/test"
-      - name: Install packages
-        run: sudo apt install g++-5 g++-6 clang-5.0 clang-6.0
-      - name: Checkout main boost
-        run: git clone -b develop --depth 1 https://github.com/boostorg/boost.git ../boost-root
-      - name: Update tools/boostdep
-        run: git submodule update --init tools/boostdep
-        working-directory: ../boost-root
-      - name: Copy files
-        run: cp -r $GITHUB_WORKSPACE/* libs/regex
-        working-directory: ../boost-root
-      - name: Install deps
-        run: python tools/boostdep/depinst/depinst.py -I example -g "--jobs 3" regex
-        working-directory: ../boost-root
-      - name: Bootstrap
-        run: ./bootstrap.sh
-        working-directory: ../boost-root
-      - name: Generate headers
-        run: ./b2 headers
-        working-directory: ../boost-root
-      - name: Generate user config
-        run: 'echo "using $TOOLSET : : ${{ matrix.compiler }} : <cxxflags>-std=${{ matrix.standard }} ;" > ~/user-config.jam'
-        working-directory: ../boost-root
-      - name: Config info install
-        run: ../../../b2 config_info_travis_install toolset=$TOOLSET
-        working-directory: ../boost-root/libs/config/test
-      - name: Config info
-        run: ./config_info_travis
-        working-directory: ../boost-root/libs/config/test
-      - name: Test
-        run: ../../../b2 toolset=$TOOLSET
-        working-directory: ../boost-root/libs/regex/test
   macos:
     runs-on: macos-latest
     strategy:

test/Jamfile.v2

@@ -224,3 +224,8 @@ compile test_warnings.cpp
          <define>BOOST_REGEX_STANDALONE
          [ check-target-builds ../build//is_legacy_03 : : <build>no ]
    :  test_warnings_standalone ;
+
+compile test_windows_defs_1.cpp ;
+compile test_windows_defs_2.cpp ;
+compile test_windows_defs_3.cpp ;
+compile test_windows_defs_4.cpp ;

test/test_windows_defs_1.cpp

@@ -0,0 +1,29 @@
+/*
+*
+* Copyright (c) 2021
+* John Maddock
+*
+* Use, modification and distribution are subject to the
+* Boost Software License, Version 1.0. (See accompanying file
+* LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
+*
+*/
+
+#if defined(_WIN32) && !defined(BOOST_REGEX_NO_W32)
+//
+// Make sure our forward declarations match those in windows.h:
+//
+
+#define STRICT
+
+#include <boost/regex.hpp>
+#include <windows.h>
+
+void test_proc()
+{
+   std::string text, re;
+   boost::regex exp(re);
+   regex_match(text, exp);
+}
+
+#endif

test/test_windows_defs_2.cpp

@@ -0,0 +1,29 @@
+/*
+*
+* Copyright (c) 2021
+* John Maddock
+*
+* Use, modification and distribution are subject to the
+* Boost Software License, Version 1.0. (See accompanying file
+* LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
+*
+*/
+
+#if defined(_WIN32) && !defined(BOOST_REGEX_NO_W32)
+//
+// Make sure our forward declarations match those in windows.h:
+//
+
+#define NO_STRICT
+
+#include <boost/regex.hpp>
+#include <windows.h>
+
+void test_proc()
+{
+   std::string text, re;
+   boost::regex exp(re);
+   regex_match(text, exp);
+}
+
+#endif

test/test_windows_defs_3.cpp

@@ -0,0 +1,27 @@
+/*
+*
+* Copyright (c) 2021
+* John Maddock
+*
+* Use, modification and distribution are subject to the
+* Boost Software License, Version 1.0. (See accompanying file
+* LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
+*
+*/
+
+#if defined(_WIN32) && !defined(BOOST_REGEX_NO_W32)
+//
+// Make sure our forward declarations match those in windows.h:
+//
+
+#include <windows.h>
+#include <boost/regex.hpp>
+
+void test_proc()
+{
+   std::string text, re;
+   boost::regex exp(re);
+   regex_match(text, exp);
+}
+
+#endif

test/test_windows_defs_4.cpp

@@ -0,0 +1,28 @@
+/*
+*
+* Copyright (c) 2021
+* John Maddock
+*
+* Use, modification and distribution are subject to the
+* Boost Software License, Version 1.0. (See accompanying file
+* LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
+*
+*/
+
+#if defined(_WIN32) && !defined(BOOST_REGEX_NO_W32)
+//
+// Make sure our forward declarations match those in windows.h:
+//
+#define STRICT
+#define BOOST_NO_ANSI_APIS
+#include <boost/regex.hpp>
+#include <windows.h>
+
+void test_proc()
+{
+   std::string text, re;
+   boost::regex exp(re);
+   regex_match(text, exp);
+}
+
+#endif