Update ci.yml

.github/workflows/ci.yml

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

include/boost/program_options/detail/parsers.hpp

@@ -24,7 +24,7 @@ namespace boost { namespace program_options {
     basic_command_line_parser<charT>::
     basic_command_line_parser(int argc, const charT* const argv[])
     : detail::cmdline(
-        to_internal(std::vector<std::basic_string<charT> >(argv+1, argv+argc))),
+        to_internal(std::vector<std::basic_string<charT> >(argc ? argv+1 : argv, argv+argc))),
         m_desc()
     {}
 

include/boost/program_options/detail/value_semantic.hpp

@@ -8,6 +8,10 @@
 
 #include <boost/throw_exception.hpp>
 
+#ifndef BOOST_NO_CXX17_HDR_OPTIONAL
+#   include <optional>
+#endif
+
 // forward declaration
 namespace boost { template<class T> class optional; }
 
@@ -169,6 +173,22 @@ 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>::

include/boost/program_options/parsers.hpp

@@ -120,7 +120,11 @@ namespace boost { namespace program_options {
         basic_command_line_parser(const std::vector<
                                   std::basic_string<charT> >& args);
         /** Creates a command line parser for the specified arguments
-            list. The parameters should be the same as passed to 'main'.
+            list. The parameters should be the same as passed to 'main', meaning:
+            @param argc Must be non-negative i.e. >= 0
+            @param argv Argv[argc] must be 0 e.g. nullptr and
+            if argc is >0 argv[0] up to argv[argc-1] must point to
+            null terminated strings
         */
         basic_command_line_parser(int argc, const charT* const argv[]);
 

test/optional_test.cpp

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