Update ci.yml

.github/workflows/ci.yml

@@ -183,18 +183,24 @@ jobs:
           - toolset: clang
             compiler: clang++-20
             cxxstd: "03,11,14,17,20,23,2c"
-            container: ubuntu:25.04
+            container: ubuntu:24.04
             os: ubuntu-latest
             install: clang-20
           - toolset: clang
-            cxxstd: "03,11,14,17,20,2b"
-            os: macos-13
+            compiler: clang++-21
+            cxxstd: "03,11,14,17,20,23,2c"
+            container: ubuntu:25.10
+            os: ubuntu-latest
+            install: clang-21
           - toolset: clang
             cxxstd: "03,11,14,17,20,2b"
             os: macos-14
           - toolset: clang
-            cxxstd: "03,11,14,17,20,2b"
+            cxxstd: "03,11,14,17,20,23,2c"
             os: macos-15
+          - toolset: clang
+            cxxstd: "03,11,14,17,20,23,2c"
+            os: macos-26
 
     runs-on: ${{matrix.os}}
 
@@ -321,9 +327,9 @@ jobs:
         include:
           - os: ubuntu-22.04
           - os: ubuntu-24.04
-          - os: macos-13
           - os: macos-14
           - os: macos-15
+          - os: macos-26
 
     runs-on: ${{matrix.os}}
 
@@ -370,9 +376,9 @@ jobs:
         include:
           - os: ubuntu-22.04
           - os: ubuntu-24.04
-          - os: macos-13
           - os: macos-14
           - os: macos-15
+          - os: macos-26
 
     runs-on: ${{matrix.os}}
 
@@ -429,9 +435,9 @@ jobs:
         include:
           - os: ubuntu-22.04
           - os: ubuntu-24.04
-          - os: macos-13
           - os: macos-14
           - os: macos-15
+          - os: macos-26
 
     runs-on: ${{matrix.os}}
 

doc/compat/changelog.adoc

@@ -11,7 +11,6 @@ https://www.boost.org/LICENSE_1_0.txt
 ## Changes in 1.90.0
 
 * Added `to_underlying.hpp` (contributed by Braden Ganetsky.)
-* Extracted `nontype_t` to its own public header `nontype.hpp` and added `nontype`.
 
 ## Changes in 1.89.0
 

doc/compat/function_ref.adoc

@@ -39,8 +39,6 @@ for (auto fn : fns) {
 ## Synopsis
 
 ```cpp
-#include <boost/compat/nontype.hpp>
-
 namespace boost
 {
 namespace compat

doc/compat/reference.adoc

@@ -12,7 +12,6 @@ include::invoke.adoc[]
 include::latch.adoc[]
 include::mem_fn.adoc[]
 include::move_only_function.adoc[]
-include::nontype.adoc[]
 include::shared_lock.adoc[]
 include::to_array.adoc[]
 include::to_underlying.adoc[]

include/boost/compat/function_ref.hpp

@@ -5,7 +5,7 @@
 // Distributed under the Boost Software License, Version 1.0.
 // https://www.boost.org/LICENSE_1_0.txt
 
-#include <boost/compat/nontype.hpp>
+#include <boost/compat/detail/nontype.hpp>
 #include <boost/compat/invoke.hpp>
 #include <boost/compat/type_traits.hpp>
 

test/nontype_test.cpp

@@ -2,7 +2,7 @@
 // Distributed under the Boost Software License, Version 1.0.
 // https://www.boost.org/LICENSE_1_0.txt
 
-#include <boost/compat/nontype.hpp>
+#include <boost/compat/detail/nontype.hpp>
 #include <boost/core/lightweight_test.hpp>
 #include <boost/core/lightweight_test_trait.hpp>
 #include <boost/config/pragma_message.hpp>