Fix C++20 incompatibility from using exception specifications.

C++20 removed support for `throw()` exception specifications, so at
least clang-19 is now emitting errors on them. Replaced exception
specifications with BOOST_NOEXCEPT_OR_NOTHROW, which converts `throw()`
to `noexcept`, but keeps the code formally compatible with C++03.

.github/workflows/ci.yml

@@ -116,33 +116,24 @@ jobs:
           - toolset: clang
             compiler: clang++-13
             cxxstd: "11,14,17,20,2b"
-            container: ubuntu:22.04
-            os: ubuntu-latest
+            os: ubuntu-22.04
             install: clang-13
           - toolset: clang
             compiler: clang++-14
             cxxstd: "11,14,17,20,2b"
-            container: ubuntu:22.04
-            os: ubuntu-latest
+            os: ubuntu-22.04
             install: clang-14
           - toolset: clang
             compiler: clang++-15
             cxxstd: "11,14,17,20,2b"
-            container: ubuntu:22.04
-            os: ubuntu-latest
+            os: ubuntu-22.04
             install: clang-15
           - toolset: clang
             compiler: clang++-16
             cxxstd: "11,14,17,20,2b"
+            os: ubuntu-latest
             container: ubuntu:23.04
-            os: ubuntu-latest
             install: clang-16
-          - toolset: clang
-            compiler: clang++-17
-            cxxstd: "11,14,17,20,2b"
-            container: ubuntu:23.10
-            os: ubuntu-latest
-            install: clang-17
           - toolset: clang
             cxxstd: "11,14,17,2a"
             os: macos-11
@@ -236,7 +227,7 @@ jobs:
     runs-on: ${{matrix.os}}
 
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v3
 
       - name: Setup Boost
         shell: cmd
@@ -280,7 +271,7 @@ jobs:
     runs-on: ${{matrix.os}}
 
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v3
 
       - name: Install packages
         if: matrix.install
@@ -328,7 +319,7 @@ jobs:
     runs-on: ${{matrix.os}}
 
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v3
 
       - name: Install packages
         if: matrix.install
@@ -386,7 +377,7 @@ jobs:
     runs-on: ${{matrix.os}}
 
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v3
 
       - name: Install packages
         if: matrix.install
@@ -439,7 +430,7 @@ jobs:
     runs-on: ${{matrix.os}}
 
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v3
 
       - name: Setup Boost
         shell: cmd
@@ -488,7 +479,7 @@ jobs:
     runs-on: ${{matrix.os}}
 
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v3
 
       - name: Setup Boost
         shell: cmd
@@ -555,7 +546,7 @@ jobs:
     runs-on: ${{matrix.os}}
 
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v3
 
       - name: Setup Boost
         shell: cmd

appveyor.yml

@@ -1,68 +1,78 @@
-# Copyright 2016-2019 Peter Dimov
+# Copyright 2016, 2017 Peter Dimov
+# Copyright (C) 2017, 2018 James E. King III
 # Distributed under the Boost Software License, Version 1.0.
 # (See accompanying file LICENSE_1_0.txt or copy at http://boost.org/LICENSE_1_0.txt)
 
+# When copying this to a new library, be sure to update the name of the library
+# in two places (once each at the top of install: and test_script:)
+
 version: 1.0.{build}-{branch}
 
 shallow_clone: true
 
 branches:
   only:
-    - master
     - develop
-    - /feature\/.*/
+    - master
+
+matrix:
+  allow_failures:
+    - MAYFAIL: true
 
 environment:
+  global:
+    APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
+    # see: http://www.boost.org/build/doc/html/bbv2/overview/invocation.html#bbv2.overview.invocation.properties
+    # to use the default for a given environment, comment it out; recommend you build debug and release however..
+    # on Windows it is important to exercise all the possibilities, especially shared vs static
+    # B2_ADDRESS_MODEL: address-model=64,32
+    # B2_LINK: link=shared,static
+    # B2_THREADING: threading=multi,single
+    B2_VARIANT: variant=release,debug
+    CXXSTD: 03
+
   matrix:
-    - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
-      TOOLSET: msvc-14.0
-      CXXSTD: 14,latest
-      ADDRMD: 32,64
-    - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
+    - FLAVOR: Visual Studio 2017
       TOOLSET: msvc-14.1
-      CXXSTD: 14,17,latest
-      ADDRMD: 32,64
-    - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
-      TOOLSET: clang-win
-      CXXSTD: 14,17,latest
-      ADDRMD: 64
-    - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019
-      TOOLSET: clang-win
-      CXXSTD: 14,17,20,latest
-      ADDRMD: 64
-    - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
-      ADDPATH: C:\cygwin\bin;
-      TOOLSET: gcc
-      CXXSTD: 11,14,1z
-    - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
+      B2_ADDRESS_MODEL: address-model=64,32
+    - FLAVOR: Visual Studio 2013
+      APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2013
+      TOOLSET: msvc-12.0
+    - FLAVOR:  mingw32
+      ARCH:    i686
+      B2_ADDRESS_MODEL: address-model=32
+      SCRIPT:  ci\mingw.bat
+    - FLAVOR:  mingw64
+      ARCH:    x86_64
+      B2_ADDRESS_MODEL: address-model=64
+      SCRIPT:  ci\mingw.bat
+    - FLAVOR: cygwin (64-bit)
       ADDPATH: C:\cygwin64\bin;
+      B2_ADDRESS_MODEL: address-model=64
       TOOLSET: gcc
-      CXXSTD: 11,14,1z
-    - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019
-      ADDPATH: C:\mingw-w64\i686-8.1.0-posix-dwarf-rt_v6-rev0\mingw32\bin;
+      MAYFAIL: true
+    - FLAVOR: cygwin (32-bit)
+      ADDPATH: C:\cygwin\bin;
+      B2_ADDRESS_MODEL: address-model=32
       TOOLSET: gcc
-      CXXSTD: 11,14,17,2a
-    - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019
-      ADDPATH: C:\mingw-w64\x86_64-8.1.0-posix-seh-rt_v6-rev0\mingw64\bin;
-      TOOLSET: gcc
-      CXXSTD: 11,14,17,2a
+      MAYFAIL: true
 
 install:
-  - set BOOST_BRANCH=develop
-  - if "%APPVEYOR_REPO_BRANCH%" == "master" set BOOST_BRANCH=master
+  - set SELF=program_options
   - cd ..
-  - git clone -b %BOOST_BRANCH% --depth 1 https://github.com/boostorg/boost.git boost-root
+  - git clone -b %APPVEYOR_REPO_BRANCH% --depth 1 https://github.com/boostorg/boost.git boost-root
   - cd boost-root
-  - git submodule update --init tools/boostdep
-  - xcopy /s /e /q %APPVEYOR_BUILD_FOLDER% libs\program_options\
-  - python tools/boostdep/depinst/depinst.py program_options
+  - git submodule update -q --init tools/boostdep
+  - git submodule update -q --init tools/build
+  - git submodule update -q --init tools/inspect
+  - xcopy /s /e /q %APPVEYOR_BUILD_FOLDER% libs\%SELF%
+  - python tools/boostdep/depinst/depinst.py --include example %SELF%
   - cmd /c bootstrap
-  - b2 -d0 headers
+  - b2 headers
 
 build: off
 
 test_script:
+  - set SELF=program_options
   - PATH=%ADDPATH%%PATH%
-  - if not "%CXXSTD%" == "" set CXXSTD=cxxstd=%CXXSTD%
-  - if not "%ADDRMD%" == "" set ADDRMD=address-model=%ADDRMD%
-  - b2 -j3 libs/program_options/test toolset=%TOOLSET% %CXXSTD% %ADDRMD% variant=debug,release
+  - IF DEFINED SCRIPT (call libs\%SELF%\%SCRIPT%) ELSE (b2 libs/%SELF% toolset=%TOOLSET% cxxstd=%CXXSTD% %CXXFLAGS% %DEFINES% %B2_ADDRESS_MODEL% %B2_LINK% %B2_THREADING% %B2_VARIANT% -j3)

include/boost/program_options/detail/value_semantic.hpp

@@ -8,10 +8,6 @@
 
 #include <boost/throw_exception.hpp>
 
-#ifndef BOOST_NO_CXX17_HDR_OPTIONAL
-#   include <optional>
-#endif
-
 // forward declaration
 namespace boost { template<class T> class optional; }
 
@@ -173,22 +169,6 @@ namespace boost { namespace program_options {
         v = boost::any(boost::optional<T>(boost::any_cast<T>(a)));
     }
 
-#ifndef BOOST_NO_CXX17_HDR_OPTIONAL
-    /** Validates std::optional arguments. */
-    template<class T, class charT>
-    void validate(boost::any& v,
-                  const std::vector<std::basic_string<charT> >& s,
-                  std::optional<T>*,
-                  int)
-    {
-        validators::check_first_occurrence(v);
-        validators::get_single_string(s);
-        boost::any a;
-        validate(a, s, (T*)0, 0);
-        v = boost::any(std::optional<T>(boost::any_cast<T>(a)));
-    }
-#endif
-
     template<class T, class charT>
     void 
     typed_value<T, charT>::

test/optional_test.cpp

@@ -7,9 +7,6 @@ namespace po = boost::program_options;
 
 #include <boost/optional.hpp>
 
-#ifndef BOOST_NO_CXX17_HDR_OPTIONAL
-#   include <optional>
-#endif
 #include <string>
 
 #include "minitest.hpp"
@@ -22,10 +19,9 @@ std::vector<std::string> sv(const char* array[], unsigned size)
     return r;
 }
 
-template<template<typename> class OptionalType>
 void test_optional()
 {
-    OptionalType<int> foo, bar, baz;
+    boost::optional<int> foo, bar, baz;
 
     po::options_description desc;
     desc.add_options()
@@ -52,9 +48,6 @@ void test_optional()
 
 int main(int, char*[])
 {
-    test_optional<boost::optional>();
-#ifndef BOOST_NO_CXX17_HDR_OPTIONAL
-    test_optional<std::optional>();
-#endif
+    test_optional();
     return 0;
 }

test/parsers_test.cpp

@@ -300,10 +300,6 @@ void test_config_file(const char* config_file)
     check_value(a2[6], "m1.v3", "3");
 }
 
-#if defined(__CYGWIN__)
-  extern "C" int putenv (char *__string);
-#endif
-
 void test_environment()
 {
     options_description desc;
@@ -312,7 +308,7 @@ void test_environment()
         ("bar", new untyped_value, "")
         ;
 
-#if defined(_WIN32) && ! defined(BOOST_BORLANDC) && ! defined(BOOST_EMBTC)
+#if (defined(_WIN32) && ! defined(BOOST_BORLANDC) && ! defined(BOOST_EMBTC)) || (defined(__CYGWIN__))
     _putenv("PO_TEST_FOO=1");
 #else
     putenv(const_cast<char*>("PO_TEST_FOO=1"));